3 files changed, 16 insertions, 21 deletions
diff --git a/configs/gitconfig.nix b/configs/gitconfig.nix
index c4111ed..1965427 100644
--- a/configs/gitconfig.nix
+++ b/configs/gitconfig.nix
@@ -6,7 +6,7 @@
       markEmptyLines = false
       stripLeadingSymbols = false
     [pager]
-      diff = ${pkgs.gitAndTools.diff-so-fancy}/bin/diff-so-fancy \
+      diff = ${pkgs.diff-so-fancy}/bin/diff-so-fancy \
            | ${pkgs.less}/bin/less -FRX
     [user]
       email = tv@krebsco.de
diff --git a/configs/hw/winmax2.nix b/configs/hw/winmax2.nix
index 8af5511..7edad5a 100644
--- a/configs/hw/winmax2.nix
+++ b/configs/hw/winmax2.nix
@@ -21,10 +21,6 @@
   hardware.enableRedistributableFirmware = true;
 
   hardware.graphics.enable = true;
-  hardware.graphics.extraPackages = [
-    pkgs.amdvlk
-    pkgs.rocmPackages.clr
-  ];
 
   networking.wireless.enable = true;
   networking.wireless.interfaces = [
@@ -36,9 +32,9 @@
 
   services.illum.enable = true;
 
-  services.logind.extraConfig = /* ini */ ''
-    HandlePowerKey=ignore
-  '';
+  services.logind.settings.Login = {
+    HandlePowerKey = "ignore";
+  };
 
   tv.lidControl.enable = true;
 }
diff --git a/configs/hw/x220.nix b/configs/hw/x220.nix
index 323be01..6cd9641 100644
--- a/configs/hw/x220.nix
+++ b/configs/hw/x220.nix
@@ -49,7 +49,12 @@
   # Required for Centrino.
   hardware.enableRedistributableFirmware = true;
 
-  hardware.graphics.extraPackages = [ pkgs.vaapiIntel pkgs.vaapiVdpau ];
+  hardware.graphics = {
+    extraPackages = [
+      pkgs.intel-vaapi-driver
+      pkgs.libva-vdpau-driver
+    ];
+  };
 
   hardware.trackpoint = {
     enable = true;
@@ -67,18 +72,12 @@
     WOL_DISABLE = false;
   };
 
-
-  services.logind.extraConfig = ''
-    HandleHibernateKey=ignore
-    HandleLidSwitch=ignore
-    HandlePowerKey=ignore
-    HandleSuspendKey=ignore
-  '';
-
-  # because extraConfig is not extra enough:
-  services.logind.lidSwitch = "ignore";
-  services.logind.lidSwitchDocked = "ignore";
-  services.logind.lidSwitchExternalPower = "ignore";
+  services.logind.settings.Login.HandleHibernateKey = "ignore";
+  services.logind.settings.Login.HandleLidSwitch = "ignore";
+  services.logind.settings.Login.HandleLidSwitchDocked = "ignore";
+  services.logind.settings.Login.HandleLidSwitchExternalPower = "ignore";
+  services.logind.settings.Login.HandlePowerKey = "ignore";
+  services.logind.settings.Login.HandleSuspendKey = "ignore";
 
   services.xserver = {
     videoDriver = "intel";