From 37f843170a40a1925d34e97cca6f991e4f7d9c37 Mon Sep 17 00:00:00 2001 From: Aleksandr Lebedev Date: Sun, 12 Jan 2025 17:04:17 +0100 Subject: [PATCH] added homepc openssh --- nixos/hosts/kylekrein-homepc/default.nix | 40 ++++++++++++++---------- nixos/modules/sops/secrets/secrets.yaml | 5 +-- nixos/users/kylekrein/default.nix | 1 + 3 files changed, 27 insertions(+), 19 deletions(-) diff --git a/nixos/hosts/kylekrein-homepc/default.nix b/nixos/hosts/kylekrein-homepc/default.nix index 263391d..b83dd4c 100644 --- a/nixos/hosts/kylekrein-homepc/default.nix +++ b/nixos/hosts/kylekrein-homepc/default.nix @@ -1,23 +1,29 @@ -{ pkgs, lib, hwconfig, inputs, ... }: { - imports = [ - ../../hardware/nvidia + pkgs, + lib, + hwconfig, + inputs, + ... +}: { + imports = [ + ../../hardware/nvidia - ../../modules/hyprland - - ../../modules/libvirt + ../../modules/hyprland - ../../users/kylekrein - (import ../../modules/libvirt/user.nix { username = "kylekrein"; }) - - ../../users/tania - ]; - - environment.systemPackages = with pkgs;[ - blender + ../../modules/libvirt - #inputs.nix-gaming.packages.${pkgs.system}.star-citizen - ]; + ../../users/kylekrein + (import ../../modules/libvirt/user.nix {username = "kylekrein";}) - systemd.network.wait-online.enable = lib.mkForce false; + ../../users/tania + ]; + + sops.secrets."ssh_keys/${hwconfig.hostname}" = {}; + environment.systemPackages = with pkgs; [ + blender + + #inputs.nix-gaming.packages.${pkgs.system}.star-citizen + ]; + + systemd.network.wait-online.enable = lib.mkForce false; } diff --git a/nixos/modules/sops/secrets/secrets.yaml b/nixos/modules/sops/secrets/secrets.yaml index 93ff66e..805e969 100644 --- a/nixos/modules/sops/secrets/secrets.yaml +++ b/nixos/modules/sops/secrets/secrets.yaml @@ -3,6 +3,7 @@ users: tania: ENC[AES256_GCM,data:veo/dKQpztSGLfCxpWqoTOlPqSaNeNW2pYrTU9z125hjBVt2LC8X+mDp8vA0r8QFKpkGr1BiwviUTuXsSO1IXn3nHfDGsHQqFQ==,iv:q3pCcil1wiKe5xC6QEn3Q4wV1icW+3CCUQw6QZIINWU=,tag:XvBfIEORfdTcUihtcJQZVg==,type:str] ssh_keys: kylekrein-mac: ENC[AES256_GCM,data:Gnh34OQWO6eQfNfyYZsVfvktknmZorQYF+lNMKYvV7XkKjZ3RQNHyJ3UWOX+sVwWdtF7EboXkBPdHvnyLvDVIyv7trxTU5IXQzOI+34AKfPHa828HuOLk0AclCmm6GcNq/X4dKTX5DADG4cE4/V+KtdjvSMtLX7I1cjlfsN7JzcsnjERbK8Q0pTMuA44IUdnh0odH9xFEP/f/hVZZZhc5vrMfAqSx3lQxCF62c0wJaorobsPSM7BTzorVgnMnc3zJRAlgQnCnAe306/6g4hurBteIVeGFhA8gSk1fjZh2fm0opo/lgvHRJOwfpvRWJGEedx7hEpjsDr8BRxeBc2OHaRO5UP+fYh8Qtki8ZeFUjr/psjRRz128Kr0C+NS0AByZtwg54d705uwsnf79jPdM1ewGryCcsxqYWCvT0174cIg3sLdQvPnESbV1zU+QsVskFZwYL+gLtzuAwExPW7cM12M/HS+Eb5xtWvRA46FZ/dnKFwQkUA/VgSi08eC5/EYg8dFBht9hDK+kiLPGHML8A6a3CoiMf0pd+DbdOxA21F0Tw==,iv:oEXxrvWosuiH2wSoSkP7YMwBQu3JKIhn/YeiaTL/UT4=,tag:XgBw2q/6LPWg2zuOC9Wb+w==,type:str] + kylekrein-homepc: ENC[AES256_GCM,data:/7b7wHk9jX+2Gel3157KO4YHia+IyEurUic0BX9flNKdsjIyG/3N8lORAkIjwnPlFaN2VqGu6o1pFgW2dzkSAyATQIUeWpqL5rjxsG3mJ9/9TLh58Y7MIpFKx2r8AeUY0xEAhT1A4BCbnDMsneQtM9gBkgPdhhv6vVpe4XJS3n+dGPER/bQxxRbEt260EjxvL1OPf5C7Z7qNVhOzxNdgdJMQvXxyhRGlXRrrHFRdbw0nChStevgBL4+FoMuBFkqF/aJSoapwe8PNxp8z+Hk5Em+BQv/ieFcscESssCK1gSbvfz6MQyX+5ig+Gy+t28yy56/ir44PHwX47IOILzg7lABSvN+Uyt+sRKyBfx124hJjqgXf65YQ/fgknQt0NDKwZyP/gPSLC9HiLKdva/P9nuenfSnlLrGtfugejBAVQBMOP2HTp/ZKtveeKLVIzM7NLeHAw8ul1OL8OlOgyO3vhEkEVagLwtQYHqwoF7+z30TzTtGyDzuhohbhUH36D8BD/LTaPHxnnVIzWq/IBOmAU06U/EvS5x/JJtqMm8aaDFFEYA==,iv:+4umMhsr8s0IuiYuEdhDAOfLjAELEHbFVvWqaVyF2yQ=,tag:eE9gCZ3pC4wDLeMs5cQGZg==,type:str] sops: kms: [] gcp_kms: [] @@ -18,8 +19,8 @@ sops: M0hSNWNYbGM3a21McUVMaGNqWTdmNTQK3VRFV4EaC8K8AJi2PUt6TeBgueEmPLI8 Vdwwbh89+xD5xf4Zm0LctPRlxxM6diubv0gIZZPy/ZXZfiU32ZnM0w== -----END AGE ENCRYPTED FILE----- - lastmodified: "2025-01-12T15:24:10Z" - mac: ENC[AES256_GCM,data:nN6b/GItToa87P08ZzkCRMjWX2Hw0jTL73QsWp0T+yAwI3n4BPeeJcuTQrh5zhL6BE87ZN83NQtAotaeRClnKw7x7FKspbKj9bVuExNEV0N9/ivN4l165R4/I8xtFQoJ+BHzA36iGbgXNemhaRexlR07KuOOtNnSNoYYT/FV9Do=,iv:voJusWPg1cw5Z/R5Jk3rQTELGyUcWi4Y+QhNLsD8+DQ=,tag:GoWKU8qgK81p8eqwKmIj6Q==,type:str] + lastmodified: "2025-01-12T16:02:33Z" + mac: ENC[AES256_GCM,data:SAkjnY4i2KmGhtaqdzPPmnM1RUGRXpy6nBZef4H12GDWbh4WgniouBQ8d15S8u/44YQfcktBuDMvNbWMly3lfjhcbnhOe82zjgZRFZ1jSSZbotpKeydyr2FUM6PhO+0s2MUEv3hTvWN/4ZJ98MJgamDaj27U6aZpFcyr4KtLHqs=,iv:+5+Z/hhNT2x+ONlfBL2S2E2LKxSCIITw6pugn/ni4hI=,tag:WcUog3mDF7efrl3L4GlAHQ==,type:str] pgp: [] unencrypted_suffix: _unencrypted version: 3.9.2 diff --git a/nixos/users/kylekrein/default.nix b/nixos/users/kylekrein/default.nix index 5331bd5..8b46ba6 100644 --- a/nixos/users/kylekrein/default.nix +++ b/nixos/users/kylekrein/default.nix @@ -21,6 +21,7 @@ in { openssh.authorizedKeys.keys = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGMt3PWVvmEL6a0HHTsxL4KMq1UGKFdzgX5iIkm6owGQ kylekrein@kylekrein-mac" + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFDdxZ5OyGcfD1JwEa4RWw86HWZ2dKFR0syrRckl7EvG kylekrein@kylekrein-homepc" ]; }; sops.secrets = {