diff options
| author | Fuwn <[email protected]> | 2024-10-03 02:15:11 -0700 |
|---|---|---|
| committer | Fuwn <[email protected]> | 2024-10-03 02:23:13 -0700 |
| commit | c45147632d45b0a395aa3383b49fb4764c66c36e (patch) | |
| tree | ff2fe3de13f3166ba15261ae8acc10379af9179f /hosts | |
| parent | hosts: move hosts to unique modules (diff) | |
| download | nixos-config-c45147632d45b0a395aa3383b49fb4764c66c36e.tar.xz nixos-config-c45147632d45b0a395aa3383b49fb4764c66c36e.zip | |
hosts: use common wording instead of default
Diffstat (limited to 'hosts')
| -rw-r--r-- | hosts/akashi/hardware-configuration.nix | 10 | ||||
| -rw-r--r-- | hosts/default.nix | 6 | ||||
| -rw-r--r-- | hosts/himeji/default.nix | 4 | ||||
| -rw-r--r-- | hosts/kansai/hardware-configuration.nix | 10 |
4 files changed, 15 insertions, 15 deletions
diff --git a/hosts/akashi/hardware-configuration.nix b/hosts/akashi/hardware-configuration.nix index a264937..f06ef10 100644 --- a/hosts/akashi/hardware-configuration.nix +++ b/hosts/akashi/hardware-configuration.nix @@ -7,7 +7,7 @@ let nixosDevice = "/dev/disk/by-uuid/78655110-4037-4b06-9407-f155c595c3a3"; - btrfsOptions = [ + commonBtrfsOptions = [ "compress-force=zstd:1" "noatime" "discard=async" @@ -46,25 +46,25 @@ in "/" = { device = nixosDevice; fsType = "btrfs"; - options = btrfsOptions ++ [ "subvol=@" ]; + options = commonBtrfsOptions ++ [ "subvol=@" ]; }; "/home" = { device = nixosDevice; fsType = "btrfs"; - options = btrfsOptions ++ [ "subvol=@home" ]; + options = commonBtrfsOptions ++ [ "subvol=@home" ]; }; "/var" = { device = nixosDevice; fsType = "btrfs"; - options = btrfsOptions ++ [ "subvol=@var" ]; + options = commonBtrfsOptions ++ [ "subvol=@var" ]; }; "/nix" = { device = nixosDevice; fsType = "btrfs"; - options = btrfsOptions ++ [ "subvol=@nix" ]; + options = commonBtrfsOptions ++ [ "subvol=@nix" ]; }; "/boot" = { diff --git a/hosts/default.nix b/hosts/default.nix index da3667b..0fe5332 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -10,7 +10,7 @@ { imports = let - defaultModules = with inputs; [ + commonModules = with inputs; [ nix-index-database.nixosModules.nix-index sops-nix.nixosModules.sops ]; @@ -22,7 +22,7 @@ nix-gaming.nixosModules.pipewireLowLatency pia.nixosModules.${system}.default ] - ++ defaultModules; + ++ commonModules; commonInherits = { inherit @@ -41,7 +41,7 @@ in [ (import ./akashi pcInherits) - (import ./himeji (commonInherits // { inherit defaultModules; })) + (import ./himeji (commonInherits // { inherit commonModules; })) (import ./kansai pcInherits) ]; } diff --git a/hosts/himeji/default.nix b/hosts/himeji/default.nix index dfdf9f0..8fe548b 100644 --- a/hosts/himeji/default.nix +++ b/hosts/himeji/default.nix @@ -2,7 +2,7 @@ lib, inputs, kansaiPkgs, - defaultModules, + commonModules, self, outputs, secrets, @@ -29,6 +29,6 @@ ./configuration.nix ./hardware-configuration.nix inputs.disko.nixosModules.disko - ] ++ defaultModules; + ] ++ commonModules; }; } diff --git a/hosts/kansai/hardware-configuration.nix b/hosts/kansai/hardware-configuration.nix index cea0949..8a3e2af 100644 --- a/hosts/kansai/hardware-configuration.nix +++ b/hosts/kansai/hardware-configuration.nix @@ -7,7 +7,7 @@ let nixosDevice = "/dev/disk/by-uuid/59148bdd-ecb1-49a0-beec-89d0adf909ae"; - btrfsOptions = [ + commonBtrfsOptions = [ "compress-force=zstd:1" "noatime" "discard=async" @@ -40,25 +40,25 @@ in "/" = { device = nixosDevice; fsType = "btrfs"; - options = btrfsOptions ++ [ "subvol=@" ]; + options = commonBtrfsOptions ++ [ "subvol=@" ]; }; "/home" = { device = nixosDevice; fsType = "btrfs"; - options = btrfsOptions ++ [ "subvol=@home" ]; + options = commonBtrfsOptions ++ [ "subvol=@home" ]; }; "/var" = { device = nixosDevice; fsType = "btrfs"; - options = btrfsOptions ++ [ "subvol=@var" ]; + options = commonBtrfsOptions ++ [ "subvol=@var" ]; }; "/nix" = { device = nixosDevice; fsType = "btrfs"; - options = btrfsOptions ++ [ "subvol=@nix" ]; + options = commonBtrfsOptions ++ [ "subvol=@nix" ]; }; "/boot" = { |