Compare commits
4 Commits
307fe7b05d
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
0883d28d64
|
|||
|
a817a7139c
|
|||
|
0222a4f60d
|
|||
|
19cd5084a3
|
1069
flake.lock
generated
1069
flake.lock
generated
File diff suppressed because it is too large
Load Diff
31
flake.nix
31
flake.nix
@@ -1,15 +1,20 @@
|
||||
{
|
||||
inputs = {
|
||||
nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05";
|
||||
nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11";
|
||||
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
|
||||
|
||||
home-manager = {
|
||||
url = "github:nix-community/home-manager/release-25.05";
|
||||
url = "github:nix-community/home-manager/release-25.11";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
|
||||
disko = {
|
||||
url = "github:nix-community/disko/latest";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
|
||||
stylix = {
|
||||
url = "github:danth/stylix/release-25.05";
|
||||
url = "github:danth/stylix/release-25.11";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
inputs.home-manager.follows = "home-manager";
|
||||
};
|
||||
@@ -24,9 +29,9 @@
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
|
||||
heart-modpack = {
|
||||
url = "git+file:///home/guz/.projects/heart-modpack";
|
||||
};
|
||||
# heart-modpack = {
|
||||
# url = "git+file:///home/guz/.projects/heart-modpack";
|
||||
# };
|
||||
|
||||
nix-flatpak = {
|
||||
url = "github:gmodena/nix-flatpak/?ref=latest";
|
||||
@@ -134,6 +139,20 @@
|
||||
./home/guz-lite/configuration.nix
|
||||
];
|
||||
};
|
||||
"rusty" = nixpkgs.lib.nixosSystem rec {
|
||||
system = "x86_64-linux";
|
||||
specialArgs = {
|
||||
pkgs-unstable = import nixpkgs-unstable {
|
||||
inherit system;
|
||||
config.allowUnfreePredicate = _: true;
|
||||
};
|
||||
inherit inputs self;
|
||||
};
|
||||
modules = [
|
||||
./modules/nixos/context.nix
|
||||
./hosts/rusty/configuration.nix
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
homeConfigurations = forAllSystems ({
|
||||
|
||||
@@ -285,6 +285,10 @@
|
||||
install_url = "https://addons.mozilla.org/firefox/downloads/latest/dearrow/latest.xpi";
|
||||
installation_mode = "force_installed";
|
||||
};
|
||||
"extraneous@sysrqmagician.github.io" = {
|
||||
install_url = "https://addons.mozilla.org/firefox/downloads/latest/extraneous/latest.xpi";
|
||||
installation_mode = "force_installed";
|
||||
};
|
||||
"idcac-pub@guus.ninja" = {
|
||||
install_url = "https://addons.mozilla.org/firefox/downloads/latest/istilldontcareaboutcookies/latest.xpi";
|
||||
installation_mode = "force_installed";
|
||||
|
||||
@@ -33,10 +33,6 @@
|
||||
xdg-desktop-portal-gtk
|
||||
];
|
||||
|
||||
environment.systemPackages = with pkgs; [
|
||||
kdePackages.xwaylandvideobridge
|
||||
];
|
||||
|
||||
services.xserver.displayManager.gdm.enable = true;
|
||||
|
||||
fonts.fontDir.enable = true;
|
||||
|
||||
@@ -22,6 +22,7 @@
|
||||
|
||||
# Xbox Controller driver
|
||||
hardware.xone.enable = true;
|
||||
hardware.xpad-noone.enable = lib.mkForce false; # Build failure https://github.com/NixOS/nixpkgs/issues/467803
|
||||
|
||||
# OpenTabletDriver
|
||||
hardware.opentabletdriver.enable = true;
|
||||
@@ -32,7 +33,6 @@
|
||||
nixpkgs.config.allowUnfreePredicate = pkg:
|
||||
builtins.elem (lib.getName pkg) [
|
||||
"davinci-resolve"
|
||||
"megasync"
|
||||
"reaper"
|
||||
"steam"
|
||||
"steam-unwrapped"
|
||||
|
||||
@@ -28,7 +28,6 @@
|
||||
libvdpau-va-gl
|
||||
vulkan-loader
|
||||
vulkan-validation-layers
|
||||
amdvlk
|
||||
mesa.opencl
|
||||
];
|
||||
|
||||
|
||||
50
hosts/rusty/configuration.nix
Normal file
50
hosts/rusty/configuration.nix
Normal file
@@ -0,0 +1,50 @@
|
||||
{
|
||||
lib,
|
||||
inputs,
|
||||
...
|
||||
}: {
|
||||
imports = [
|
||||
../../configuration.nix
|
||||
inputs.disko.nixosModules.disko
|
||||
];
|
||||
|
||||
# Network
|
||||
networking = {
|
||||
hostName = lib.mkForce "rusty";
|
||||
#wireless.enable = lib.mkForce true;
|
||||
};
|
||||
|
||||
disko.devices.disk.main = {
|
||||
device = "/dev/sda"; # This will be overwritten by disko-install
|
||||
type = "disk";
|
||||
content = {
|
||||
type = "gpt";
|
||||
partitions = {
|
||||
ESP = {
|
||||
size = "500M";
|
||||
content = {
|
||||
type = "filesystem";
|
||||
format = "vfat";
|
||||
mountpoint = "/boot/efi";
|
||||
mountOptions = ["dmask=0022" "fmask=0022" "nofail"];
|
||||
};
|
||||
};
|
||||
root = {
|
||||
size = "100%";
|
||||
content = {
|
||||
type = "filesystem";
|
||||
format = "ext4";
|
||||
mountpoint = "/";
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
boot.loader.efi.canTouchEfiVariables = lib.mkForce false;
|
||||
boot.loader.grub = {
|
||||
efiSupport = true;
|
||||
efiInstallAsRemovable = true;
|
||||
device = "nodev";
|
||||
};
|
||||
}
|
||||
@@ -62,8 +62,9 @@ in {
|
||||
|
||||
home.sessionVariables = {
|
||||
SHELL = lib.mkIf cfg.zsh.enable "${lib.getExe config.programs.zsh.package}";
|
||||
TERM = lib.mkIf cfg.ghostty.enable "xterm-ghostty";
|
||||
TERMINAL = lib.mkIf cfg.ghostty.enable "${lib.getExe config.programs.ghostty.package}";
|
||||
TERM = lib.mkIf cfg.ghostty.enable "xterm-256color";
|
||||
# Used to be ghostty, but it is borked
|
||||
TERMINAL = lib.mkIf cfg.ghostty.enable "${lib.getExe config.programs.wezterm.package}";
|
||||
EXPLORER = lib.mkIf cfg.yazi.enable "${lib.getExe config.programs.yazi.package}";
|
||||
};
|
||||
|
||||
@@ -107,6 +108,8 @@ in {
|
||||
package = config._devkit.packages.ghostty;
|
||||
};
|
||||
|
||||
programs.wezterm.enable = true;
|
||||
|
||||
## Git
|
||||
programs.git = lib.mkIf cfg.git.enable {
|
||||
enable = true;
|
||||
|
||||
@@ -9,8 +9,12 @@
|
||||
# YAML is a superset of JSON, so any JSON is valid YAML.
|
||||
colors = import ../colors.nix;
|
||||
cfg = pkgs.writeText "config.yml" (builtins.toJSON ({
|
||||
git.paging.colorArg = "always";
|
||||
git.paging.pager = "${lib.getExe pkgs.delta} --dark --paging=never";
|
||||
git.pagers = [
|
||||
{
|
||||
colorArg = "always";
|
||||
pager = "${lib.getExe pkgs.delta} --dark --paging=never";
|
||||
}
|
||||
];
|
||||
|
||||
gui.theme = {
|
||||
activeBorderColor = [colors.base07 "bold"];
|
||||
|
||||
@@ -79,4 +79,4 @@ in
|
||||
cp ${desktopEntry}/share/applications/${pname}.desktop $out/share/applications/${pname}.desktop
|
||||
'';
|
||||
}
|
||||
// {inherit (zellij) meta;})
|
||||
// {inherit (zellij) meta version;})
|
||||
|
||||
Reference in New Issue
Block a user