diff options
| author | Mark Nipper <nipsy@bitgnome.net> | 2024-11-12 10:04:38 -0800 |
|---|---|---|
| committer | Mark Nipper <nipsy@bitgnome.net> | 2024-11-12 10:04:38 -0800 |
| commit | 8328e393ce834ecb6038698d6649427ea1be4a0f (patch) | |
| tree | 4f1d6c3c5f7108d6a4b7ea800f3c6127528f276f /hosts/kaitain | |
| parent | 80a6beccba107f0a728c038a79914e084ab097a7 (diff) | |
| download | nix-8328e393ce834ecb6038698d6649427ea1be4a0f.tar nix-8328e393ce834ecb6038698d6649427ea1be4a0f.tar.gz nix-8328e393ce834ecb6038698d6649427ea1be4a0f.tar.bz2 nix-8328e393ce834ecb6038698d6649427ea1be4a0f.tar.lz nix-8328e393ce834ecb6038698d6649427ea1be4a0f.tar.xz nix-8328e393ce834ecb6038698d6649427ea1be4a0f.tar.zst nix-8328e393ce834ecb6038698d6649427ea1be4a0f.zip | |
Modularize disko everywhere
Diffstat (limited to 'hosts/kaitain')
| -rw-r--r-- | hosts/kaitain/default.nix | 1 | ||||
| -rw-r--r-- | hosts/kaitain/disks.nix | 2 | ||||
| -rw-r--r-- | hosts/kaitain/hardware-configuration.nix | 29 |
3 files changed, 2 insertions, 30 deletions
diff --git a/hosts/kaitain/default.nix b/hosts/kaitain/default.nix index bd1581c..defaa13 100644 --- a/hosts/kaitain/default.nix +++ b/hosts/kaitain/default.nix @@ -16,6 +16,7 @@ ]; imports = [ + ./disks.nix ./hardware-configuration.nix ../common/core #../common/optional/db.nix diff --git a/hosts/kaitain/disks.nix b/hosts/kaitain/disks.nix index 98a6f86..a626a80 100644 --- a/hosts/kaitain/disks.nix +++ b/hosts/kaitain/disks.nix @@ -14,7 +14,7 @@ type = "filesystem"; format = "vfat"; mountpoint = "/boot"; - mountOptions = [ "defaults" ]; + mountOptions = [ "umask=0077" ]; extraArgs = [ "-nboot" ]; }; }; diff --git a/hosts/kaitain/hardware-configuration.nix b/hosts/kaitain/hardware-configuration.nix index 0ca1a06..f38c16a 100644 --- a/hosts/kaitain/hardware-configuration.nix +++ b/hosts/kaitain/hardware-configuration.nix @@ -12,33 +12,4 @@ boot.initrd.kernelModules = [ ]; boot.kernelModules = [ ]; boot.extraModulePackages = [ ]; - - fileSystems."/" = - { device = "rpool/local/root"; - fsType = "zfs"; - }; - - fileSystems."/boot" = - { device = "/dev/disk/by-label/boot"; - fsType = "vfat"; - }; - - fileSystems."/nix" = - { device = "rpool/local/nix"; - fsType = "zfs"; - }; - - fileSystems."/root" = - { device = "rpool/user/home/root"; - fsType = "zfs"; - }; - - fileSystems."/home/nipsy" = - { device = "rpool/user/home/nipsy"; - fsType = "zfs"; - }; - - swapDevices = - [ { device = "/dev/disk/by-label/swap"; } - ]; } |