all repos — nixfiles @ 99019e23114bf9c801f2b771a97b42f8a7ef056f

System and user configuration, managed by nix and home-manager

re-organise flake inputs (and de-duplicate nixpkgs)

Alan Pearce
commit

99019e23114bf9c801f2b771a97b42f8a7ef056f

parent

2bb5d6643a849eafe8279719afb78da0b9dba2e0

1 file changed, 59 insertions(+), 20 deletions(-)

changed files
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";
     };
   };