re-organise flake inputs (and de-duplicate nixpkgs)
2 files changed, 84 insertions(+), 140 deletions(-)
changed files
M flake.lock → flake.lock
@@ -2,8 +2,12 @@ { "nodes": { "agenix": { "inputs": { - "darwin": "darwin", - "home-manager": "home-manager", + "darwin": [ + "darwin" + ], + "home-manager": [ + "home-manager" + ], "nixpkgs": [ "nixpkgs" ],@@ -65,28 +69,6 @@ }, "darwin": { "inputs": { "nixpkgs": [ - "agenix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1744478979, - "narHash": "sha256-dyN+teG9G82G+m+PX/aSAagkC+vUv0SgUw3XkPhQodQ=", - "owner": "lnl7", - "repo": "nix-darwin", - "rev": "43975d782b418ebf4969e9ccba82466728c2851b", - "type": "github" - }, - "original": { - "owner": "lnl7", - "ref": "master", - "repo": "nix-darwin", - "type": "github" - } - }, - "darwin_2": { - "inputs": { - "nixpkgs": [ "nixpkgs" ] },@@ -109,7 +91,9 @@ "elgit": { "inputs": { "flake-utils": "flake-utils", "gomod2nix": "gomod2nix", - "nixpkgs": "nixpkgs" + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { "lastModified": 1752338017,@@ -425,27 +409,6 @@ }, "home-manager": { "inputs": { "nixpkgs": [ - "agenix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1745494811, - "narHash": "sha256-YZCh2o9Ua1n9uCvrvi5pRxtuVNml8X2a03qIFfRKpFs=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "abfad3d2958c9e6300a883bd443512c55dfeb1be", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "home-manager", - "type": "github" - } - }, - "home-manager_2": { - "inputs": { - "nixpkgs": [ "nixpkgs" ] },@@ -494,7 +457,9 @@ }, "mycal": { "inputs": { "flake-utils": "flake-utils_2", - "nixpkgs": "nixpkgs_2", + "nixpkgs": [ + "nixpkgs" + ], "pyproject-build-systems": "pyproject-build-systems", "pyproject-nix": "pyproject-nix", "uv2nix": "uv2nix"@@ -550,38 +515,6 @@ } }, "nixpkgs": { "locked": { - "lastModified": 1751984180, - "narHash": "sha256-LwWRsENAZJKUdD3SpLluwDmdXY9F45ZEgCb0X+xgOL0=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "9807714d6944a957c2e036f84b0ff8caf9930bc0", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_2": { - "locked": { - "lastModified": 1751792365, - "narHash": "sha256-J1kI6oAj25IG4EdVlg2hQz8NZTBNYvIS0l4wpr9KcUo=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "1fd8bada0b6117e6c7eb54aad5813023eed37ccb", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { - "locked": { "lastModified": 1730768919, "narHash": "sha256-8AKquNnnSaJRXZxc5YmF/WfmxiHX6MMZZasRP6RRQkE=", "owner": "NixOS",@@ -596,23 +529,7 @@ "repo": "nixpkgs", "type": "github" } }, - "nixpkgs_4": { - "locked": { - "lastModified": 1749776303, - "narHash": "sha256-OHibOvVwKqO1qvRg0r3agtd1EagW4THBcoWT7QGgcNo=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "6e7721e37bf00fa7ea44ac3cfc9d2411284ec3ef", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_5": { + "nixpkgs_2": { "locked": { "lastModified": 1747958103, "narHash": "sha256-qmmFCrfBwSHoWw7cVK4Aj+fns+c54EBP8cGqp/yK410=",@@ -628,7 +545,7 @@ "repo": "nixpkgs", "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_3": { "locked": { "lastModified": 1751203939, "narHash": "sha256-omYD+H5LlSihz2DRfv90I8Oeo7JNEwvcHPHX+6nMIM4=",@@ -640,22 +557,6 @@ }, "original": { "owner": "NixOS", "ref": "nixos-unstable-small", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_7": { - "locked": { - "lastModified": 1747958103, - "narHash": "sha256-qmmFCrfBwSHoWw7cVK4Aj+fns+c54EBP8cGqp/yK410=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "fe51d34885f7b5e3e7b59572796e1bcb427eccb1", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" }@@ -731,7 +632,7 @@ "pre-commit-hooks": { "inputs": { "flake-compat": "flake-compat_2", "gitignore": "gitignore", - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs" }, "locked": { "lastModified": 1750779888,@@ -824,10 +725,10 @@ "root": { "inputs": { "agenix": "agenix", "angrr": "angrr", - "darwin": "darwin_2", + "darwin": "darwin", "elgit": "elgit", "golink": "golink", - "home-manager": "home-manager_2", + "home-manager": "home-manager", "mycal": "mycal", "nix-index-database": "nix-index-database", "nixos-hardware": "nixos-hardware",@@ -848,7 +749,9 @@ "searchix": { "inputs": { "flake-utils": "flake-utils_4", "gomod2nix": "gomod2nix_2", - "nixpkgs": "nixpkgs_4", + "nixpkgs": [ + "nixpkgs" + ], "pre-commit-hooks": "pre-commit-hooks_2", "simple-css": "simple-css", "treefmt-nix": "treefmt-nix_2"@@ -881,7 +784,7 @@ } }, "srvos": { "inputs": { - "nixpkgs": "nixpkgs_6" + "nixpkgs": "nixpkgs_3" }, "locked": { "lastModified": 1752305350,@@ -1040,7 +943,7 @@ } }, "treefmt-nix_2": { "inputs": { - "nixpkgs": "nixpkgs_5" + "nixpkgs": "nixpkgs_2" }, "locked": { "lastModified": 1750931469,@@ -1058,7 +961,9 @@ } }, "treefmt-nix_3": { "inputs": { - "nixpkgs": "nixpkgs_7" + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { "lastModified": 1752055615,
M flake.nix → flake.nix
@@ -1,35 +1,74 @@ { inputs = { - srvos.url = "github:nix-community/srvos"; + srvos = { + url = "github:nix-community/srvos"; + }; + nixos-hardware = { + url = "github:NixOS/nixos-hardware"; + }; + nixpkgs.follows = "srvos/nixpkgs"; - nixos-hardware.url = "github:NixOS/nixos-hardware"; - nix-index-database.url = "github:Mic92/nix-index-database"; - nix-index-database.inputs.nixpkgs.follows = "nixpkgs"; + darwin = { + url = "github:lnl7/nix-darwin/master"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + home-manager = { + url = "github:nix-community/home-manager"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + nur = { url = "github:nix-community/nur"; inputs.nixpkgs.follows = "nixpkgs"; }; - darwin.url = "github:lnl7/nix-darwin/master"; - darwin.inputs.nixpkgs.follows = "nixpkgs"; - home-manager.url = "github:nix-community/home-manager"; - home-manager.inputs.nixpkgs.follows = "nixpkgs"; - utils.url = "github:numtide/flake-utils"; - angrr.url = "github:linyinfeng/angrr"; - angrr.inputs.nixpkgs.follows = "nixpkgs"; - agenix.url = "github:ryantm/agenix"; - agenix.inputs.nixpkgs.follows = "nixpkgs"; - mycal.url = "git+https://git.alin.ovh/mycal"; - elgit.url = "git+https://git.alin.ovh/elgit"; - searchix.url = "git+https://git.alin.ovh/searchix"; + + angrr = { + url = "github:linyinfeng/angrr"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + elgit = { + url = "git+https://git.alin.ovh/elgit"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + golink = { + url = "github:tailscale/golink"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + nix-index-database = { + url = "github:Mic92/nix-index-database"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + mycal = { + url = "git+https://git.alin.ovh/mycal"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + searchix = { + url = "git+https://git.alin.ovh/searchix"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + nixvim = { url = "github:nix-community/nixvim"; inputs.nixpkgs.follows = "nixpkgs"; }; - pre-commit-hooks.url = "github:cachix/git-hooks.nix"; - treefmt-nix.url = "github:numtide/treefmt-nix"; - golink = { - url = "github:tailscale/golink"; + + agenix = { + url = "github:ryantm/agenix"; + inputs = { + nixpkgs.follows = "nixpkgs"; + darwin.follows = "darwin"; + home-manager.follows = "home-manager"; + }; + }; + pre-commit-hooks = { + url = "github:cachix/git-hooks.nix"; + }; + treefmt-nix = { + url = "github:numtide/treefmt-nix"; inputs.nixpkgs.follows = "nixpkgs"; + }; + utils = { + url = "github:numtide/flake-utils"; }; };