Commit `bb32c67eaf25`

Vincent Demeester <vincent@sbr.pm>

2026-06-22 09:53:28

fix: resolve all nixpkgs 26.05 deprecation warnings

Updated harmonia options to services.harmonia.cache and removed stale flake-parts input override. Migrated SSH extraOptions to direct matchBlock attrs where supported. Renamed xorg.* packages to new top-level names and antigravity to antigravity-cli. Updated caddy plugin hash.

main

1 parent 6f123ea

Changed files (8)

home

common

dev

ai.nix

shell

openssh.nix

lib

functions.nix

modules

harmonia

default.nix

overlays

default.nix

systems

carthage

extra.nix

common

programs

nix-ld.nix

flake.nix

@@ -90,7 +90,7 @@ in
     # AI coding agents (from numtide/llm-agents.nix)
     llm-agents.claude-code
     llm-agents.claude-agent-acp
-    llm-agents.antigravity
+    llm-agents.antigravity-cli
     llm-agents.gemini-cli
     llm-agents.opencode
     llm-agents.pi

@@ -242,46 +242,36 @@ in
               hostname = "github.com";
               user = "git";
               # identityFile set by host-specific overrides
-              extraOptions = {
-                controlMaster = "auto";
-                controlPersist = "360";
-              };
+              controlMaster = "auto";
+              controlPersist = "360";
             };
             "gitlab.com" = {
               hostname = "gitlab.com";
               user = "git";
               # identityFile set by host-specific overrides
-              extraOptions = {
-                controlMaster = "auto";
-                controlPersist = "360";
-              };
+              controlMaster = "auto";
+              controlPersist = "360";
             };
             "codeberg.org" = {
               hostname = "codeberg.org";
               user = "git";
               # identityFile set by host-specific overrides
-              extraOptions = {
-                controlMaster = "auto";
-                controlPersist = "360";
-              };
+              controlMaster = "auto";
+              controlPersist = "360";
             };
             "git.sr.ht" = {
               hostname = "git.sr.ht";
               user = "git";
               # identityFile set by host-specific overrides
-              extraOptions = {
-                controlMaster = "auto";
-                controlPersist = "360";
-              };
+              controlMaster = "auto";
+              controlPersist = "360";
             };
             "tangled.org" = {
               hostname = "tangled.org";
               user = "git";
               identityFile = "~/.ssh/id_personal_sk";
-              extraOptions = {
-                controlMaster = "auto";
-                controlPersist = "360";
-              };
+              controlMaster = "auto";
+              controlPersist = "360";
             };
             "*.redhat.com" = {
               user = "vdemeest";

@@ -161,9 +161,7 @@ let
             identityFile = "~/.ssh/id_homelab_sk";
             identitiesOnly = true;
             # Disable IdentityAgent only for aomi.home (prevents yubikey prompts in TRAMP)
-            extraOptions = lib.optionalAttrs (x == "aomi.home") {
-              IdentityAgent = "none";
-            };
+            identityAgent = lib.mkIf (x == "aomi.home") "none";
           };
         })
         (

@@ -121,7 +121,7 @@ in
   config = mkIf cfg.enable (mkMerge [
     # Harmonia cache server
     {
-      services.harmonia = {
+      services.harmonia.cache = {
         enable = true;
         signKeyPaths = [ cfg.signKeyPath ];
         settings = {

@@ -99,7 +99,7 @@ in
           inherit (_prev) gemini-cli;
           inherit (_prev) cursor-cli;
           inherit (_prev) code-cursor;
-          inherit (_prev) antigravity;
+          inherit (_prev) antigravity-cli;
           inherit (_prev) lazyworktree;
           inherit (_prev) devenv;
           inherit (_prev) apko;

@@ -740,7 +740,7 @@ in
     # Use Caddy with rate-limit plugin
     package = pkgs.caddy.withPlugins {
       plugins = [ "github.com/mholt/caddy-ratelimit@v0.1.1-0.20250915152450-04ea34edc0c4" ];
-      hash = "sha256-x5jeKfjXeUj4t5t6+gRRjpmjF3n5P25T0lVED4EEu54=";
+      hash = "sha256-cLh5oCieQwdAW9y+BNj6hoL2mRx2n42D+cV2czZRbH0=";
     };
 
     # Enable Prometheus metrics on VPN interface only

@@ -60,20 +60,20 @@
           libGL
           libappindicator-gtk3
           vulkan-loader
-          xorg.libX11
-          xorg.libXScrnSaver
-          xorg.libXcomposite
-          xorg.libXcursor
-          xorg.libXdamage
-          xorg.libXext
-          xorg.libXfixes
-          xorg.libXi
-          xorg.libXrandr
-          xorg.libXrender
-          xorg.libXtst
-          xorg.libxcb
-          xorg.libxkbfile
-          xorg.libxshmfence
+          libx11
+          libxscrnsaver
+          libxcomposite
+          libxcursor
+          libxdamage
+          libxext
+          libxfixes
+          libxi
+          libxrandr
+          libxrender
+          libxtst
+          libxcb
+          libxkbfile
+          libxshmfence
         ];
     };
   };

@@ -466,7 +466,6 @@
 
     harmonia.url = "github:nix-community/harmonia";
     harmonia.inputs.nixpkgs.follows = "nixpkgs";
-    harmonia.inputs.flake-parts.follows = "flake-parts";
 
     system-manager.url = "github:numtide/system-manager";
     system-manager.inputs.nixpkgs.follows = "nixpkgs";

Commit bb32c67eaf25

Commit `bb32c67eaf25`