diff --git a/nixos/boxes/thinky/default.nix b/nixos/boxes/thinky/default.nix index 336ac312..57c45aee 100644 --- a/nixos/boxes/thinky/default.nix +++ b/nixos/boxes/thinky/default.nix @@ -16,9 +16,6 @@ ../../backups.nix ]; - boot.kernelPackages = pkgs.linuxPackages_latest_hardened; - boot.loader.systemd-boot.enable = true; - boot.loader.efi.canTouchEfiVariables = true; time.timeZone = "Europe/Warsaw"; services.thermald.enable = true; diff --git a/nixos/boxes/thinky/hardware-configuration.nix b/nixos/boxes/thinky/hardware-configuration.nix index 48e14005..0e2461e5 100644 --- a/nixos/boxes/thinky/hardware-configuration.nix +++ b/nixos/boxes/thinky/hardware-configuration.nix @@ -2,21 +2,24 @@ { - boot.initrd.availableKernelModules = [ "ata_generic" "uhci_hcd" "ehci_pci" "ahci" "usb_storage" "sd_mod" ]; boot.kernelModules = [ "kvm-intel" ]; boot.extraModulePackages = [ ]; - boot.initrd.luks.devices."root"= - { - name = "root"; - device = "/dev/disk/by-uuid/962caed1-9dd5-4771-9a8f-3d3f5854af2e"; - preLVM = true; - allowDiscards = true; + boot = { + kernelPackages = pkgs.linuxPackages_latest_hardened; + initrd.availableKernelModules = [ "ata_generic" "uhci_hcd" "ehci_pci" "ahci" "usb_storage" "sd_mod" ]; + initrd.luks.devices."crypt"= + { + device = "/dev/disk/by-uuid/962caed1-9dd5-4771-9a8f-3d3f5854af2e"; + preLVM = true; + allowDiscards = true; + }; + loader.grub = { + device = "/dev/sda"; + }; }; + time.timeZone = "Europe/Warsaw"; - boot.loader.grub = { - device = "/dev/sda"; - }; fileSystems."/" = { device = "/dev/disk/by-uuid/11fb2333-f06f-4970-9b74-a5287bab5058"; fsType = "ext4"; diff --git a/nixos/boxes/thinky/thinky.nix b/nixos/boxes/thinky/thinky.nix index bfbaee5f..ab172c9b 100644 --- a/nixos/boxes/thinky/thinky.nix +++ b/nixos/boxes/thinky/thinky.nix @@ -4,13 +4,12 @@ networking.hostName = "thinky"; boot = { kernelPackages = pkgs.linuxPackages_latest_hardened; - initrd.luks.devices = [ + initrd.luks.devices."crypt"= { - name = "root"; device = "/dev/disk/by-uuid/962caed1-9dd5-4771-9a8f-3d3f5854af2e"; preLVM = true; allowDiscards = true; - }]; + }; loader.grub = { device = "/dev/sda"; }; @@ -18,8 +17,8 @@ time.timeZone = "Europe/Warsaw"; imports = [ /etc/nixos/hardware-configuration.nix - ../boot.nix - ../common.nix - ../gfx-intel.nix + ../../boot.nix + ../../common.nix + ../../gfx-intel.nix ]; }