diff --git a/flake.lock b/flake.lock index af8cdf9..6d83f6f 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,25 @@ { "nodes": { + "agenix": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1790734419, + "narHash": "sha256-n7wew722m1OTBT9DOIMxNX/NF4zfsSUABAO5eW3wikE=", + "owner": "ryantm", + "repo": "agenix", + "rev": "3daa710894355fa2fad8243380af373a2b4046ef", + "type": "github" + }, + "original": { + "owner": "ryantm", + "repo": "agenix", + "type": "github" + } + }, "flake-parts": { "inputs": { "nixpkgs-lib": "nixpkgs-lib" @@ -18,6 +38,28 @@ "type": "github" } }, + "home-manager": { + "inputs": { + "nixpkgs": [ + "nixcord", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1790996401, + "narHash": "sha256-f+kOxEmOUnQazVAmGg0i8hzwgd1kX/geY+k/Dpheye8=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "db7d5e2332710f5abb088f6b5de927d7f9511b35", + "type": "github" + }, + "original": { + "owner": "nix-community", + "ref": "release-26.05", + "repo": "home-manager", + "type": "github" + } + }, "import-tree": { "locked": { "lastModified": 1788467110, @@ -33,6 +75,73 @@ "type": "github" } }, + "nix-darwin": { + "inputs": { + "nixpkgs": [ + "nixcord", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1783744694, + "narHash": "sha256-2cp6N3rrwnGYLTx9l6N+NI+kwrCWxvJUbj5WJhvB29A=", + "owner": "nix-darwin", + "repo": "nix-darwin", + "rev": "c3e90c89649b07d1a96e4b9dd6cd0d6e44b91a74", + "type": "github" + }, + "original": { + "owner": "nix-darwin", + "ref": "nix-darwin-26.05", + "repo": "nix-darwin", + "type": "github" + } + }, + "nix-easyroam": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1784038797, + "narHash": "sha256-td6Ko5RV/TFw7ALmYP9YUVXMS1b7hW7vDqabrGXyzUo=", + "owner": "0x5a4", + "repo": "nix-easyroam", + "rev": "a6c72d25edc3b210bf6b2b46395c88be7efac147", + "type": "github" + }, + "original": { + "owner": "0x5a4", + "repo": "nix-easyroam", + "type": "github" + } + }, + "nixcord": { + "inputs": { + "home-manager": "home-manager", + "nix-darwin": "nix-darwin", + "nixpkgs": [ + "nixpkgs" + ], + "nixpkgs-ci": "nixpkgs-ci", + "nixpkgs-packages": "nixpkgs-packages", + "treefmt-nix": "treefmt-nix" + }, + "locked": { + "lastModified": 1792277718, + "narHash": "sha256-Nv32eZ+x7qr/yKofkemv1O2ImnXkUpFQgq71u6c6Wi8=", + "owner": "4evy", + "repo": "nixcord", + "rev": "f4f803048d4bb6bc296fc4bdbd8620ff63fe100f", + "type": "github" + }, + "original": { + "owner": "4evy", + "repo": "nixcord", + "type": "github" + } + }, "nixpkgs": { "locked": { "lastModified": 1792030654, @@ -49,6 +158,19 @@ "type": "github" } }, + "nixpkgs-ci": { + "locked": { + "lastModified": 1791130267, + "narHash": "sha256-NCFqY2YC3/5pwakzk7tXNUj3sG+VImjU4EkZMacxF1w=", + "rev": "9013764fcc0ea99fa16cf7aa7decf8a5c3889dd2", + "type": "tarball", + "url": "https://releases.nixos.org/nixpkgs/nixpkgs-26.11pre1085518.9013764fcc0e/nixexprs.tar.zst" + }, + "original": { + "type": "tarball", + "url": "https://channels.nixos.org/nixpkgs-unstable/nixexprs.tar.zst" + } + }, "nixpkgs-lib": { "locked": { "lastModified": 1790477367, @@ -64,12 +186,49 @@ "type": "github" } }, + "nixpkgs-packages": { + "locked": { + "lastModified": 1791130267, + "narHash": "sha256-NCFqY2YC3/5pwakzk7tXNUj3sG+VImjU4EkZMacxF1w=", + "rev": "9013764fcc0ea99fa16cf7aa7decf8a5c3889dd2", + "type": "tarball", + "url": "https://releases.nixos.org/nixpkgs/nixpkgs-26.11pre1085518.9013764fcc0e/nixexprs.tar.zst" + }, + "original": { + "type": "tarball", + "url": "https://channels.nixos.org/nixpkgs-unstable/nixexprs.tar.zst" + } + }, "root": { "inputs": { + "agenix": "agenix", "flake-parts": "flake-parts", "import-tree": "import-tree", + "nix-easyroam": "nix-easyroam", + "nixcord": "nixcord", "nixpkgs": "nixpkgs" } + }, + "treefmt-nix": { + "inputs": { + "nixpkgs": [ + "nixcord", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1791198660, + "narHash": "sha256-f8Pye933T60vreB9u9pqfAXDyBqO13U7H0LvPsOxCIA=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "8b367b728be38d1bb7206f037c9df9989df3353a", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } } }, "root": "root", diff --git a/modules/system/agenix/_agenix-rules.nix b/modules/system/agenix/_agenix-rules.nix new file mode 100644 index 0000000..d70a660 --- /dev/null +++ b/modules/system/agenix/_agenix-rules.nix @@ -0,0 +1,7 @@ +{ config }: +let + main = "age17hvac3hn79mwttel9snw87a20x4vguh7y7ys43xmvlhrl3mqs3wswuzlt6"; +in +{ + "easyroam.age".publicKeys = [ main ]; +} diff --git a/modules/system/agenix/agenix.nix b/modules/system/agenix/agenix.nix index 562e055..c153b55 100644 --- a/modules/system/agenix/agenix.nix +++ b/modules/system/agenix/agenix.nix @@ -1,17 +1,11 @@ { ... }: { - flake.nixosModules = - { config, ... }: - let - main = "age17hvac3hn79mwttel9snw87a20x4vguh7y7ys43xmvlhrl3mqs3wswuzlt6"; - in - { - "easyroam.age".publicKeys = [ main ]; - age = { - enable = true; - identityPaths = [ "/var/lib/misc/key.age" ]; - secrets = { - easyroam.file = ./easyroam.age; - }; + flake.nixosModules = { + age = { + enable = true; + identityPaths = [ "/var/lib/misc/key.age" ]; + secrets = { + easyroam.file = ./easyroam.age; }; }; + }; }