nixpkgs: 25.05 -> 25.11

9 files changed, 28 insertions, 33 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";
diff --git a/modules/lidControl.nix b/modules/lidControl.nix
index a109f7b..38f0a0f 100644
--- a/modules/lidControl.nix
+++ b/modules/lidControl.nix
@@ -47,8 +47,8 @@
         esac
       fi
     '';
-    services.logind.lidSwitch = "ignore";
-    services.logind.lidSwitchDocked = "ignore";
-    services.logind.lidSwitchExternalPower = "ignore";
+    services.logind.settings.Login.HandleLidSwitch = "ignore";
+    services.logind.settings.Login.HandleLidSwitchDocked = "ignore";
+    services.logind.settings.Login.HandleLidSwitchExternalPower = "ignore";
   };
 }
diff --git a/pkgs/simple/editor-input.nix b/pkgs/simple/editor-input.nix
index 536084d..0591f2f 100644
--- a/pkgs/simple/editor-input.nix
+++ b/pkgs/simple/editor-input.nix
@@ -1,7 +1,7 @@
 { pkgs }:
 pkgs.writeDashBin "editor-input" ''
   exec \
-  ${pkgs.utillinux}/bin/setsid -f \
+  ${pkgs.util-linux}/bin/setsid -f \
   ${pkgs.with-tmpdir}/bin/with-tmpdir -t editor-input.XXXXXXXX \
   ${pkgs.writeDash "editor-input.sh" ''
     f=$TMPDIR/input
diff --git a/pkgs/simple/fzmenu/default.nix b/pkgs/simple/fzmenu/default.nix
index d11a988..9a9bda6 100644
--- a/pkgs/simple/fzmenu/default.nix
+++ b/pkgs/simple/fzmenu/default.nix
@@ -27,7 +27,7 @@ pkgs.runCommand "fzmenu" {
         (pkgs.pass.withExtensions (ext: [
           ext.pass-otp
         ]))
-        pkgs.utillinux
+        pkgs.util-linux
         pkgs.xsel
         pkgs.xvkbd
         terminal
@@ -44,7 +44,7 @@ pkgs.runCommand "fzmenu" {
         (pkgs.pass.withExtensions (ext: [
           ext.pass-otp
         ]))
-        pkgs.utillinux
+        pkgs.util-linux
         pkgs.xsel
         pkgs.xvkbd
         terminal
diff --git a/pkgs/simple/hc.nix b/pkgs/simple/hc.nix
index 086445e..15550dc 100644
--- a/pkgs/simple/hc.nix
+++ b/pkgs/simple/hc.nix
@@ -1,5 +1,5 @@
 { fetchgit, lib, makeWrapper, stdenv
-, coreutils, findutils, gawk, gnugrep, qrencode, texlive, utillinux, zbar
+, coreutils, findutils, gawk, gnugrep, qrencode, texlive, util-linux, zbar
 }:
 
 stdenv.mkDerivation rec {
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
         gnugrep
         qrencode
         texlive.combined.scheme-full
-        utillinux
+        util-linux
         zbar
       ]}
   '';
diff --git a/pkgs/simple/pinentry-urxvt/default.nix b/pkgs/simple/pinentry-urxvt/default.nix
index 808d00a..e79b09f 100644
--- a/pkgs/simple/pinentry-urxvt/default.nix
+++ b/pkgs/simple/pinentry-urxvt/default.nix
@@ -51,7 +51,7 @@ in
       trap cleanup EXIT
 
       cleanup() {
-        ${pkgs.utillinux}/bin/kill -- $(${pkgs.coreutils}/bin/cat "$displayers")
+        ${pkgs.util-linux}/bin/kill -- $(${pkgs.coreutils}/bin/cat "$displayers")
         rm "$displayers"
         rm "$screenshot"
       }
diff --git a/pkgs/simple/q/default.nix b/pkgs/simple/q/default.nix
index ca4a466..5944dd9 100644
--- a/pkgs/simple/q/default.nix
+++ b/pkgs/simple/q/default.nix
@@ -17,11 +17,11 @@ let
   in /* sh */ ''
     cols=$(${pkgs.ncurses}/bin/tput cols)
     if test $cols -ge ${toString (need_width 3)}; then
-      ${pkgs.utillinux}/bin/cal --color=always -mw3
+      ${pkgs.util-linux}/bin/cal --color=always -mw3
     elif test $cols -ge ${toString (need_width 2)}; then
-      ${pkgs.utillinux}/bin/cal --color=always -mw -n 2
+      ${pkgs.util-linux}/bin/cal --color=always -mw -n 2
     elif test $cols -ge ${toString (need_width 1)}; then
-      ${pkgs.utillinux}/bin/cal --color=always -mw1
+      ${pkgs.util-linux}/bin/cal --color=always -mw1
     else
       :
     fi |