diff --git a/hosts/battleship/configuration.nix b/hosts/battleship/configuration.nix index 679ff75..d4d8c4f 100644 --- a/hosts/battleship/configuration.nix +++ b/hosts/battleship/configuration.nix @@ -37,6 +37,11 @@ xdg-desktop-portal-gtk ]; + services.tailscale = { + enable = true; + tailnetName = "${config.battleship-secrets.tailnet-name}"; + }; + fonts.fontconfig.enable = true; fonts.packages = with pkgs; [ fira-code @@ -47,7 +52,7 @@ home-manager-helper.users."guz" = { name = "guz"; shell = pkgs.zsh; - hashedPassword = "$y$j9T$J7gmdB306rufrjdsY5kJq0$spluDZf8jEkG0VYcZXzBIpnACVIk27C8YTbo2vbNFfA"; + hashedPasswordFile = builtins.toString config.sops.secrets."guz/password".path; home = import ./home.nix; isNormalUser = true; extraGroups = ["wheel" "networkmanager"]; diff --git a/hosts/battleship/secrets.nix b/hosts/battleship/secrets.nix index 2b3e619..065e0c9 100644 --- a/hosts/battleship/secrets.nix +++ b/hosts/battleship/secrets.nix @@ -36,6 +36,9 @@ in { sops.secrets.lat = { owner = config.users.users.guz.name; }; + sops.secrets."guz/password" = { + owner = config.users.users.guz.name; + }; sops.age.keyFile = "/home/guz/.config/sops/age/keys.txt"; }; diff --git a/secrets/battleship-secrets.lesser.json b/secrets/battleship-secrets.lesser.json index dd9ea31..ba316e6 100644 --- a/secrets/battleship-secrets.lesser.json +++ b/secrets/battleship-secrets.lesser.json @@ -1,4 +1,6 @@ { + "tailnet-name": "ENC[AES256_GCM,data:wmIscIppnPfdSbAw,iv:e0DFMCVXEUB61aDlGSAjYfU8pCGn/NswyJAOnX5WGxA=,tag:9n0WqxsBy3fFqLuIsm9UPw==,type:str]", + "device-ip": "ENC[AES256_GCM,data:xz7hjI9eyFFBt6OuoA==,iv:qLVQpFQqZ2NHW+UH+uaYOih66V0OJGBTKOE+1ZXnyHU=,tag:/3xmP/D4xafIOG0+NGH9Zw==,type:str]", "sops": { "kms": null, "gcp_kms": null, @@ -10,8 +12,8 @@ "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBvNDBWYVBTR2s3dW1ITTEw\nazZnSWtRTFJ6Ui9kU1RBNlp1YlEvTjJMb1drCjVqbndTQmRIMUhUN2h4bHROU1h2\nRmUwdzhQdEFSSmtvaGxRZGlFUDc4NHMKLS0tIEI4TWk5eVIxV21tUXRaV2ZXZ1h5\ndzZIeEFEbDFsNWdJQkg2UTQvYmhBWEkKNYuVCvc0/tUi8IvoK8p6lTgbwAxa+0mU\n1uFymroQstSxzpA9Ol9hTR6X6dfBf+1zUnPpst0447fn2KyCNW0LGw==\n-----END AGE ENCRYPTED FILE-----\n" } ], - "lastmodified": "2024-04-10T13:50:59Z", - "mac": "ENC[AES256_GCM,data:8pobkHaDYMnKqFxmJXroWUFVgUhNtEHMyM4QXsSVjB5011C3K/0jDFZ51zC2tatA+luPYvcQyA03iNYfDMPfnuQT8TDYw7qB4UH7NHZuby4WD/rsEbnDjZtzKBAOolk8Bg7uSodP5cSiNaPAY6qQcH3xotxn1jBlTLl2bgBmEdI=,iv:Ep/NtDiy0GBGTXlmlNqw60qk4DQR7I/UrkkMCPeYIew=,tag:zeUsdaEca7ggn8JBz+Kc6A==,type:str]", + "lastmodified": "2024-04-10T16:32:56Z", + "mac": "ENC[AES256_GCM,data:YjBYZar1UTbOnn/22d/4lgfBWeiKHyoHOg8mhBrDn3kt+JM4TmDf34cTIZ4m95yySH9kecoQc+cCv2pKLrERBFs0oB8y6WDZ04WfRHyDroOZW4k9XVKwrfZ+M3vDPVd/S3ViFOwzMK1vIlhx5hFd8lOKD25UzLqWK1N15Rq5kP0=,iv:CB6wTsKXUkbHElC7Awx8ozc4S4QDppO+BB8swWrUDcU=,tag:hqzyPpoXA3FaR1oAsJSUBA==,type:str]", "pgp": null, "unencrypted_suffix": "_unencrypted", "version": "3.8.1" diff --git a/secrets/battleship-secrets.yaml b/secrets/battleship-secrets.yaml index 72cb7c3..ec94e6f 100644 --- a/secrets/battleship-secrets.yaml +++ b/secrets/battleship-secrets.yaml @@ -1,5 +1,7 @@ lat: ENC[AES256_GCM,data:jmQPcQFV,iv:k4+a7lA64yT9AJANcOQ4HDZzq8aL2Tga67BesqfnL3A=,tag:OjRTtL/BoDwDBWvWQUCt9Q==,type:str] lon: ENC[AES256_GCM,data:Qn9Gi5LP7ve3kA==,iv:s3ZdJ6rfl03nzEes4BpGPIzUUq5yCOIBKbKhfznG0nw=,tag:uyvowjKDoTMtuApUVZA+ag==,type:str] +guz: + password: ENC[AES256_GCM,data:ZJVZSAwEoYHlkrmxEV+0ohCDVoduhFNx1bz1dAzxJ1MgNHxsE89OGTfWVGmen9xK2auPcHIplOcHwgMDbaAXToB1uF47P3uAzQ==,iv:wGz8vLqU8IQUKOwPeBxLX7zUgJrlwJ5cGl8i2guvuXg=,tag:gEl97Pu7CiJ0i9aAwBeCjw==,type:str] sops: kms: [] gcp_kms: [] @@ -15,8 +17,8 @@ sops: Nm1UT1pUeWJhS1hhUWo4b3A1RElKNG8KIzbqwoCynolclZkZ3AiIkqpGjEBUZPo2 h8Y3Rx2QASD6tg9jlxRqGtbXe+mNgcCNTt7cdOyhndQzzq/2GfbujA== -----END AGE ENCRYPTED FILE----- - lastmodified: "2024-01-12T16:34:42Z" - mac: ENC[AES256_GCM,data:jORvHtVDAYoM+8kY4gGC15r4ee+oYHczapmGdcAl71L4qNBE/qG/KuvyNCrG/mbiqM+U8W81Jwm32oCjrGDL6+Pv0stFlDmsB4ql7piyILQYUU4cLvRCaUPm2KVrD7Y+9sa0vgPOZQyUFQZmTQ1vbKNeHRmZn0qfHmqvji/Mfow=,iv:jKIgix5MGCrRqVxh5JCEjzBWQzW1kSoQLiQuDfGkzh8=,tag:0z/x5TplHjV5hMHC/JKiyw==,type:str] + lastmodified: "2024-04-10T16:19:17Z" + mac: ENC[AES256_GCM,data:R+AaVdTuE6tTO2UDDtscTl8e+3QpIxvfVOI3SLlZyeWxTgaZpyt+q14B/O5bcdvPRa4vymI9I94e3d15wnfINPLyKgW29fQcovO2k5i+OZXsLylIdVHyZfz4PSMGhSN/SHs86iFNHNEoc+UxtE0MSVfXBbWtIAMpoOEeTQDdIRA=,iv:bXL9dwjNmAl57qWeZTdQsT6gPSrUUzLVruMvqEze0JM=,tag:pXkkJO1KUStnErAg2BBnFA==,type:str] pgp: [] unencrypted_suffix: _unencrypted version: 3.8.1