diff --git a/flake.lock b/flake.lock index cc7a0a0..e4979a9 100644 --- a/flake.lock +++ b/flake.lock @@ -2,21 +2,21 @@ "nodes": { "agenix": { "inputs": { - "darwin": "darwin", "nixpkgs": [ "myNixpkgs" ] }, "locked": { - "lastModified": 1675176355, - "narHash": "sha256-Qjxh5cmN56siY97mzmBLI1+cdjXSPqmfPVsKxBvHmwI=", + "lastModified": 1664140963, + "narHash": "sha256-pFxDtOLduRFlol0Y4ShE+soRQX4kbhaCNBtDOvx7ykw=", "owner": "ryantm", "repo": "agenix", - "rev": "b7ffcfe77f817d9ee992640ba1f270718d197f28", + "rev": "6acb1fe5f8597d5ce63fc82bc7fcac7774b1cdf0", "type": "github" }, "original": { "owner": "ryantm", + "ref": "0.13.0", "repo": "agenix", "type": "github" } @@ -37,28 +37,6 @@ "type": "github" } }, - "darwin": { - "inputs": { - "nixpkgs": [ - "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" - } - }, "devshell": { "inputs": { "flake-utils": "flake-utils", @@ -522,11 +500,11 @@ }, "myNixpkgs": { "locked": { - "lastModified": 1675237434, - "narHash": "sha256-YoFR0vyEa1HXufLNIFgOGhIFMRnY6aZ0IepZF5cYemo=", + "lastModified": 1675512093, + "narHash": "sha256-u1CY4feK14B57E6T+0Bhkuoj8dpBxCPrWO+SP87UVP8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "285b3ff0660640575186a4086e1f8dc0df2874b5", + "rev": "8e8240194eda25b61449f29bb5131e02b28a5486", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 7ff1357..b484b51 100644 --- a/flake.nix +++ b/flake.nix @@ -29,7 +29,7 @@ url = github:dadada/recipemd/nix-flake; }; agenix = { - url = github:ryantm/agenix; + url = github:ryantm/agenix/0.13.0; inputs.nixpkgs.follows = "myNixpkgs"; }; devshell = { diff --git a/nixos/modules/miniflux.nix b/nixos/modules/miniflux.nix index 6afc735..6898f34 100644 --- a/nixos/modules/miniflux.nix +++ b/nixos/modules/miniflux.nix @@ -31,9 +31,7 @@ in age.secrets.${adminCredentialsFile} = { file = "${config.dadada.secrets.path}/${adminCredentialsFile}.age"; - owner = config.systemd.services.miniflux.serviceConfig.User; - group = "root"; - mode = "0700"; + mode = "0600"; }; }; } diff --git a/nixos/modules/profiles/cloud.nix b/nixos/modules/profiles/cloud.nix index 5f33513..98314c7 100644 --- a/nixos/modules/profiles/cloud.nix +++ b/nixos/modules/profiles/cloud.nix @@ -9,7 +9,7 @@ in enable = true; ssh = { enable = true; - port = 43235; + port = 22; hostKeys = [ config.age.secrets."${initrdHostKey}".path ]; @@ -30,5 +30,7 @@ in age.secrets."${initrdHostKey}" = { file = "${secretsPath}/${initrdHostKey}.age"; mode = "600"; + path = "/etc/initrd/${initrdHostKey}"; + symlink = false; }; } diff --git a/outputs.nix b/outputs.nix index 76d2343..5ba64ae 100644 --- a/outputs.nix +++ b/outputs.nix @@ -26,7 +26,7 @@ pkgs = import nixpkgs { inherit system; overlays = [ - agenix.overlays.default + agenix.overlay devshell.overlay ]; };