diff --git a/flake.lock b/flake.lock index 0288854..b4b7ef5 100644 --- a/flake.lock +++ b/flake.lock @@ -1,6 +1,72 @@ { "nodes": { + "agenix": { + "inputs": { + "darwin": "darwin", + "home-manager": "home-manager", + "nixpkgs": [ + "nixpkgs" + ], + "systems": "systems" + }, + "locked": { + "lastModified": 1754433428, + "narHash": "sha256-NA/FT2hVhKDftbHSwVnoRTFhes62+7dxZbxj5Gxvghs=", + "owner": "ryantm", + "repo": "agenix", + "rev": "9edb1787864c4f59ae5074ad498b6272b3ec308d", + "type": "github" + }, + "original": { + "owner": "ryantm", + "repo": "agenix", + "type": "github" + } + }, + "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" + } + }, "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" @@ -62,29 +128,24 @@ }, "root": { "inputs": { - "home-manager": "home-manager", + "agenix": "agenix", + "home-manager": "home-manager_2", "nixpkgs": "nixpkgs", - "plasma-manager": "plasma-manager", - "sops-nix": "sops-nix" + "plasma-manager": "plasma-manager" } }, - "sops-nix": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, + "systems": { "locked": { - "lastModified": 1758425756, - "narHash": "sha256-L3N8zV6wsViXiD8i3WFyrvjDdz76g3tXKEdZ4FkgQ+Y=", - "owner": "Mic92", - "repo": "sops-nix", - "rev": "e0fdaea3c31646e252a60b42d0ed8eafdb289762", + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", "type": "github" }, "original": { - "owner": "Mic92", - "repo": "sops-nix", + "owner": "nix-systems", + "repo": "default", "type": "github" } } diff --git a/flake.nix b/flake.nix index 4201f1b..c96d65b 100644 --- a/flake.nix +++ b/flake.nix @@ -7,14 +7,16 @@ inputs.nixpkgs.follows = "nixpkgs"; }; + # KDE config plasma-manager = { url = "github:pjones/plasma-manager"; inputs.nixpkgs.follows = "nixpkgs"; inputs.home-manager.follows = "home-manager"; }; - sops-nix = { - url = "github:Mic92/sops-nix"; + # Secret management + agenix = { + url = "github:ryantm/agenix"; inputs.nixpkgs.follows = "nixpkgs"; }; }; @@ -24,7 +26,7 @@ nixpkgs, home-manager, plasma-manager, - sops-nix, + agenix, ... } @ inputs: let inherit (self) outputs; @@ -47,7 +49,7 @@ modules = [ ./machines/luna/configuration.nix home-manager.nixosModules.home-manager - sops-nix.nixosModules.sops + agenix.nixosModules.default { home-manager.sharedModules = [plasma-manager.homeModules.plasma-manager]; } @@ -60,7 +62,7 @@ modules = [ ./machines/terra/configuration.nix home-manager.nixosModules.home-manager - sops-nix.nixosModules.sops + agenix.nixosModules.default { home-manager.sharedModules = [plasma-manager.homeModules.plasma-manager]; } @@ -73,7 +75,7 @@ modules = [ ./machines/solis/configuration.nix home-manager.nixosModules.home-manager - sops-nix.nixosModules.sops + agenix.nixosModules.default ]; }; };