dadada/nix-config
dadada/nix-config
1
0
Fork 0
Code Issues 2 Pull requests 5 Projects Releases Packages Wiki Activity Actions

switch to last agenix release

Browse source
This commit is contained in:
Tim Schubert 2023-02-04 23:28:16 +01:00
parent 920bfc1da5
commit 28290de97a
Signed by: dadada
GPG key ID: EEB8D1CE62C4DFEA
5 changed files with 13 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

36
flake.lock generated
View file

@ -2,21 +2,21 @@
"nodes": { "nodes": {
"agenix": { "agenix": {
"inputs": { "inputs": {
"darwin": "darwin",
"nixpkgs": [ "nixpkgs": [
"myNixpkgs" "myNixpkgs"
] ]
}, },
"locked": { "locked": {
"lastModified": 1675176355, "lastModified": 1664140963,
"narHash": "sha256-Qjxh5cmN56siY97mzmBLI1+cdjXSPqmfPVsKxBvHmwI=", "narHash": "sha256-pFxDtOLduRFlol0Y4ShE+soRQX4kbhaCNBtDOvx7ykw=",
"owner": "ryantm", "owner": "ryantm",
"repo": "agenix", "repo": "agenix",
"rev": "b7ffcfe77f817d9ee992640ba1f270718d197f28", "rev": "6acb1fe5f8597d5ce63fc82bc7fcac7774b1cdf0",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "ryantm", "owner": "ryantm",
"ref": "0.13.0",
"repo": "agenix", "repo": "agenix",
"type": "github" "type": "github"
} }
@ -37,28 +37,6 @@
"type": "github" "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": { "devshell": {
"inputs": { "inputs": {
"flake-utils": "flake-utils", "flake-utils": "flake-utils",
@ -522,11 +500,11 @@
}, },
"myNixpkgs": { "myNixpkgs": {
"locked": { "locked": {
"lastModified": 1675237434, "lastModified": 1675512093,
"narHash": "sha256-YoFR0vyEa1HXufLNIFgOGhIFMRnY6aZ0IepZF5cYemo=", "narHash": "sha256-u1CY4feK14B57E6T+0Bhkuoj8dpBxCPrWO+SP87UVP8=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "285b3ff0660640575186a4086e1f8dc0df2874b5", "rev": "8e8240194eda25b61449f29bb5131e02b28a5486",
"type": "github" "type": "github"
}, },
"original": { "original": {

2
flake.nix
View file

@ -29,7 +29,7 @@
url = github:dadada/recipemd/nix-flake; url = github:dadada/recipemd/nix-flake;
}; };
agenix = { agenix = {
url = github:ryantm/agenix; url = github:ryantm/agenix/0.13.0;
inputs.nixpkgs.follows = "myNixpkgs"; inputs.nixpkgs.follows = "myNixpkgs";
}; };
devshell = { devshell = {

4
nixos/modules/miniflux.nix
View file

@ -31,9 +31,7 @@ in
age.secrets.${adminCredentialsFile} = { age.secrets.${adminCredentialsFile} = {
file = "${config.dadada.secrets.path}/${adminCredentialsFile}.age"; file = "${config.dadada.secrets.path}/${adminCredentialsFile}.age";
owner = config.systemd.services.miniflux.serviceConfig.User; mode = "0600";
group = "root";
mode = "0700";
}; };
}; };
} }

4
nixos/modules/profiles/cloud.nix
View file

@ -9,7 +9,7 @@ in
enable = true; enable = true;
ssh = { ssh = {
enable = true; enable = true;
port = 43235; port = 22;
hostKeys = [ hostKeys = [
config.age.secrets."${initrdHostKey}".path config.age.secrets."${initrdHostKey}".path
]; ];
@ -30,5 +30,7 @@ in
age.secrets."${initrdHostKey}" = { age.secrets."${initrdHostKey}" = {
file = "${secretsPath}/${initrdHostKey}.age"; file = "${secretsPath}/${initrdHostKey}.age";
mode = "600"; mode = "600";
path = "/etc/initrd/${initrdHostKey}";
symlink = false;
}; };
} }

2
outputs.nix
View file

@ -26,7 +26,7 @@
pkgs = import nixpkgs { pkgs = import nixpkgs {
inherit system; inherit system;
overlays = [ overlays = [
agenix.overlays.default agenix.overlay
devshell.overlay devshell.overlay
]; ];
}; };