diff --git a/hosts/nixos-desktop/default.nix b/hosts/nixos-desktop/default.nix index 1d29c32..6e23ad9 100644 --- a/hosts/nixos-desktop/default.nix +++ b/hosts/nixos-desktop/default.nix @@ -53,9 +53,11 @@ kernelPackages = pkgs.linuxPackages_latest; # BOOT - supportedFilesystems = [ "zfs" "btrfs" "ntfs" ]; - loader.systemd-boot.enable = true; + loader = { + systemd-boot.enable = true; + efi.canTouchEfiVariables = true; + }; kernelModules = [ "lm92" "drivetemp" ]; }; diff --git a/hosts/nixos-desktop/disko.nix b/hosts/nixos-desktop/disko.nix index 96d8b60..d373c43 100644 --- a/hosts/nixos-desktop/disko.nix +++ b/hosts/nixos-desktop/disko.nix @@ -1,4 +1,4 @@ -{ pkgs, ... }: +{ lib, ... }: { # needed for zfs pool @@ -83,26 +83,9 @@ }; }; # rollback to blank - boot.initrd.systemd.services.rollback = { - description = "Rollback ZFS datasets to a pristine state"; - wantedBy = [ - "initrd.target" - ]; - after = [ - "zfs-import-zroot.service" - ]; - before = [ - "sysroot.mount" - ]; - path = with pkgs; [ - zfs - ]; - unitConfig.DefaultDependencies = "no"; - serviceConfig.Type = "oneshot"; - script = '' - zfs rollback -r zroot/encrypted/root@blank && echo "rollback complete" - ''; - }; + boot.initrd.postDeviceCommands = lib.mkAfter '' + zfs rollback -r zroot/encrypted/root@blank && echo "rollback complete" + ''; fileSystems."/persist".neededForBoot = true; # HACK: to fix issue of agenix running before impermanence age.identityPaths = [ diff --git a/hosts/nixos-desktop/hardware-configuration.nix b/hosts/nixos-desktop/hardware-configuration.nix index ce0041c..2b77412 100644 --- a/hosts/nixos-desktop/hardware-configuration.nix +++ b/hosts/nixos-desktop/hardware-configuration.nix @@ -11,7 +11,6 @@ initrd = { availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" ]; kernelModules = [ ]; - luks.devices."enc".device = "/dev/disk/by-uuid/30025a9f-44cf-4074-8ae2-d4925efd67dd"; }; kernelModules = [ "kvm-amd" ]; extraModulePackages = [ ]; diff --git a/modules/profiles/desktop.nix b/modules/profiles/desktop.nix index b5d865a..cce9eae 100644 --- a/modules/profiles/desktop.nix +++ b/modules/profiles/desktop.nix @@ -16,7 +16,7 @@ in yubikey = { enable = mkDefault true; luksSupport = { - enable = mkDefault true; + enable = mkDefault false; devices = mkDefault [ "enc" ]; }; }; diff --git a/modules/programs/hyprland/_config.nix b/modules/programs/hyprland/_config.nix index cbeabbf..4ea8616 100644 --- a/modules/programs/hyprland/_config.nix +++ b/modules/programs/hyprland/_config.nix @@ -111,7 +111,7 @@ in } misc { - vrr = 1 + vrr = 0 mouse_move_enables_dpms = true key_press_enables_dpms = true force_default_wallpaper = 0