diff --git a/hosts/vali/hermit/hardware-configuration.nix b/hosts/vali/hermit/hardware-configuration.nix index 261257c..2632f55 100644 --- a/hosts/vali/hermit/hardware-configuration.nix +++ b/hosts/vali/hermit/hardware-configuration.nix @@ -4,7 +4,6 @@ { config, lib, - pkgs, modulesPath, ... }: { @@ -18,18 +17,6 @@ boot.kernelParams = ["mem_sleep_default=deep"]; boot.extraModulePackages = []; - fileSystems."/" = { - device = "/dev/disk/by-uuid/b51d0f6c-2980-4117-b9df-5cc2c8ddd2d6"; - fsType = "ext4"; - }; - - boot.initrd.luks.devices."luks-f1b24c23-8211-433e-983e-2ebad020826e".device = "/dev/disk/by-uuid/f1b24c23-8211-433e-983e-2ebad020826e"; - - fileSystems."/boot" = { - device = "/dev/disk/by-uuid/E355-67EA"; - fsType = "vfat"; - options = ["fmask=0022" "dmask=0022"]; - }; # swapDevices = # [ { device = "/dev/disk/by-uuid/3518272e-1051-41e2-a7f0-f5c744e46789"; } # ]; diff --git a/hosts/vali/hermit/hardware/default.nix b/hosts/vali/hermit/hardware/default.nix index 715273e..ced3517 100644 --- a/hosts/vali/hermit/hardware/default.nix +++ b/hosts/vali/hermit/hardware/default.nix @@ -1 +1 @@ -_: {imports = [./monitors.nix];} +_: {imports = [./monitors.nix ./fs.nix];} diff --git a/hosts/vali/hermit/hardware/fs.nix b/hosts/vali/hermit/hardware/fs.nix index e69de29..76d42e6 100644 --- a/hosts/vali/hermit/hardware/fs.nix +++ b/hosts/vali/hermit/hardware/fs.nix @@ -0,0 +1,14 @@ +{ + fileSystems."/" = { + device = "/dev/disk/by-uuid/b51d0f6c-2980-4117-b9df-5cc2c8ddd2d6"; + fsType = "ext4"; + }; + + boot.initrd.luks.devices."luks-f1b24c23-8211-433e-983e-2ebad020826e".device = "/dev/disk/by-uuid/f1b24c23-8211-433e-983e-2ebad020826e"; + + fileSystems."/boot" = { + device = "/dev/disk/by-uuid/E355-67EA"; + fsType = "vfat"; + options = ["fmask=0022" "dmask=0022"]; + }; +}