Compare commits

..

No commits in common. "f93d400ad9eddd04c9209088b0e7fc4c13fb0539" and "9c342040ef33447331371e558591fa58e44e17c8" have entirely different histories.

2 changed files with 15 additions and 38 deletions

View file

@ -8,10 +8,10 @@
[ (modulesPath + "/installer/scan/not-detected.nix") [ (modulesPath + "/installer/scan/not-detected.nix")
]; ];
boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "usbhid" "usb_storage" "sd_mod" ]; boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "usbhid" "usb_storage" "sd_mod" "kvm-amd" "amdgpu" ];
boot.initrd.kernelModules = [ ]; boot.initrd.kernelModules = [ "amdgpu" ];
boot.kernelModules = [ "kvm-amd" ]; boot.kernelModules = [ "kvm-amd" "amdgpu" ];
boot.extraModulePackages = with config.boot.kernelPackages; [ zenpower ]; boot.extraModulePackages = with config.boot.kernelPackages; [ zenpower amdgpu-pro ];
hardware.opengl.extraPackages = [ pkgs.amdvlk ]; hardware.opengl.extraPackages = [ pkgs.amdvlk ];
hardware.opengl.extraPackages32 = [ pkgs.driversi686Linux.amdvlk ]; hardware.opengl.extraPackages32 = [ pkgs.driversi686Linux.amdvlk ];
@ -19,35 +19,6 @@
"L+ /opt/rocm/hip - - - - ${pkgs.rocmPackages.clr}" "L+ /opt/rocm/hip - - - - ${pkgs.rocmPackages.clr}"
]; ];
# my stupid usb hub crashes systemct suspend half of the time now
# https://wiki.archlinux.org/title/Power_management/Suspend_and_hibernate#Sleep_hooks
systemd.services.root-suspend = {
enable = true;
description = "Root systemd suspend prehook";
unitConfig = {
Description = "Root systemd suspend prehook";
Before = "sleep.target";
};
serviceConfig = {
Type = "simple";
ExecStart = "${pkgs.uhubctl}/bin/uhubctl -a off";
};
wantedBy = [ "sleep.target" ];
};
systemd.services.root-resume = {
enable = true;
description = "Root systemd suspend posthook";
unitConfig = {
Description = "Root systemd suspend posthook";
After = "suspend.target";
};
serviceConfig = {
Type = "simple";
ExecStart = "${pkgs.uhubctl}/bin/uhubctl -a on";
};
wantedBy = [ "suspend.target" ];
};
services.btrfs.autoScrub = { services.btrfs.autoScrub = {
enable = true; enable = true;
interval = "weekly"; interval = "weekly";

View file

@ -136,7 +136,7 @@
bind=,code:255,exec,airplane-mode bind=,code:255,exec,airplane-mode
bind=SUPER,C,exec,wl-copy $(hyprpicker) bind=SUPER,C,exec,wl-copy $(hyprpicker)
bind=SUPERSHIFT,S,exec,systemctl suspend bind=SUPERSHIFT,S,exec,hyprlock & sleep 1 && systemctl suspend
bind=SUPERCTRL,L,exec,hyprlock bind=SUPERCTRL,L,exec,hyprlock
bind=SUPER,H,movefocus,l bind=SUPER,H,movefocus,l
@ -380,14 +380,20 @@
]; ];
home.file.".config/hypr/hypridle.conf".text = '' home.file.".config/hypr/hypridle.conf".text = ''
general { general {
lock_cmd = pgrep hyprlock || hyprlock lock_cmd = hyprlock
before_sleep_cmd = loginctl lock-session unlock_cmd =
before_sleep_cmd = hyprlock
after_sleep_cmd =
ignore_dbus_inhibit = false ignore_dbus_inhibit = false
} }
listener { listener {
timeout = 600 # in seconds timeout = 360 # in seconds
on-timeout = loginctl lock-session on-timeout = hyprlock
on-resume =
timeout = 720 # in seconds
on-timeout = systemctl suspend
on-resume =
} }
''; '';
home.file.".config/hypr/hyprlock.conf".text = '' home.file.".config/hypr/hyprlock.conf".text = ''