diff --git a/README.md b/README.md index edd707cc..20b4fef8 100644 --- a/README.md +++ b/README.md @@ -71,7 +71,7 @@ Start from `flake.nix` (see [Flakes](https://nixos.wiki/wiki/Flakes)). [`flake-p ``` - To autoformat the project tree using nixpkgs-fmt, run `nix fmt`. - To build all flake outputs (locally or in CI), run `nix --accept-flake-config run github:juspay/omnix ci build` -- For secrets management, I use [ragenix](https://github.com/yaxitech/ragenix). +- For secrets management, I use [agenix](https://github.com/ryantm/agenix). ## Discussion diff --git a/flake.lock b/flake.lock index 22f8776e..b6c7fc96 100644 --- a/flake.lock +++ b/flake.lock @@ -27,19 +27,16 @@ "agenix": { "inputs": { "darwin": "darwin", - "home-manager": "home-manager_3", - "nixpkgs": [ - "ragenix", - "nixpkgs" - ], - "systems": "systems_7" + "home-manager": "home-manager", + "nixpkgs": "nixpkgs_2", + "systems": "systems" }, "locked": { - "lastModified": 1707830867, - "narHash": "sha256-PAdwm5QqdlwIqGrfzzvzZubM+FXtilekQ/FA0cI49/o=", + "lastModified": 1723293904, + "narHash": "sha256-b+uqzj+Wa6xgMS9aNbX4I+sXeb5biPDi39VgvSFqFvU=", "owner": "ryantm", "repo": "agenix", - "rev": "8cb01a0e717311680e0cbca06a76cbceba6f3ed6", + "rev": "f6291c5935fdc4e0bef208cfc0dcab7e3f7a1c41", "type": "github" }, "original": { @@ -118,31 +115,9 @@ "type": "github" } }, - "crane_2": { - "inputs": { - "nixpkgs": [ - "ragenix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1708794349, - "narHash": "sha256-jX+B1VGHT0ruHHL5RwS8L21R6miBn4B6s9iVyUJsJJY=", - "owner": "ipetkov", - "repo": "crane", - "rev": "2c94ff9a6fbeb9f3ea0107f28688edbe9c81deaa", - "type": "github" - }, - "original": { - "owner": "ipetkov", - "repo": "crane", - "type": "github" - } - }, "darwin": { "inputs": { "nixpkgs": [ - "ragenix", "agenix", "nixpkgs" ] @@ -371,7 +346,7 @@ }, "flake-utils": { "inputs": { - "systems": "systems_3" + "systems": "systems_4" }, "locked": { "lastModified": 1681202837, @@ -389,7 +364,7 @@ }, "flake-utils_2": { "inputs": { - "systems": "systems_4" + "systems": "systems_5" }, "locked": { "lastModified": 1726560853, @@ -407,7 +382,7 @@ }, "flake-utils_3": { "inputs": { - "systems": "systems_5" + "systems": "systems_6" }, "locked": { "lastModified": 1681202837, @@ -423,24 +398,6 @@ "type": "github" } }, - "flake-utils_4": { - "inputs": { - "systems": "systems_8" - }, - "locked": { - "lastModified": 1705309234, - "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "fourmolu-nix": { "locked": { "lastModified": 1707266073, @@ -579,15 +536,16 @@ "home-manager": { "inputs": { "nixpkgs": [ + "agenix", "nixpkgs" ] }, "locked": { - "lastModified": 1731235328, - "narHash": "sha256-NjavpgE9/bMe/ABvZpyHIUeYF1mqR5lhaep3wB79ucs=", + "lastModified": 1703113217, + "narHash": "sha256-7ulcXOk63TIT2lVDSExj7XzFx09LpdSAPtvgtM7yQPE=", "owner": "nix-community", "repo": "home-manager", - "rev": "60bb110917844d354f3c18e05450606a435d2d10", + "rev": "3bfaacf46133c037bb356193bd2f1765d9dc82c1", "type": "github" }, "original": { @@ -599,7 +557,6 @@ "home-manager_2": { "inputs": { "nixpkgs": [ - "nixvim", "nixpkgs" ] }, @@ -620,17 +577,16 @@ "home-manager_3": { "inputs": { "nixpkgs": [ - "ragenix", - "agenix", + "nixvim", "nixpkgs" ] }, "locked": { - "lastModified": 1703113217, - "narHash": "sha256-7ulcXOk63TIT2lVDSExj7XzFx09LpdSAPtvgtM7yQPE=", + "lastModified": 1731235328, + "narHash": "sha256-NjavpgE9/bMe/ABvZpyHIUeYF1mqR5lhaep3wB79ucs=", "owner": "nix-community", "repo": "home-manager", - "rev": "3bfaacf46133c037bb356193bd2f1765d9dc82c1", + "rev": "60bb110917844d354f3c18e05450606a435d2d10", "type": "github" }, "original": { @@ -692,9 +648,9 @@ "hyprlang": "hyprlang", "hyprutils": "hyprutils", "hyprwayland-scanner": "hyprwayland-scanner", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs_3", "pre-commit-hooks": "pre-commit-hooks", - "systems": "systems", + "systems": "systems_2", "xdph": "xdph" }, "locked": { @@ -909,7 +865,7 @@ "nixpkgs": [ "nixpkgs" ], - "systems": "systems_2" + "systems": "systems_3" }, "locked": { "lastModified": 1730717277, @@ -1053,7 +1009,7 @@ "nixos-vscode-server": { "inputs": { "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs_4" }, "locked": { "lastModified": 1684517665, @@ -1114,6 +1070,22 @@ } }, "nixpkgs_2": { + "locked": { + "lastModified": 1703013332, + "narHash": "sha256-+tFNwMvlXLbJZXiMHqYq77z/RfmpfpiI3yjL6o/Zo9M=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "54aac082a4d9bb5bbc5c4e899603abfb76a3f6d6", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { "locked": { "lastModified": 1730785428, "narHash": "sha256-Zwl8YgTVJTEum+L+0zVAWvXAGbWAuXHax3KzuejaDyo=", @@ -1129,7 +1101,7 @@ "type": "github" } }, - "nixpkgs_3": { + "nixpkgs_4": { "locked": { "lastModified": 1682526928, "narHash": "sha256-2cKh4O6t1rQ8Ok+v16URynmb0rV7oZPEbXkU0owNLQs=", @@ -1142,7 +1114,7 @@ "type": "indirect" } }, - "nixpkgs_4": { + "nixpkgs_5": { "locked": { "lastModified": 1731139594, "narHash": "sha256-IigrKK3vYRpUu+HEjPL/phrfh7Ox881er1UEsZvw9Q4=", @@ -1158,7 +1130,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_6": { "locked": { "lastModified": 1701436327, "narHash": "sha256-tRHbnoNI8SIM5O5xuxOmtSLnswEByzmnQcGGyNRjxsE=", @@ -1172,7 +1144,7 @@ "url": "https://flakehub.com/f/NixOS/nixpkgs/0.1.%2A.tar.gz" } }, - "nixpkgs_6": { + "nixpkgs_7": { "locked": { "lastModified": 1725194671, "narHash": "sha256-tLGCFEFTB5TaOKkpfw3iYT9dnk4awTP/q4w+ROpMfuw=", @@ -1188,29 +1160,13 @@ "type": "github" } }, - "nixpkgs_7": { - "locked": { - "lastModified": 1708655239, - "narHash": "sha256-ZrP/yACUvDB+zbqYJsln4iwotbH6CTZiTkANJ0AgDv4=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "cbc4211f0afffe6dfd2478a62615dd5175a13f9a", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nixvim": { "inputs": { "devshell": "devshell", "flake-compat": "flake-compat_2", "flake-parts": "flake-parts_3", "git-hooks": "git-hooks_2", - "home-manager": "home-manager_2", + "home-manager": "home-manager_3", "nix-darwin": "nix-darwin_2", "nixpkgs": [ "nixpkgs" @@ -1234,7 +1190,7 @@ }, "nuenv": { "inputs": { - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_6", "rust-overlay": "rust-overlay" }, "locked": { @@ -1285,9 +1241,9 @@ "nix-systems-aarch64-linux": "nix-systems-aarch64-linux", "nix-systems-x86_64-darwin": "nix-systems-x86_64-darwin", "nix-systems-x86_64-linux": "nix-systems-x86_64-linux", - "nixpkgs": "nixpkgs_6", + "nixpkgs": "nixpkgs_7", "rust-flake": "rust-flake", - "systems": "systems_6", + "systems": "systems_7", "treefmt-nix": "treefmt-nix_3" }, "locked": { @@ -1328,36 +1284,15 @@ "type": "github" } }, - "ragenix": { - "inputs": { - "agenix": "agenix", - "crane": "crane_2", - "flake-utils": "flake-utils_4", - "nixpkgs": "nixpkgs_7", - "rust-overlay": "rust-overlay_3" - }, - "locked": { - "lastModified": 1718869541, - "narHash": "sha256-smhpGh1x/8mNl+sFL8SbeWnx0bK4HWjmdRA3mIwGjPU=", - "owner": "yaxitech", - "repo": "ragenix", - "rev": "8a254bbaa93fbd38e16f70fa81af6782794e046e", - "type": "github" - }, - "original": { - "owner": "yaxitech", - "repo": "ragenix", - "type": "github" - } - }, "root": { "inputs": { "actualism-app": "actualism-app", + "agenix": "agenix", "disko": "disko", "flake-parts": "flake-parts_2", "git-hooks": "git-hooks", "github-nix-ci": "github-nix-ci", - "home-manager": "home-manager", + "home-manager": "home-manager_2", "hyprland": "hyprland", "nix-darwin": "nix-darwin", "nix-doom-emacs-unstraightened": "nix-doom-emacs-unstraightened", @@ -1365,11 +1300,10 @@ "nixos-hardware": "nixos-hardware", "nixos-unified": "nixos-unified_2", "nixos-vscode-server": "nixos-vscode-server", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_5", "nixvim": "nixvim", "nuenv": "nuenv", - "omnix": "omnix", - "ragenix": "ragenix" + "omnix": "omnix" } }, "rust-flake": { @@ -1433,32 +1367,22 @@ "type": "github" } }, - "rust-overlay_3": { - "inputs": { - "flake-utils": [ - "ragenix", - "flake-utils" - ], - "nixpkgs": [ - "ragenix", - "nixpkgs" - ] - }, + "systems": { "locked": { - "lastModified": 1708740535, - "narHash": "sha256-NCTw235XwSDbeTAtAwg/hOeNOgwYhVq7JjDdbkOgBeA=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "9b24383d77f598716fa0cbb8b48c97249f5ee1af", + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", "type": "github" }, "original": { - "owner": "oxalica", - "repo": "rust-overlay", + "owner": "nix-systems", + "repo": "default", "type": "github" } }, - "systems": { + "systems_2": { "locked": { "lastModified": 1689347949, "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", @@ -1473,21 +1397,6 @@ "type": "github" } }, - "systems_2": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "systems_3": { "locked": { "lastModified": 1681028828, @@ -1563,21 +1472,6 @@ "type": "github" } }, - "systems_8": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "treefmt-nix": { "inputs": { "nixpkgs": [ diff --git a/flake.nix b/flake.nix index 9645c5ac..324b3671 100644 --- a/flake.nix +++ b/flake.nix @@ -13,7 +13,7 @@ nixos-unified.url = "github:srid/nixos-unified"; disko.url = "github:nix-community/disko"; disko.inputs.nixpkgs.follows = "nixpkgs"; - ragenix.url = "github:yaxitech/ragenix"; + agenix.url = "github:ryantm/agenix"; nuenv.url = "github:hallettj/nuenv/writeShellApplication"; # Software inputs diff --git a/modules/darwin/default.nix b/modules/darwin/default.nix index 3b2234e0..ba99bd04 100644 --- a/modules/darwin/default.nix +++ b/modules/darwin/default.nix @@ -18,7 +18,7 @@ in ]; } self.nixosModules.common - inputs.ragenix.darwinModules.default + inputs.agenix.darwinModules.default ./all/zsh-completion-fix.nix ]; diff --git a/modules/flake-parts/devshell.nix b/modules/flake-parts/devshell.nix index 3d4a53a1..beb8dc21 100644 --- a/modules/flake-parts/devshell.nix +++ b/modules/flake-parts/devshell.nix @@ -12,7 +12,7 @@ just colmena nixd - inputs'.ragenix.packages.default + inputs'.agenix.packages.default ]; }; diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix index 0ff84b44..f82329b7 100644 --- a/modules/nixos/default.nix +++ b/modules/nixos/default.nix @@ -16,7 +16,7 @@ in ]; } self.nixosModules.common - inputs.ragenix.nixosModules.default # Used in github-runner.nix & hedgedoc.nix + inputs.agenix.nixosModules.default # Used in github-runner.nix & hedgedoc.nix ./linux/self-ide.nix ./linux/current-location.nix ];