diff --git a/flake.nix b/flake.nix index 6b148b9..cead99f 100644 --- a/flake.nix +++ b/flake.nix @@ -58,8 +58,10 @@ ./nixos/modules/work.nix ./nixos/programs/cosmic.nix ./nixos/programs/libvertd.nix + ./nixos/programs/hyprland.nix ]; home-modules = [ + ./home/programs/mpd.nix ./home/programs/work.nix ./home/programs/graphical.nix ]; diff --git a/hardware/fcs-tristan-nixbook.nix b/hardware/fcs-tristan-nixbook.nix index a3370d4..bcc1900 100644 --- a/hardware/fcs-tristan-nixbook.nix +++ b/hardware/fcs-tristan-nixbook.nix @@ -6,7 +6,6 @@ ... }: let user = config.user; - decrypt = import ../lib/decrypt.nix; in { imports = [ (modulesPath + "/installer/scan/not-detected.nix") @@ -24,7 +23,7 @@ in { }; boot.initrd.luks.devices."usbkey" = { - device = "/dev/disk/by-id/usb-Generic_Flash_Disk_BCC97785-0:0"; + device = "/dev/disk/by-label/usbkey1"; }; boot.initrd.luks.devices."cryptroot" = { @@ -32,7 +31,7 @@ in { keyFileSize = 4096; preOpenCommands = '' mkdir -m 0755 -p /key - mount -n -t vfat -o ro /dev/mapper/usbkey /key + mount -n -o ro /dev/mapper/usbkey /key ''; keyFile = "/key/keyfile"; preLVM = false;