diff options
| -rw-r--r-- | dev/checks.nix | 4 | ||||
| -rw-r--r-- | flake.nix | 2 | ||||
| -rw-r--r-- | systems/atlas/default.nix | 2 | ||||
| -rw-r--r-- | systems/atlas/teawiebot.nix | 3 | ||||
| -rw-r--r-- | systems/caroline/default.nix | 2 | ||||
| -rw-r--r-- | systems/common.nix | 9 | ||||
| -rw-r--r-- | systems/default.nix | 27 | ||||
| -rw-r--r-- | systems/glados-wsl/default.nix | 10 | ||||
| -rw-r--r-- | systems/glados/boot.nix | 3 | ||||
| -rw-r--r-- | systems/glados/default.nix | 4 | ||||
| -rw-r--r-- | systems/glados/nvidia.nix | 10 |
11 files changed, 43 insertions, 33 deletions
diff --git a/dev/checks.nix b/dev/checks.nix index cf2b732..35cd535 100644 --- a/dev/checks.nix +++ b/dev/checks.nix @@ -1,4 +1,6 @@ -{ +{inputs, ...}: { + imports = [inputs.pre-commit.flakeModule]; + perSystem = {self', ...}: { pre-commit = { settings.hooks = { @@ -131,8 +131,6 @@ outputs = {parts, ...} @ inputs: parts.lib.mkFlake {inherit inputs;} { imports = [ - inputs.pre-commit.flakeModule - ./dev ./modules ./overlay diff --git a/systems/atlas/default.nix b/systems/atlas/default.nix index 836aef7..bc5fcac 100644 --- a/systems/atlas/default.nix +++ b/systems/atlas/default.nix @@ -31,5 +31,7 @@ hashedPasswordFile = config.age.secrets.userPassword.path; }; + system.stateVersion = "23.05"; + zramSwap.enable = true; } diff --git a/systems/atlas/teawiebot.nix b/systems/atlas/teawiebot.nix index dac2998..8d4da63 100644 --- a/systems/atlas/teawiebot.nix +++ b/systems/atlas/teawiebot.nix @@ -1,8 +1,11 @@ { config, secretsDir, + inputs, ... }: { + imports = [inputs.teawiebot.nixosModules.default]; + age.secrets.teawiebot.file = secretsDir + "/teawieBot.age"; services.teawiebot = { diff --git a/systems/caroline/default.nix b/systems/caroline/default.nix index 5c65705..160a4fc 100644 --- a/systems/caroline/default.nix +++ b/systems/caroline/default.nix @@ -14,4 +14,6 @@ nix.settings.trusted-users = ["seth"]; services.tailscale.enable = true; + + system.stateVersion = 4; } diff --git a/systems/common.nix b/systems/common.nix index 3960495..f0b0384 100644 --- a/systems/common.nix +++ b/systems/common.nix @@ -14,7 +14,7 @@ }; }; in { - nixos = + personal = (with inputs; [ agenix.nixosModules.default catppuccin.nixosModules.catppuccin @@ -34,8 +34,6 @@ in { sethPassword.file = secretsDir + "/sethPassword.age"; }; }; - - system.stateVersion = "23.11"; }) ]; @@ -45,10 +43,6 @@ in { self.darwinModules.desktop hmSetup - - { - system.stateVersion = 4; - } ]; server = [ @@ -65,7 +59,6 @@ in { }; nix.registry.n.flake = inputs.nixpkgs-stable; - system.stateVersion = "23.05"; } ]; } diff --git a/systems/default.nix b/systems/default.nix index 47f6bf6..ae37e1c 100644 --- a/systems/default.nix +++ b/systems/default.nix @@ -26,7 +26,7 @@ mapDarwin = mapSystems inputs.darwin.lib.darwinSystem; mapNixOS = mapSystems inputs.nixpkgs.lib.nixosSystem; - inherit (import ./common.nix {inherit inputs self;}) darwin nixos server; + common = import ./common.nix {inherit inputs self;}; in { imports = [./deploy.nix]; @@ -34,42 +34,25 @@ in { darwinConfigurations = mapDarwin { caroline = { system = "x86_64-darwin"; - modules = darwin; + modules = common.darwin; }; }; nixosConfigurations = mapNixOS { glados = { system = "x86_64-linux"; - modules = with inputs; - [ - lanzaboote.nixosModules.lanzaboote - nixos-hardware.nixosModules.common-gpu-nvidia-nonprime - nixos-hardware.nixosModules.common-pc-ssd - { - hardware.nvidia.modesetting.enable = true; - } - ] - ++ nixos; + modules = common.personal; }; glados-wsl = { system = "x86_64-linux"; - modules = - [ - inputs.nixos-wsl.nixosModules.wsl - ] - ++ nixos; + modules = common.personal; }; atlas = { builder = inputs.nixpkgs-stable.lib.nixosSystem; system = "aarch64-linux"; - modules = with inputs; - [ - teawiebot.nixosModules.default - ] - ++ server; + modules = common.server; }; }; diff --git a/systems/glados-wsl/default.nix b/systems/glados-wsl/default.nix index e63b43b..569ab64 100644 --- a/systems/glados-wsl/default.nix +++ b/systems/glados-wsl/default.nix @@ -2,10 +2,14 @@ lib, modulesPath, pkgs, + inputs, ... }: { imports = [ (modulesPath + "/profiles/minimal.nix") + + inputs.nixos-wsl.nixosModules.wsl + ../../modules/nixos/features/tailscale.nix ]; @@ -36,18 +40,24 @@ interop.includePath = false; }; + # doesn't work on wsl services.dbus.apparmor = "disabled"; networking = { hostName = "glados-wsl"; + # ditto networkmanager.enable = false; }; + # ditto security = { apparmor.enable = false; audit.enable = false; auditd.enable = false; }; + # ditto services.resolved.enable = false; + + system.stateVersion = "23.11"; } diff --git a/systems/glados/boot.nix b/systems/glados/boot.nix index e0326a0..a7ac843 100644 --- a/systems/glados/boot.nix +++ b/systems/glados/boot.nix @@ -1,8 +1,11 @@ { lib, pkgs, + inputs, ... }: { + imports = [inputs.lanzaboote.nixosModules.lanzaboote]; + environment.systemPackages = with pkgs; [ sbctl tpm2-tss diff --git a/systems/glados/default.nix b/systems/glados/default.nix index 144db6d..3271515 100644 --- a/systems/glados/default.nix +++ b/systems/glados/default.nix @@ -6,6 +6,8 @@ imports = [ ./boot.nix ./hardware-configuration.nix + ./nvidia.nix + self.nixosModules.desktop self.nixosModules.gnome ]; @@ -45,6 +47,8 @@ remotePlay.openFirewall = true; }; + system.stateVersion = "23.11"; + zramSwap = { enable = true; algorithm = "zstd"; diff --git a/systems/glados/nvidia.nix b/systems/glados/nvidia.nix new file mode 100644 index 0000000..afba1b2 --- /dev/null +++ b/systems/glados/nvidia.nix @@ -0,0 +1,10 @@ +{inputs, ...}: { + imports = with inputs; [ + nixos-hardware.nixosModules.common-gpu-nvidia-nonprime + nixos-hardware.nixosModules.common-pc-ssd + ]; + + hardware.nvidia = { + modesetting.enable = true; + }; +} |