diff options
Diffstat (limited to 'hosts/arrakis')
| -rw-r--r-- | hosts/arrakis/default.nix | 1 | ||||
| -rw-r--r-- | hosts/arrakis/disks.nix | 4 | ||||
| -rw-r--r-- | hosts/arrakis/hardware-configuration.nix | 37 |
3 files changed, 3 insertions, 39 deletions
diff --git a/hosts/arrakis/default.nix b/hosts/arrakis/default.nix index e3162f5..a66ad3b 100644 --- a/hosts/arrakis/default.nix +++ b/hosts/arrakis/default.nix @@ -107,6 +107,7 @@ ]; imports = [ + ./disks.nix ./hardware-configuration.nix ./services.nix ../common/core diff --git a/hosts/arrakis/disks.nix b/hosts/arrakis/disks.nix index 8680eb3..ca2de37 100644 --- a/hosts/arrakis/disks.nix +++ b/hosts/arrakis/disks.nix @@ -14,7 +14,7 @@ type = "filesystem"; format = "vfat"; mountpoint = "/efiboot/efi1"; - mountOptions = [ "defaults" ]; + mountOptions = [ "X-mount.mkdir" "umask=0077" ]; extraArgs = [ "-nESP1" ]; }; }; @@ -49,7 +49,7 @@ type = "filesystem"; format = "vfat"; mountpoint = "/efiboot/efi2"; - mountOptions = [ "defaults" ]; + mountOptions = [ "X-mount.mkdir" "umask=0077" ]; extraArgs = [ "-nESP2" ]; }; }; diff --git a/hosts/arrakis/hardware-configuration.nix b/hosts/arrakis/hardware-configuration.nix index 5a4c958..6e96a93 100644 --- a/hosts/arrakis/hardware-configuration.nix +++ b/hosts/arrakis/hardware-configuration.nix @@ -21,38 +21,6 @@ MOZ_DISABLE_RDD_SANDBOX = "1"; }; - fileSystems."/" = { - device = "rpool/local/root"; - fsType = "zfs"; - }; - - fileSystems."/efiboot/efi1" = { - device = "/dev/disk/by-label/ESP1"; - fsType = "vfat"; - options = [ "X-mount.mkdir" "iocharset=iso8859-1" ]; - }; - - fileSystems."/efiboot/efi2" = { - device = "/dev/disk/by-label/ESP2"; - fsType = "vfat"; - options = [ "X-mount.mkdir" "iocharset=iso8859-1" ]; - }; - - 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"; - }; - fileSystems."/srv/nfs/keepers" = { device = "/data/home/nipsy/downloads/keepers"; options = [ @@ -83,11 +51,6 @@ ]; }; - swapDevices = [ - { device = "/dev/disk/by-label/swap1"; } - { device = "/dev/disk/by-label/swap2"; } - ]; - hardware = { bluetooth.enable = true; graphics = { |