Commit 7f9117f292f5

Vincent Demeester <vincent@sbr.pm>
2026-01-19 23:46:09
fix: resolve NixOS/home-manager deprecation warnings
Fix multiple deprecation warnings from NixOS and home-manager: - Replace programs.zsh.initExtra with initContent in kitty.nix - Update prev.system to prev.stdenv.hostPlatform.system in overlays - Replace nixfmt-rfc-style with nixfmt (now aliased) - Update services.swayidle.events from list to attrset format - Remove redundant nixpkgs.config.allowUnfree with useGlobalPkgs These changes eliminate evaluation warnings while maintaining functionality. Verified with make build on unstable (kyushu) and stable (athena) hosts. Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
main
1 parent 3a907d3
Changed files (7)
home
common
desktop
sway
swayidle.nix
kitty.nix
dev
nix.nix
systems
kyushu
home.nix
default.nix
system-manager.nix
flake.nix
home/common/desktop/sway/swayidle.nix
@@ -6,16 +6,10 @@
   ];
   services.swayidle = {
     enable = true;
-    events = [
-      {
-        event = "before-sleep";
-        command = "${pkgs.swaylock}/bin/swaylock --daemonize -i $HOME/desktop/pictures/lockscreen";
-      }
-      {
-        event = "lock";
-        command = "${pkgs.swaylock}/bin/swaylock --daemonize -i $HOME/desktop/pictures/lockscreen";
-      }
-    ];
+    events = {
+      before-sleep = "${pkgs.swaylock}/bin/swaylock --daemonize -i $HOME/desktop/pictures/lockscreen";
+      lock = "${pkgs.swaylock}/bin/swaylock --daemonize -i $HOME/desktop/pictures/lockscreen";
+    };
     timeouts = [
       {
         timeout = 600;
home/common/desktop/kitty.nix
@@ -184,7 +184,7 @@
     '';
   };
 
-  programs.zsh.initExtra = ''
+  programs.zsh.initContent = ''
     # SSH wrapper - use raw ssh for shpool sessions (host/session pattern)
     # Kitty SSH kitten interferes with RemoteCommand
     ssh() {
home/common/dev/nix.nix
@@ -8,7 +8,7 @@
     nixpkgs-fmt
     nixpkgs-review
     nixfmt-plus
-    nixfmt-rfc-style
+    nixfmt
     nurl
     statix
     deadnix
systems/kyushu/home.nix
@@ -16,7 +16,6 @@ in
     ../../home/common/services/mail-monitor.nix
     ../../home/common/services/redhat.nix
   ];
-  nixpkgs.config.allowUnfree = true;
 
   home.file.".gmailctl/config.jsonnet".source = ./config.jsonnet;
   home.file.".gmailctl/gmailctl.libsonnet".source = ./gmailctl.libsonnet;
systems/default.nix
@@ -36,8 +36,8 @@
 
       # Migrate to "modifications"
       (_: prev: {
-        inherit (inputs.buildkit-tekton.packages.${prev.system}) tkn-local;
-        inherit (inputs.dagger.packages.${prev.system}) dagger;
+        inherit (inputs.buildkit-tekton.packages.${prev.stdenv.hostPlatform.system}) tkn-local;
+        inherit (inputs.dagger.packages.${prev.stdenv.hostPlatform.system}) dagger;
       })
     ];
     config = {
systems/system-manager.nix
@@ -30,8 +30,8 @@
 
       # Migrate to "modifications"
       (_: prev: {
-        inherit (inputs.buildkit-tekton.packages.${prev.system}) tkn-local;
-        inherit (inputs.dagger.packages.${prev.system}) dagger;
+        inherit (inputs.buildkit-tekton.packages.${prev.stdenv.hostPlatform.system}) tkn-local;
+        inherit (inputs.dagger.packages.${prev.stdenv.hostPlatform.system}) dagger;
       })
     ];
     config = {
flake.nix
@@ -221,7 +221,7 @@
             # golangci-lint.enable = true;
             # nix
             deadnix.enable = true;
-            nixfmt-rfc-style.enable = true;
+            nixfmt.enable = true;
             # statix.enable = true;
             # python
             ruff.enable = true;
@@ -273,7 +273,7 @@
               pkgs.git
               pkgs.nodePackages.prettier
               pkgs.deadnix
-              pkgs.nixfmt-rfc-style
+              pkgs.nixfmt
               inputs.agenix.packages.${system}.default
             ];
             name = "home";