diff --git a/hosts/aurum/system/default.nix b/hosts/aurum/system/default.nix index 68316db..c0f72e9 100644 --- a/hosts/aurum/system/default.nix +++ b/hosts/aurum/system/default.nix @@ -10,16 +10,15 @@ imports = [ ./audio.nix ./boot.nix - # ./disko.nix + ./disko.nix ./docker.nix ./fonts.nix ./hardware.nix ./i18n.nix - # ./impermanence.nix + ./impermanence.nix # ./lanzaboot.nix ./networking.nix ./nix.nix - ./partitions.nix ./security.nix ./users.nix ]; diff --git a/hosts/aurum/system/disko.nix b/hosts/aurum/system/disko.nix index 12be3ba..af092b3 100644 --- a/hosts/aurum/system/disko.nix +++ b/hosts/aurum/system/disko.nix @@ -51,15 +51,15 @@ }; }; }; - nodev = { - "/" = { - fsType = "tmpfs"; - mountOptions = [ - "defaults" - "mode=755" - "size=8G" - ]; - }; + }; + nodev = { + "/" = { + fsType = "tmpfs"; + mountOptions = [ + "defaults" + "mode=755" + "size=8G" + ]; }; }; }; diff --git a/hosts/aurum/system/hardware.nix b/hosts/aurum/system/hardware.nix index 7b948a0..53067cb 100644 --- a/hosts/aurum/system/hardware.nix +++ b/hosts/aurum/system/hardware.nix @@ -1,5 +1,5 @@ {...}: { - # hardware + # graphics hardware.graphics.enable = true; # logind configuration @@ -20,6 +20,9 @@ # backlight intensity programs.light.enable = true; + # impermanence + fileSystems."/persist".requiredForBoot = true; + # webcam # hardware.firmware = [ # pkgs.ivsc-firmware diff --git a/hosts/aurum/system/impermanence.nix b/hosts/aurum/system/impermanence.nix index 0cb8ebd..61167d1 100644 --- a/hosts/aurum/system/impermanence.nix +++ b/hosts/aurum/system/impermanence.nix @@ -1,5 +1,5 @@ {...}: { - environment.persistence."/persistent" = { + environment.persistence."/persist" = { hideMounts = true; directories = [ "/var/log" diff --git a/hosts/aurum/system/partitions.nix b/hosts/aurum/system/partitions.nix deleted file mode 100644 index 846a15a..0000000 --- a/hosts/aurum/system/partitions.nix +++ /dev/null @@ -1,15 +0,0 @@ -{...}: { - fileSystems."/" = - { device = "/dev/disk/by-uuid/288c6720-f583-4756-b74d-27eabf496d09"; - fsType = "ext4"; - }; - - fileSystems."/boot" = - { device = "/dev/disk/by-uuid/CBDD-1148"; - fsType = "vfat"; - }; - - swapDevices = - [ { device = "/dev/disk/by-uuid/ccdd234e-b58a-440b-b951-4fef68c3812c"; } - ]; -} diff --git a/hosts/default.nix b/hosts/default.nix index a192223..aaeaef4 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -24,10 +24,10 @@ in { ./aurum inputs.catppuccin.nixosModules.catppuccin inputs.home-manager.nixosModules.home-manager - # inputs.disko.nixosModules.default - # inputs.lanzaboote.nixosModules.lanzaboote - # inputs.impermanence.nixosModules.impermanence + inputs.disko.nixosModules.default + inputs.impermanence.nixosModules.impermanence inputs.nixos-hardware.nixosModules.dell-xps-13-9315 + # inputs.lanzaboote.nixosModules.lanzaboote {inherit home-manager;} ]; };