From 735af95b321e658c1011b64f35a895d9d37d6868 Mon Sep 17 00:00:00 2001
From: Filippo Berto <berto.f@protonmail.com>
Date: Sat, 14 Jun 2025 15:25:40 +0200
Subject: [PATCH] Flake: better dependency management

---
 flake.lock | 39 +++++++++++++++++++++------------------
 flake.nix  | 33 +++++++--------------------------
 2 files changed, 28 insertions(+), 44 deletions(-)

diff --git a/flake.lock b/flake.lock
index 9cefecb..d701c4c 100644
--- a/flake.lock
+++ b/flake.lock
@@ -286,7 +286,7 @@
     "home-manager": {
       "inputs": {
         "nixpkgs": [
-          "nixpkgs"
+          "nixpkgs-s"
         ]
       },
       "locked": {
@@ -498,6 +498,22 @@
         "type": "github"
       }
     },
+    "nixpkgs-s": {
+      "locked": {
+        "lastModified": 1749906907,
+        "narHash": "sha256-3utRKKFaoVhanwUqzb2fCnTcskq2uwSCDD/zLgnSa/E=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "200b75e8120c5bbe749f600f4e24d405a9bc8633",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "release-25.05",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "nixpkgs-u": {
       "locked": {
         "lastModified": 1748693115,
@@ -545,22 +561,6 @@
         "type": "github"
       }
     },
-    "nixpkgs_4": {
-      "locked": {
-        "lastModified": 1748954775,
-        "narHash": "sha256-9yZojiHsS+Bi9OivZglSIXryy6iCJZfM8UMn59tiKc8=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "667858166b89c072208ac151fa9502513d7d8389",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "release-24.11",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "ragenix": {
       "inputs": {
         "agenix": "agenix",
@@ -596,7 +596,10 @@
         "nix-rice": "nix-rice",
         "nixos-generators": "nixos-generators",
         "nixos-hardware": "nixos-hardware",
-        "nixpkgs": "nixpkgs_4",
+        "nixpkgs": [
+          "nixpkgs-u"
+        ],
+        "nixpkgs-s": "nixpkgs-s",
         "nixpkgs-u": "nixpkgs-u",
         "ragenix": "ragenix",
         "systems": "systems_5"
diff --git a/flake.nix b/flake.nix
index 9343bc3..1deae7c 100644
--- a/flake.nix
+++ b/flake.nix
@@ -3,35 +3,16 @@
 
   inputs = {
     flake-compat.url = "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz";
-
-    nixpkgs.url = "github:NixOS/nixpkgs/release-24.11";
+    nixpkgs-s.url = "github:NixOS/nixpkgs/release-25.05";
     nixpkgs-u.url = "github:NixOS/nixpkgs/nixos-unstable";
-    home-manager = {
-      url = "github:nix-community/home-manager/release-24.11";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-    home-manager-u = {
-      url = "github:nix-community/home-manager";
-      inputs = { nixpkgs.follows = "nixpkgs-u"; };
-    };
+    nixpkgs.follows = "nixpkgs-u";
+    home-manager = { url = "github:nix-community/home-manager/release-24.11"; inputs.nixpkgs.follows = "nixpkgs-s"; };
+    home-manager-u = { url = "github:nix-community/home-manager"; inputs = { nixpkgs.follows = "nixpkgs-u"; }; };
     # agenix.url = "github:ryantm/agenix";
-    ragenix = {
-      url = "github:yaxitech/ragenix";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-    deploy-rs = {
-      url = "github:serokell/deploy-rs";
-      inputs = {
-        nixpkgs.follows = "nixpkgs";
-      };
-    };
+    ragenix = { url = "github:yaxitech/ragenix"; inputs.nixpkgs.follows = "nixpkgs"; };
+    deploy-rs = { url = "github:serokell/deploy-rs"; inputs.nixpkgs.follows = "nixpkgs"; };
     nix-rice.url = "github:bertof/nix-rice/modules";
-    nixos-generators = {
-      url = "github:nix-community/nixos-generators";
-      inputs = {
-        nixpkgs.follows = "nixpkgs";
-      };
-    };
+    nixos-generators = { url = "github:nix-community/nixos-generators"; inputs.nixpkgs.follows = "nixpkgs"; };
     nixos-hardware.url = "github:NixOS/nixos-hardware";
 
     systems.url = "github:nix-systems/default";