diff options
| -rw-r--r-- | flake.lock | 96 | ||||
| -rw-r--r-- | flake.nix | 12 | ||||
| -rw-r--r-- | hosts/profiles.nix | 2 | ||||
| -rw-r--r-- | modules/nixos/server/default.nix | 2 |
4 files changed, 36 insertions, 76 deletions
@@ -2,18 +2,22 @@ "nodes": { "agenix": { "inputs": { - "darwin": "darwin_2", + "darwin": [ + "darwin" + ], + "home-manager": [ + "home-manager" + ], "nixpkgs": [ - "ragenix", "nixpkgs" ] }, "locked": { - "lastModified": 1682101079, - "narHash": "sha256-MdAhtjrLKnk2uiqun1FWABbKpLH090oeqCSiWemtuck=", + "lastModified": 1690228878, + "narHash": "sha256-9Xe7JV0krp4RJC9W9W9WutZVlw6BlHTFMiUP/k48LQY=", "owner": "ryantm", "repo": "agenix", - "rev": "2994d002dcff5353ca1ac48ec584c7f6589fe447", + "rev": "d8c973fd228949736dedf61b7f8cc1ece3236792", "type": "github" }, "original": { @@ -72,29 +76,6 @@ "type": "github" } }, - "darwin_2": { - "inputs": { - "nixpkgs": [ - "ragenix", - "agenix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1673295039, - "narHash": "sha256-AsdYgE8/GPwcelGgrntlijMg4t3hLFJFCRF3tL5WVjA=", - "owner": "lnl7", - "repo": "nix-darwin", - "rev": "87b9d090ad39b25b2400029c64825fc2a8868943", - "type": "github" - }, - "original": { - "owner": "lnl7", - "ref": "master", - "repo": "nix-darwin", - "type": "github" - } - }, "deploy-rs": { "inputs": { "flake-compat": [ @@ -289,7 +270,9 @@ "flake-utils": [ "flake-utils" ], - "nixpkgs": "nixpkgs", + "nixpkgs": [ + "nixpkgs" + ], "pre-commit-hooks-nix": [ "pre-commit-hooks" ] @@ -371,18 +354,17 @@ }, "nixpkgs": { "locked": { - "lastModified": 1689846679, - "narHash": "sha256-89uOAMBZK4jooekzMZcm4sGxZp9kThMvJI6wVf00RfI=", + "lastModified": 1691654369, + "narHash": "sha256-gSILTEx1jRaJjwZxRlnu3ZwMn1FVNk80qlwiCX8kmpo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "17dd4c92ee12de80a1fe86ea30be723e4e06cd00", + "rev": "ce5e4a6ef2e59d89a971bc434ca8ca222b9c7f5e", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixos-unstable-small", - "repo": "nixpkgs", - "type": "github" + "id": "nixpkgs", + "ref": "nixos-unstable", + "type": "indirect" } }, "nixpkgs-stable": { @@ -400,37 +382,6 @@ "type": "indirect" } }, - "nixpkgs_2": { - "locked": { - "lastModified": 1691654369, - "narHash": "sha256-gSILTEx1jRaJjwZxRlnu3ZwMn1FVNk80qlwiCX8kmpo=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "ce5e4a6ef2e59d89a971bc434ca8ca222b9c7f5e", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "ref": "nixos-unstable", - "type": "indirect" - } - }, - "nixpkgs_3": { - "locked": { - "lastModified": 1681920287, - "narHash": "sha256-+/d6XQQfhhXVfqfLROJoqj3TuG38CAeoT6jO1g9r1k0=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "645bc49f34fa8eff95479f0345ff57e55b53437e", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nur": { "locked": { "lastModified": 1691793966, @@ -498,12 +449,16 @@ }, "ragenix": { "inputs": { - "agenix": "agenix", + "agenix": [ + "agenix" + ], "crane": "crane", "flake-utils": [ "flake-utils" ], - "nixpkgs": "nixpkgs_3", + "nixpkgs": [ + "nixpkgs" + ], "rust-overlay": "rust-overlay" }, "locked": { @@ -522,6 +477,7 @@ }, "root": { "inputs": { + "agenix": "agenix", "darwin": "darwin", "deploy-rs": "deploy-rs", "flake-compat": "flake-compat", @@ -534,7 +490,7 @@ "nix-index-database": "nix-index-database", "nixos-hardware": "nixos-hardware", "nixos-wsl": "nixos-wsl", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs", "nixpkgs-stable": "nixpkgs-stable", "nur": "nur", "openwrt-imagebuilder": "openwrt-imagebuilder", @@ -6,13 +6,11 @@ "https://getchoo.cachix.org" # personal cache "https://cache.garnix.io" # garnix cache "https://nix-community.cachix.org" # nix-community - "https://wurzelpfropf.cachix.org" # ragenix ]; extra-trusted-public-keys = [ "getchoo.cachix.org-1:ftdbAUJVNaFonM0obRGgR5+nUmdLMM+AOvDOSx0z5tE=" "cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g=" "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" - "wurzelpfropf.cachix.org-1:ilZwK5a6wJqVr7Fyrzp4blIEkGK+LJT0QrpWr1qBNq0=" ]; }; @@ -24,6 +22,13 @@ inputs.nixpkgs.follows = "nixpkgs"; }; + agenix = { + url = "github:ryantm/agenix"; + inputs.nixpkgs.follows = "nixpkgs"; + inputs.darwin.follows = "darwin"; + inputs.home-manager.follows = "home-manager"; + }; + deploy-rs = { url = "github:serokell/deploy-rs"; inputs.nixpkgs.follows = "nixpkgs"; @@ -64,6 +69,7 @@ lanzaboote = { url = "github:nix-community/lanzaboote"; + inputs.nixpkgs.follows = "nixpkgs"; inputs.flake-compat.follows = "flake-compat"; inputs.flake-parts.follows = "flake-parts"; inputs.flake-utils.follows = "flake-utils"; @@ -100,6 +106,8 @@ ragenix = { url = "github:yaxitech/ragenix"; + inputs.nixpkgs.follows = "nixpkgs"; + inputs.agenix.follows = "agenix"; inputs.flake-utils.follows = "flake-utils"; }; }; diff --git a/hosts/profiles.nix b/hosts/profiles.nix index ae25d91..149c69f 100644 --- a/hosts/profiles.nix +++ b/hosts/profiles.nix @@ -19,14 +19,12 @@ "https://getchoo.cachix.org" "https://cache.garnix.io" "https://nix-community.cachix.org" - "https://wurzelpfropf.cachix.org" ]; trusted-public-keys = [ "getchoo.cachix.org-1:ftdbAUJVNaFonM0obRGgR5+nUmdLMM+AOvDOSx0z5tE=" "cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g=" "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" - "wurzelpfropf.cachix.org-1:ilZwK5a6wJqVr7Fyrzp4blIEkGK+LJT0QrpWr1qBNq0=" ]; }; }; diff --git a/modules/nixos/server/default.nix b/modules/nixos/server/default.nix index ed62e81..f53fade 100644 --- a/modules/nixos/server/default.nix +++ b/modules/nixos/server/default.nix @@ -35,14 +35,12 @@ in { "https://getchoo.cachix.org" "https://cache.garnix.io" "https://nix-community.cachix.org" - "https://wurzelpfropf.cachix.org" ]; trusted-public-keys = [ "getchoo.cachix.org-1:ftdbAUJVNaFonM0obRGgR5+nUmdLMM+AOvDOSx0z5tE=" "cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g=" "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" - "wurzelpfropf.cachix.org-1:ilZwK5a6wJqVr7Fyrzp4blIEkGK+LJT0QrpWr1qBNq0=" ]; }; }; |