diff --git a/hosts/vulpes/core/boot.nix b/hosts/vulpes/core/boot.nix index f82690b..3e7d617 100644 --- a/hosts/vulpes/core/boot.nix +++ b/hosts/vulpes/core/boot.nix @@ -12,7 +12,11 @@ }; loader = { - systemd-boot.enable = false; + systemd-boot = { + enable = false; + consoleMode = "auto"; + configurationLimit = 3; + }; efi.canTouchEfiVariables = true; }; diff --git a/hosts/work/core/boot.nix b/hosts/work/core/boot.nix index 8b0ea66..426e2a5 100644 --- a/hosts/work/core/boot.nix +++ b/hosts/work/core/boot.nix @@ -13,9 +13,14 @@ "amdgpu.ppfeaturemask=0xffffffff" ]; + lanzaboote = { + enable = true; + pkiBundle = "/var/lib/sbctl"; + }; + loader = { systemd-boot = { - enable = true; + enable = false; consoleMode = "auto"; configurationLimit = 3; }; @@ -28,6 +33,7 @@ initrd = { kernelModules = [ "dm-snapshot" + "amdgpu" ]; availableKernelModules = [ "nvme" @@ -37,11 +43,13 @@ "usb_storage" "sd_mod" ]; + systemd = { + enable = true; + }; }; kernelModules = [ "kvm-amd" - "amdgpu" "usbmon" ]; diff --git a/hosts/work/core/hardware.nix b/hosts/work/core/hardware.nix index 873ccbd..d73bf76 100644 --- a/hosts/work/core/hardware.nix +++ b/hosts/work/core/hardware.nix @@ -9,21 +9,68 @@ (modulesPath + "/installer/scan/not-detected.nix") ]; - fileSystems = { + boot.initrd.luks = { + devices = { + crypt_root = { + device = "/dev/disk/by-label/crypt_root"; + allowDiscards = true; + }; + }; + }; + fileSystems = { "/" = { - device = "/dev/disk/by-uuid/368f8b9b-b87e-4344-bc7e-962d62a5eba8"; + device = "/dev/mapper/crypt_root"; fsType = "btrfs"; + options = [ + "subvol=@" + "compress=zstd" + "noatime" + ]; }; "/home" = { - device = "/dev/disk/by-uuid/b69233ba-e1b2-4036-b32e-ade5ef35e10b"; + device = "/dev/mapper/crypt_root"; + fsType = "btrfs"; + options = [ + "subvol=@home" + "compress=zstd" + "noatime" + ]; + }; + + "/var" = { + device = "/dev/mapper/crypt_root"; fsType = "btrfs"; - neededForBoot = true; + options = [ + "subvol=@var" + "compress=zstd" + "noatime" + ]; + }; + + "/nix" = { + device = "/dev/mapper/crypt_root"; + fsType = "btrfs"; + options = [ + "subvol=@nix" + "compress=zstd" + "noatime" + ]; + }; + + "/.snapshots" = { + device = "/dev/mapper/crypt_root"; + fsType = "btrfs"; + options = [ + "subvol=@snapshots" + "compress=zstd" + "noatime" + ]; }; "/boot" = { - device = "/dev/disk/by-uuid/76AE-AD29"; + device = "/dev/disk/by-label/efi"; fsType = "vfat"; options = [ "fmask=0022" diff --git a/hosts/work/core/services.nix b/hosts/work/core/services.nix index 7287d5d..3470026 100644 --- a/hosts/work/core/services.nix +++ b/hosts/work/core/services.nix @@ -126,19 +126,6 @@ }; }; }; - - flatpak = { - enable = true; - remotes = { - "flathub" = "https://dl.flathub.org/repo/flathub.flatpakrepo"; - }; - packages = [ - "flathub:app/com.collaboraoffice.Office//stable" - "flathub:app/com.github.tchx84.Flatseal//stable" - "flathub:app/page.codeberg.JakobDev.jdDBusDebugger//stable" - "flathub:app/io.github.vani_tty1.memerist//stable" - ]; - }; }; systemd.services.netbird-work = { serviceConfig = { diff --git a/hosts/work/default.nix b/hosts/work/default.nix index 17ba615..fd4c0a1 100644 --- a/hosts/work/default.nix +++ b/hosts/work/default.nix @@ -13,7 +13,7 @@ in args.pins.sops-nix.nixosModules.sops args.pins.nix-index.nixosModules.nix-index - args.pins.flatpak.nixosModules.default + args.pins.lanzaboote.nixosModules.lanzaboote ] ++ (args.pup_lib.module_imports ./core); diff --git a/hosts/work/hjem-rum/niri.nix b/hosts/work/hjem-rum/niri.nix index f368942..992c2b0 100644 --- a/hosts/work/hjem-rum/niri.nix +++ b/hosts/work/hjem-rum/niri.nix @@ -1,7 +1,5 @@ { pkgs, ... }: { - # mode "2560x1440@144.002" - niri = { enable = true; spawn-at-startup = [ @@ -10,6 +8,11 @@ "--config" "/home/roufpup/.config/quickshell/shell/" ] + [ + "swww" + "img" + "/home/roufpup/Pictures/Wallpapers/03_bg_look_a_plane.png_52758.png" + ] ]; config = '' debug {