From 619e392abe5020103db42c1a0c971bc356e5e6a2 Mon Sep 17 00:00:00 2001 From: uku Date: Mon, 2 Sep 2024 07:37:13 +0200 Subject: [PATCH 1/2] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'crane': 'github:ipetkov/crane/63396562b8e08efda3b3c66e32661b8a513055de' (2024-08-29) → 'github:ipetkov/crane/96fd12c7100e9e05fa1a0a5bd108525600ce282f' (2024-08-31) • Updated input 'flake-parts': 'github:hercules-ci/flake-parts/af510d4a62d071ea13925ce41c95e3dec816c01d' (2024-08-30) → 'github:hercules-ci/flake-parts/567b938d64d4b4112ee253b9274472dc3a346eb6' (2024-09-01) • Updated input 'ghostty': 'git+ssh://git@github.com/ghostty-org/ghostty?ref=refs/heads/main&rev=602bf6ba1e1169750e233ed2431f71dbcf754362' (2024-08-29) → 'git+ssh://git@github.com/ghostty-org/ghostty?ref=refs/heads/main&rev=d8fc54d1bf360a3a886a9c4a9d28204b770dcb36' (2024-09-02) • Updated input 'home-manager': 'github:nix-community/home-manager/c2cd2a52e02f1dfa1c88f95abeb89298d46023be' (2024-08-23) → 'github:nix-community/home-manager/471e3eb0a114265bcd62d11d58ba8d3421ee68eb' (2024-09-01) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/71e91c409d1e654808b2621f28a327acfdad8dc2' (2024-08-28) → 'github:NixOS/nixpkgs/12228ff1752d7b7624a54e9c1af4b222b3c1073b' (2024-08-31) • Updated input 'vscode-extensions': 'github:nix-community/nix-vscode-extensions/27661753057dc1d259c7918f6c6777bea26290f1' (2024-08-31) → 'github:nix-community/nix-vscode-extensions/36fbe64e2b1b879871d896e94d560691ec88c08b' (2024-09-02) --- flake.lock | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/flake.lock b/flake.lock index 8a58ab9..0328e86 100644 --- a/flake.lock +++ b/flake.lock @@ -90,11 +90,11 @@ }, "crane": { "locked": { - "lastModified": 1724974107, - "narHash": "sha256-69+1W0Ao5K9su569YUfUPANeN/Ea7aKu7xIZP1MSl9o=", + "lastModified": 1725125250, + "narHash": "sha256-CB20rDD5eHikF6mMTTJdwPP1qvyoiyyw1RDUzwIaIF8=", "owner": "ipetkov", "repo": "crane", - "rev": "63396562b8e08efda3b3c66e32661b8a513055de", + "rev": "96fd12c7100e9e05fa1a0a5bd108525600ce282f", "type": "github" }, "original": { @@ -126,11 +126,11 @@ ] }, "locked": { - "lastModified": 1725024810, - "narHash": "sha256-ODYRm8zHfLTH3soTFWE452ydPYz2iTvr9T8ftDMUQ3E=", + "lastModified": 1725234343, + "narHash": "sha256-+ebgonl3NbiKD2UD0x4BszCZQ6sTfL4xioaM49o5B3Y=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "af510d4a62d071ea13925ce41c95e3dec816c01d", + "rev": "567b938d64d4b4112ee253b9274472dc3a346eb6", "type": "github" }, "original": { @@ -225,11 +225,11 @@ "zls": "zls" }, "locked": { - "lastModified": 1724969132, - "narHash": "sha256-XAYTVVxWoCXpHGqoNj0uhIbjD4MimFQXEke9eKYufK4=", + "lastModified": 1725250745, + "narHash": "sha256-tXw59mE2WYu0OtjOUkolk2QUwREum5wUKztuYgkVwdk=", "ref": "refs/heads/main", - "rev": "602bf6ba1e1169750e233ed2431f71dbcf754362", - "revCount": 7103, + "rev": "d8fc54d1bf360a3a886a9c4a9d28204b770dcb36", + "revCount": 7125, "type": "git", "url": "ssh://git@github.com/ghostty-org/ghostty" }, @@ -267,11 +267,11 @@ ] }, "locked": { - "lastModified": 1724435763, - "narHash": "sha256-UNky3lJNGQtUEXT2OY8gMxejakSWPTfWKvpFkpFlAfM=", + "lastModified": 1725180166, + "narHash": "sha256-fzssXuGR/mCeGbzM1ExaTqDz7QDGta3WA4jJsZyRruo=", "owner": "nix-community", "repo": "home-manager", - "rev": "c2cd2a52e02f1dfa1c88f95abeb89298d46023be", + "rev": "471e3eb0a114265bcd62d11d58ba8d3421ee68eb", "type": "github" }, "original": { @@ -389,11 +389,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1724819573, - "narHash": "sha256-GnR7/ibgIH1vhoy8cYdmXE6iyZqKqFxQSVkFgosBh6w=", + "lastModified": 1725103162, + "narHash": "sha256-Ym04C5+qovuQDYL/rKWSR+WESseQBbNAe5DsXNx5trY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "71e91c409d1e654808b2621f28a327acfdad8dc2", + "rev": "12228ff1752d7b7624a54e9c1af4b222b3c1073b", "type": "github" }, "original": { @@ -538,11 +538,11 @@ ] }, "locked": { - "lastModified": 1725068052, - "narHash": "sha256-WqofagIIyZ/hY6vJH65OLXVBgi2FNOezjybwniBvN14=", + "lastModified": 1725241396, + "narHash": "sha256-b4YfdCTuVLmrTGt8M44T+k0+rwRhBDXYKPhQR9o6LxU=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "27661753057dc1d259c7918f6c6777bea26290f1", + "rev": "36fbe64e2b1b879871d896e94d560691ec88c08b", "type": "github" }, "original": { From 57c2e950ef3ceb032063e95307109f27ecf7a9a0 Mon Sep 17 00:00:00 2001 From: uku Date: Sun, 1 Sep 2024 17:32:09 +0200 Subject: [PATCH 2/2] feat(systems): add mottarone --- secrets/mottarone/rootPassword.age | 12 ++++++++++++ secrets/secrets.nix | 4 +++- systems/default.nix | 5 +++++ systems/mottarone/default.nix | 1 + systems/mottarone/hardware-configuration.nix | 1 + 5 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 secrets/mottarone/rootPassword.age create mode 100644 systems/mottarone/default.nix create mode 100644 systems/mottarone/hardware-configuration.nix diff --git a/secrets/mottarone/rootPassword.age b/secrets/mottarone/rootPassword.age new file mode 100644 index 0000000..b98c27b --- /dev/null +++ b/secrets/mottarone/rootPassword.age @@ -0,0 +1,12 @@ +-----BEGIN AGE ENCRYPTED FILE----- +YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBoL1RxdEw2dm10RTV5cWtY +OW5PdlZ2YWZlVEg5Tkt6dnZsblVUWUprKzNjCmpBZjl0RnoxZmZTUjhla2h1dVB3 +bTJKeXoxNU1CN2dRQjM5NzNCdVdVWDgKLT4gWDI1NTE5IHpoeHJRRUQ4TGFnUUV6 +YUVOeVBVMHZ1MWRGc3dBM2lDaDA0cDhxQitta2sKZnBWQ0E0aVI2VjZhS3VoQU5J +Y2tua1h2MzlQNmQ1UnR2ZTd4TGVpcTZmYwotPiBYMjU1MTkgTDZ3U3l6Um5YSmFo +NUY5MXJ6TThXZ25PQll0MGRvS25Ha08vUm9nRlprYwo1amhlMGJiY1NQTWxBVVZP +Y1I5aGV5QVBHNXBqTmNwQll3WENUNGhVbDVZCi0tLSBJNUROUnN3MXFrT2RZM213 +MG4wdDh1QkhqRUc0ZFdnSlBOVW9GdzEzUnpJClbCQW1yJKr9uq9ZCBmXJlzeT858 +X8PMcPIRNIv6EIEQT4N8d1dSDhwMEKdin4nF/OU9WyYwaEv+PPJBQpPVfAbUi9mO +29m44D029JlBpBZpb1iWPO2T3a2PvcD8Y9JCYVSlofLLeJ3LHXE= +-----END AGE ENCRYPTED FILE----- diff --git a/secrets/secrets.nix b/secrets/secrets.nix index dc42b80..0abd59e 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -1,11 +1,12 @@ let fuji = "age16ujdfcahmnhe4ygruf28n0urgxycv8zgsp4f8856a5suewhn49cs0mqk7w"; kilimandjaro = "age1ny0re542mcvf829y28rz6eta9myaqlxasfnn933srw64dlgavpsqc59q79"; + mottarone = "age1gfqwnjaajztwu72j8j6f5drdgupkvghsafzma4305pk95spf6u8q5e6zs8"; etna = "age1m3jm6c5ywc5zntv5j4xhals0h28mpea88zzddq88zxcshmhteqwqu89qnh"; vesuvio = "age1g2z0tztrv2w7wtludjrd85q7px3lvjms0cjj32zej9dqpjwpscwsle6xhf"; main = [fuji kilimandjaro]; - all = main ++ [etna vesuvio]; + all = main ++ [mottarone etna vesuvio]; in { "shared/userPassword.age".publicKeys = all; "shared/tailscaleKey.age".publicKeys = all; @@ -15,6 +16,7 @@ in { "fuji/rootPassword.age".publicKeys = main; "fuji-wsl/rootPassword.age".publicKeys = main; "kilimandjaro/rootPassword.age".publicKeys = main; + "mottarone/rootPassword.age".publicKeys = main ++ [mottarone]; "etna/rootPassword.age".publicKeys = main ++ [etna]; "vesuvio/rootPassword.age".publicKeys = main ++ [vesuvio]; diff --git a/systems/default.nix b/systems/default.nix index d911db9..84eb9e7 100644 --- a/systems/default.nix +++ b/systems/default.nix @@ -40,6 +40,11 @@ in { system = "x86_64-linux"; }; + mottarone = { + role = "laptop"; + system = "x86_64-linux"; + }; + etna = { role = "server"; system = "x86_64-linux"; diff --git a/systems/mottarone/default.nix b/systems/mottarone/default.nix new file mode 100644 index 0000000..9e26dfe --- /dev/null +++ b/systems/mottarone/default.nix @@ -0,0 +1 @@ +{} \ No newline at end of file diff --git a/systems/mottarone/hardware-configuration.nix b/systems/mottarone/hardware-configuration.nix new file mode 100644 index 0000000..9e26dfe --- /dev/null +++ b/systems/mottarone/hardware-configuration.nix @@ -0,0 +1 @@ +{} \ No newline at end of file