tristan/nix
1
0
Fork 0
Code Projects Releases Packages Activity

Merge branch 'nixbook/cosmic' into zenix/master

Browse source
This commit is contained in:
tristan 2024-11-26 03:07:37 +00:00
commit 937b71bac8
2 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
flake.nix
View file

@ -58,8 +58,10 @@
./nixos/modules/work.nix ./nixos/modules/work.nix
./nixos/programs/cosmic.nix ./nixos/programs/cosmic.nix
./nixos/programs/libvertd.nix ./nixos/programs/libvertd.nix
./nixos/programs/hyprland.nix
]; ];
home-modules = [ home-modules = [
./home/programs/mpd.nix
./home/programs/work.nix ./home/programs/work.nix
./home/programs/graphical.nix ./home/programs/graphical.nix
]; ];

5
hardware/fcs-tristan-nixbook.nix
View file

@ -6,7 +6,6 @@
... ...
}: let }: let
user = config.user; user = config.user;
decrypt = import ../lib/decrypt.nix;
in { in {
imports = [ imports = [
(modulesPath + "/installer/scan/not-detected.nix") (modulesPath + "/installer/scan/not-detected.nix")
@ -24,7 +23,7 @@ in {
}; };
boot.initrd.luks.devices."usbkey" = { 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" = { boot.initrd.luks.devices."cryptroot" = {
@ -32,7 +31,7 @@ in {
keyFileSize = 4096; keyFileSize = 4096;
preOpenCommands = '' preOpenCommands = ''
mkdir -m 0755 -p /key 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"; keyFile = "/key/keyfile";
preLVM = false; preLVM = false;