fix(desktop): issues
parent
1b22c1345f
commit
072d016f46
|
@ -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" ];
|
||||
};
|
||||
|
||||
|
|
|
@ -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 = [
|
||||
|
|
|
@ -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 = [ ];
|
||||
|
|
|
@ -16,7 +16,7 @@ in
|
|||
yubikey = {
|
||||
enable = mkDefault true;
|
||||
luksSupport = {
|
||||
enable = mkDefault true;
|
||||
enable = mkDefault false;
|
||||
devices = mkDefault [ "enc" ];
|
||||
};
|
||||
};
|
||||
|
|
|
@ -111,7 +111,7 @@ in
|
|||
}
|
||||
|
||||
misc {
|
||||
vrr = 1
|
||||
vrr = 0
|
||||
mouse_move_enables_dpms = true
|
||||
key_press_enables_dpms = true
|
||||
force_default_wallpaper = 0
|
||||
|
|
Loading…
Reference in New Issue