Merge branch 'master' into home_manager
This commit is contained in:
12
flake.lock
generated
12
flake.lock
generated
@@ -10,11 +10,11 @@
|
|||||||
"systems": "systems"
|
"systems": "systems"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1754337839,
|
"lastModified": 1754433428,
|
||||||
"narHash": "sha256-fEc2/4YsJwtnLU7HCFMRckb0u9UNnDZmwGhXT5U5NTw=",
|
"narHash": "sha256-NA/FT2hVhKDftbHSwVnoRTFhes62+7dxZbxj5Gxvghs=",
|
||||||
"owner": "ryantm",
|
"owner": "ryantm",
|
||||||
"repo": "agenix",
|
"repo": "agenix",
|
||||||
"rev": "856df6f6922845abd4fd958ce21febc07ca2fa45",
|
"rev": "9edb1787864c4f59ae5074ad498b6272b3ec308d",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -66,11 +66,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1753939845,
|
"lastModified": 1755615617,
|
||||||
"narHash": "sha256-K2ViRJfdVGE8tpJejs8Qpvvejks1+A4GQej/lBk5y7I=",
|
"narHash": "sha256-HMwfAJBdrr8wXAkbGhtcby1zGFvs+StOp19xNsbqdOg=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "94def634a20494ee057c76998843c015909d6311",
|
"rev": "20075955deac2583bb12f07151c2df830ef346b4",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|||||||
@@ -21,7 +21,10 @@
|
|||||||
keys = import ./lib/keys.nix;
|
keys = import ./lib/keys.nix;
|
||||||
paths = {
|
paths = {
|
||||||
flake = "/home/gortium/infra";
|
flake = "/home/gortium/infra";
|
||||||
identities = [ "/home/gortium/.ssh/gortium_ssh_key" "/etc/ssh/ssh_host_ed25519_key" ];
|
identities = [
|
||||||
|
"/home/gortium/.ssh/gortium_ssh_key"
|
||||||
|
"/etc/ssh/ssh_host_ed25519_key"
|
||||||
|
"/root/.age/bootstrap.key" ];
|
||||||
};
|
};
|
||||||
overlays = [ agenix.overlays.default ];
|
overlays = [ agenix.overlays.default ];
|
||||||
pkgs = import nixpkgs {
|
pkgs = import nixpkgs {
|
||||||
|
|||||||
@@ -143,13 +143,13 @@
|
|||||||
group = "root";
|
group = "root";
|
||||||
mode = "0400";
|
mode = "0400";
|
||||||
};
|
};
|
||||||
# lazyworkhorse_host_ssh_key = {
|
lazyworkhorse_host_ssh_key = {
|
||||||
# file = ../../secrets/lazyworkhorse_host_ssh_key.age;
|
file = ../../secrets/lazyworkhorse_host_ssh_key.age;
|
||||||
# owner = "root";
|
owner = "root";
|
||||||
# group = "root";
|
group = "root";
|
||||||
# mode = "0600";
|
mode = "0600";
|
||||||
# path = "/etc/ssh/ssh_host_ed25519_key";
|
path = "/etc/ssh/ssh_host_ed25519_key";
|
||||||
# };
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -12,6 +12,7 @@
|
|||||||
main = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINmXqD+bBveCYf4khmARA0uaCzkBOUIE077ZrInLNs1O";
|
main = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINmXqD+bBveCYf4khmARA0uaCzkBOUIE077ZrInLNs1O";
|
||||||
github = "";
|
github = "";
|
||||||
gitea = "";
|
gitea = "";
|
||||||
|
bootstrap = "age1r796v2uldtspawyh863pks74sd2pwcan8j4e4pjzsvkmr3vjja9qpz5ste";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{ pkgs, lib, config, ... }: {
|
{ pkgs, lib, config, ... }: {
|
||||||
|
|
||||||
options = {
|
options = {
|
||||||
hoardingcow-mount.enable = lib.mkEnableOption "enable hoardingcow acces";
|
hoardingcow-mount.enable = lib.mkEnableOption "enable hoardingcow access";
|
||||||
};
|
};
|
||||||
config = lib.mkIf config.hoardingcow-mount.enable {
|
config = lib.mkIf config.hoardingcow-mount.enable {
|
||||||
fileSystems."/mnt/HoardingCow_docker_data" = {
|
fileSystems."/mnt/HoardingCow_docker_data" = {
|
||||||
|
|||||||
@@ -1,8 +1,9 @@
|
|||||||
age-encryption.org/v1
|
age-encryption.org/v1
|
||||||
-> ssh-ed25519 GhMD8A rV+MVE/yCBXffr3Za8av5+lL8B/473Owe7phe2oKzXs
|
-> ssh-ed25519 GhMD8A gLjSioFoNbora4jCZw3UguGp5TdUBLLMaYAiW11T824
|
||||||
1Y3qBT07SKzO0EaSzLelbz5/whoEVfBD52N4+WwVScU
|
TXRVls3R4Zaz2AOvRujcy1kf2XqBQulK3gRzoh45g5g
|
||||||
-> ssh-ed25519 kYn3oA fHmhGCOWPfUOQpGEY0+lA6akxhJcCzn1zmiBQFeD4wg
|
-> ssh-ed25519 kYn3oA 25YlZSMkVE6I3VMUrlF4t3ZwuKj9PsMQoh2gi/pHb10
|
||||||
k48jDsxD7uXfg+VUgM0+PIL1WOBdSOGsLyvsuqYOziY
|
CAFHTAZ7eyGHT8t766aBiT2Iiq9ZBKitVIIt3AxJfTE
|
||||||
--- PXyg0xCJqashEWw9FNHv5g9UWWZ/vzvgKfZJ85OyNKU
|
-> X25519 2mIaB09iQVif9F3UF9azfs5bFpUkLIU4wtjsyavHPHc
|
||||||
<EFBFBD>;O*<2A><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>E<EFBFBD>[<5B><> <14><>z4XG<58>;R~<7E>S<EFBFBD>\<14><>7Ђ<37><D082><EFBFBD><EFBFBD>><08>Z<EFBFBD><5A>U<12>,<2C><><EFBFBD><EFBFBD><EFBFBD>ȏ<EFBFBD><C88F>糿<13>#<23><13><>`:<3A>%'<27>ix<69><78><EFBFBD>ɟMf<4D><66>W
|
GAoZGils65rkG8wOhR4MJB1M2c9IdVSPh0frZdc3Pg0
|
||||||
<EFBFBD><EFBFBD>&E<>̛<08><><EFBFBD>C<EFBFBD> <20>><3E>H<EFBFBD>,<2C><><EFBFBD><EFBFBD><EFBFBD>W<EFBFBD>Z<EFBFBD><5A><EFBFBD>%<25>@<40>n<EFBFBD>Y <20>
|
--- 4Ujt4d9bouX5RsLq4WnkKb8vvGCrsLXfk3MWxP4Jar0
|
||||||
|
<EFBFBD>ڝ<11><><08>ғ<EFBFBD>w9"<22><>=UYEފ(<0B>J9<4A>mw{<7B><>\<16>jcc><0E>N<EFBFBD>q<EFBFBD><71>T|<7C>
|
||||||
Binary file not shown.
@@ -1,6 +1,6 @@
|
|||||||
let
|
let
|
||||||
keys = import ../lib/keys.nix;
|
keys = import ../lib/keys.nix;
|
||||||
authorizedKeys = [ keys.users.gortium.main keys.hosts.lazyworkhorse.main ];
|
authorizedKeys = [ keys.users.gortium.main keys.hosts.lazyworkhorse.main keys.hosts.lazyworkhorse.bootstrap ];
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
"containers.env.age".publicKeys = authorizedKeys;
|
"containers.env.age".publicKeys = authorizedKeys;
|
||||||
|
|||||||
Reference in New Issue
Block a user