diff options
| -rw-r--r-- | README.md | 4 | ||||
| -rw-r--r-- | flake.lock | 51 | ||||
| -rw-r--r-- | flake.nix | 49 | ||||
| -rw-r--r-- | hosts/profiles.nix | 4 | ||||
| -rw-r--r-- | parts/dev.nix | 14 |
5 files changed, 26 insertions, 96 deletions
@@ -36,12 +36,12 @@ there are some amazing tools i use to make/manage this flake that i would highly - [garnix](https://garnix.io) - [home-manager](https://github.com/nix-community/home-manager) +- [agenix](https://github.com/ryantm/agenix) +- [flake-parts](https://github.com/hercules-ci/flake-parts) - [nixinate](https://github.com/MatthewCroughan/nixinate) - [lanzaboote](https://github.com/nix-community/lanzaboote) - [nixos-wsl](https://github.com/nix-community/nixos-wsl) - [nix-openwrt-imagebuilder](https://github.com/astro/nix-openwrt-imagebuilder) -- [flake-parts](https://github.com/hercules-ci/flake-parts) -- [ragenix](https://github.com/yaxitech/ragenix) ## fun screenshots @@ -58,15 +58,19 @@ "crane": { "inputs": { "flake-compat": [ + "lanzaboote", "flake-compat" ], "flake-utils": [ + "lanzaboote", "flake-utils" ], "nixpkgs": [ + "lanzaboote", "nixpkgs" ], "rust-overlay": [ + "lanzaboote", "rust-overlay" ] }, @@ -230,9 +234,7 @@ }, "lanzaboote": { "inputs": { - "crane": [ - "crane" - ], + "crane": "crane", "flake-compat": [ "flake-compat" ], @@ -248,9 +250,7 @@ "pre-commit-hooks-nix": [ "pre-commit" ], - "rust-overlay": [ - "rust-overlay" - ] + "rust-overlay": "rust-overlay" }, "locked": { "lastModified": 1694697985, @@ -447,43 +447,10 @@ "type": "github" } }, - "ragenix": { - "inputs": { - "agenix": [ - "agenix" - ], - "crane": [ - "crane" - ], - "flake-utils": [ - "flake-utils" - ], - "nixpkgs": [ - "nixpkgs" - ], - "rust-overlay": [ - "rust-overlay" - ] - }, - "locked": { - "lastModified": 1682237245, - "narHash": "sha256-xbBR7LNK+d5Yi/D6FXQGc1R6u2VV2nwr/Df5iaEbOEQ=", - "owner": "yaxitech", - "repo": "ragenix", - "rev": "281f68c3d477904f79ff1cd5807a8c226cd80a50", - "type": "github" - }, - "original": { - "owner": "yaxitech", - "repo": "ragenix", - "type": "github" - } - }, "root": { "inputs": { "agenix": "agenix", "arkenfox": "arkenfox", - "crane": "crane", "darwin": "darwin", "flake-compat": "flake-compat", "flake-utils": "flake-utils", @@ -499,17 +466,17 @@ "nur": "nur", "openwrt-imagebuilder": "openwrt-imagebuilder", "parts": "parts", - "pre-commit": "pre-commit", - "ragenix": "ragenix", - "rust-overlay": "rust-overlay" + "pre-commit": "pre-commit" } }, "rust-overlay": { "inputs": { "flake-utils": [ + "lanzaboote", "flake-utils" ], "nixpkgs": [ + "lanzaboote", "nixpkgs" ] }, @@ -19,6 +19,15 @@ inputs.nixpkgs-lib.follows = "nixpkgs"; }; + agenix = { + url = "github:ryantm/agenix"; + inputs = { + nixpkgs.follows = "nixpkgs"; + darwin.follows = "darwin"; + home-manager.follows = "hm"; + }; + }; + arkenfox = { url = "github:dwarfmaster/arkenfox-nixos"; inputs = { @@ -55,12 +64,10 @@ url = "github:nix-community/lanzaboote"; inputs = { nixpkgs.follows = "nixpkgs"; - crane.follows = "crane"; flake-compat.follows = "flake-compat"; flake-parts.follows = "parts"; flake-utils.follows = "flake-utils"; pre-commit-hooks-nix.follows = "pre-commit"; - rust-overlay.follows = "rust-overlay"; }; }; @@ -100,17 +107,6 @@ }; }; - ragenix = { - url = "github:yaxitech/ragenix"; - inputs = { - nixpkgs.follows = "nixpkgs"; - agenix.follows = "agenix"; - crane.follows = "crane"; - flake-utils.follows = "flake-utils"; - rust-overlay.follows = "rust-overlay"; - }; - }; - # ------------------------------ # -- these are just to avoid having multiple versions in flake.lock # ------------------------------ @@ -121,33 +117,6 @@ }; flake-utils.url = "github:numtide/flake-utils"; - - agenix = { - url = "github:ryantm/agenix"; - inputs = { - nixpkgs.follows = "nixpkgs"; - darwin.follows = "darwin"; - home-manager.follows = "hm"; - }; - }; - - crane = { - url = "github:ipetkov/crane"; - inputs = { - nixpkgs.follows = "nixpkgs"; - flake-compat.follows = "flake-compat"; - flake-utils.follows = "flake-utils"; - rust-overlay.follows = "rust-overlay"; - }; - }; - - rust-overlay = { - url = "github:oxalica/rust-overlay"; - inputs = { - nixpkgs.follows = "nixpkgs"; - flake-utils.follows = "flake-utils"; - }; - }; }; outputs = { diff --git a/hosts/profiles.nix b/hosts/profiles.nix index 59ab599..9bf9d9f 100644 --- a/hosts/profiles.nix +++ b/hosts/profiles.nix @@ -10,7 +10,7 @@ in { inherit specialArgs; modules = with inputs; [ - ragenix.nixosModules.default + agenix.nixosModules.default hm.nixosModules.home-manager nur.nixosModules.nur @@ -64,7 +64,7 @@ in { inherit specialArgs; modules = with inputs; [ - ragenix.nixosModules.default + agenix.nixosModules.default ../modules/nixos/base ../modules/nixos/server ../modules/nixos/features/tailscale.nix diff --git a/parts/dev.nix b/parts/dev.nix index f10ea88..1ecb17e 100644 --- a/parts/dev.nix +++ b/parts/dev.nix @@ -1,14 +1,8 @@ -{ - inputs, - lib, - ... -}: let - inherit (inputs) ragenix; -in { +{lib, ...}: { perSystem = { - config, pkgs, - system, + config, + inputs', ... }: { pre-commit = { @@ -34,7 +28,7 @@ in { statix stylua ] - ++ lib.optional pkgs.stdenv.isLinux ragenix.packages.${system}.ragenix; + ++ lib.optional stdenv.isLinux inputs'.agenix.packages.agenix; }; }; |