diff --git a/hosts/caddy/default.nix b/hosts/caddy/default.nix index 16fee28..1fe826d 100644 --- a/hosts/caddy/default.nix +++ b/hosts/caddy/default.nix @@ -154,7 +154,7 @@ in domainsList = [ { domain = p.domains.public; - email = p.email; + email = p.personal.email; cloudflareApiKeyFile = config.age.secrets.cloudflare-pasetto-apiKey.path; } ]; diff --git a/hosts/colmena/default.nix b/hosts/colmena/default.nix index 7baa023..55fcb5b 100644 --- a/hosts/colmena/default.nix +++ b/hosts/colmena/default.nix @@ -35,41 +35,17 @@ in virtualisation.proxmox.enable = true; }; - # Extra packages - environment = { - - systemPackages = with pkgs; [ - devenv - git - just - zellij - openssl - nixfmt-rfc-style - ripgrep - ]; - - interactiveShellInit = '' - alias j='just' - ''; + programs = { + nix-ld.enable = true; }; - programs = { - - direnv.enable = true; - - # For VSCode Remote Development - nix-ld.enable = true; - - starship = { - enable = true; - presets = [ - "nerd-font-symbols" - ]; - settings = { - add_newline = true; - container.disabled = true; - nix_shell.disabled = false; - }; + home-manager = { + useGlobalPkgs = true; + useUserPackages = true; + backupFileExtension = "backup"; + users.${p.personal.username} = { + imports = [ ../home.nix ]; + home.stateVersion = "25.11"; }; }; diff --git a/hosts/deadbeef/default.nix b/hosts/deadbeef/default.nix index c3edc96..fbd7c45 100644 --- a/hosts/deadbeef/default.nix +++ b/hosts/deadbeef/default.nix @@ -7,14 +7,6 @@ }: let p = import ../parameters.nix; - - homeParameters = { - username = "pazpi"; - commonName = "Davide Pasetto"; - userEmail = "pasettodavide@gmail.com"; - extraPackages = [ ]; - }; - in { imports = [ @@ -35,7 +27,7 @@ in desktopUser = { enable = true; - userName = homeParameters.username; + userName = p.personal.username; hashedPassword = "$y$j9T$dA94KVg1/jYLqclQQbTDk.$cnfxBWUN8P4shr8Kkipv5bU/RCtQNoAwYFDZ0X/BYs5"; }; @@ -73,10 +65,7 @@ in useGlobalPkgs = true; useUserPackages = true; backupFileExtension = "backup"; - users.${homeParameters.username} = import ./pazpi-home.nix; - extraSpecialArgs = { - inherit homeParameters; - }; + users.${p.personal.username} = import ./pazpi-home.nix; }; time.timeZone = "Europe/Rome"; diff --git a/hosts/deadbeef/pazpi-home.nix b/hosts/deadbeef/pazpi-home.nix deleted file mode 100644 index e9ebd80..0000000 --- a/hosts/deadbeef/pazpi-home.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ - config, - pkgs, - homeParameters, - ... -}: -{ - - home.username = homeParameters.username; - home.homeDirectory = "/home/${homeParameters.username}"; - - imports = [ ../../modules/home ]; - - programs.git = { - userName = homeParameters.username; - userEmail = homeParameters.userEmail; - }; - - # set cursor size and dpi for 4k monitor - xresources.properties = { - "Xcursor.size" = 16; - "Xft.dpi" = 172; - }; - - programs.bash = { - enable = true; - enableCompletion = true; - # TODO add your custom bashrc here - bashrcExtra = '' - export PATH="$PATH:$HOME/bin:$HOME/.local/bin:$HOME/go/bin" - ''; - - # set some aliases, feel free to add more or remove some - shellAliases = { - k = "kubectl"; - urldecode = "python3 -c 'import sys, urllib.parse as ul; print(ul.unquote_plus(sys.stdin.read()))'"; - urlencode = "python3 -c 'import sys, urllib.parse as ul; print(ul.quote_plus(sys.stdin.read()))'"; - }; - }; - - # This value determines the home Manager release that your - # configuration is compatible with. This helps avoid breakage - # when a new home Manager release introduces backwards - # incompatible changes. - # - # You can update home Manager without changing this value. See - # the home Manager release notes for a list of state version - # changes in each release. - home.stateVersion = "24.05"; - - # Let home Manager install and manage itself. - programs.home-manager.enable = true; -} diff --git a/hosts/default.nix b/hosts/default.nix index 026e252..c28df3b 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -54,6 +54,9 @@ let # Agenix for secrets agenix.nixosModules.default + # Home Manager + home-manager.nixosModules.home-manager + # Host-specific module hostModule ] diff --git a/hosts/home.nix b/hosts/home.nix new file mode 100644 index 0000000..628003c --- /dev/null +++ b/hosts/home.nix @@ -0,0 +1,135 @@ +{ + config, + pkgs, + ... +}: +let + p = import ./parameters.nix; +in +{ + + home = { + + username = p.personal.username; + homeDirectory = "/home/${p.personal.username}"; + + shell.enableShellIntegration = true; + + packages = with pkgs; [ + agenix-cli + devenv # Fast, Declarative, Reproducible, and Composable Developer Environments + dive # Docker image explorer + just # Command runner (modern make alternative) + nerd-fonts.fira-code + nerd-fonts.overpass + nodejs + repgrep # Interactive ripgrep + + # # You can also create simple shell scripts directly inside your + # # configuration. For example, this adds a command 'my-hello' to your + # # environment: + # (writeShellScriptBin "my-hello" '' + # echo "Hello, ${config.home.username}!" + # '') + ]; + + shellAliases = { + hm = "home-manager"; + hms = "home-manager switch"; + hmb = "home-manager build"; + g = "git"; + ".." = "cd ../"; + "..." = "cd ../.."; + ls = "eza"; + j = "just"; + }; + }; + + programs = { + direnv.enable = true; + fzf.enable = true; + home-manager.enable = true; + htop.enable = true; + lazygit.enable = true; + zellij.enable = true; + zoxide.enable = true; + + bash = { + enable = true; + shellOptions = [ + "histappend" + "extglob" + "globstar" + "checkjobs" + ]; + }; + + delta = { + enable = true; + enableGitIntegration = true; + }; + + eza = { + enable = true; + colors = "auto"; + extraOptions = [ + "--group-directories-first" + "--header" + ]; + git = true; + icons = "auto"; + }; + + git = { + enable = true; + settings = { + init.defaultBranch = "master"; + user = with p.personal; { + name = commonName; + email = email; + }; + fetch.pruneTags = true; + pull.rebase = false; + }; + signing = { + format = "ssh"; + key = "~/.ssh/id_ed25519.pub"; + signByDefault = true; + }; + }; + + starship = { + enable = true; + settings = { + add_newline = true; + nix_shell.disabled = false; + container.disabled = true; + }; + }; + + uv = { + enable = true; + settings = { + python-downloads = "never"; + python-preference = "only-system"; + }; + }; + + ssh = { + enable = true; + enableDefaultConfig = false; + matchBlocks = { + "colmena.home" = { + hostname = "colmena.home.pasetto.me"; + }; + "colmena-ts" = { + hostname = "192.168.1.22"; + }; + "*" = { + user = "pazpi"; + identityFile = "~/.ssh/id_ed25519"; + }; + }; + }; + }; +} diff --git a/hosts/parameters.nix b/hosts/parameters.nix index 4135c59..3f0970c 100644 --- a/hosts/parameters.nix +++ b/hosts/parameters.nix @@ -35,5 +35,9 @@ in librenms = "librenms.${private-domain}"; collabora = "collabora.${private-domain}"; }; - email = "davide@${public-domain}"; + personal = { + username = "pazpi"; + commonName = "Davide Pasetto"; + email = "davide@${public-domain}"; + }; } diff --git a/secrets/arr-secrets.age b/secrets/arr-secrets.age index 8c0b472..9954d8a 100644 Binary files a/secrets/arr-secrets.age and b/secrets/arr-secrets.age differ diff --git a/secrets/authentik-env.age b/secrets/authentik-env.age index d1a33f6..541cc11 100644 Binary files a/secrets/authentik-env.age and b/secrets/authentik-env.age differ diff --git a/secrets/cloudflare-pasetto-apiKey.age b/secrets/cloudflare-pasetto-apiKey.age index 8585a1a..cbaf0c3 100644 --- a/secrets/cloudflare-pasetto-apiKey.age +++ b/secrets/cloudflare-pasetto-apiKey.age @@ -1,9 +1,11 @@ age-encryption.org/v1 --> ssh-ed25519 BFt3Fg XtjNmZwe/6sJU4h//bVESDBw/vVvPOETBhAiz1GeUC8 -wtF2jk0uggB/e2+tPXH6Ky1CZzSXCuf6BpwhvVdVnIY --> ssh-ed25519 uqg2jw vjlyslubpWG62ZqmaTWjMoQeo/yzhepjOM5XCjw9+SQ -5pUaHbGWhbLBVe2/TV4e5QMMXjXjBHIOox3/Um/S4yQ --> ssh-ed25519 a0HhMw fcTKN6ueXmOIARCBaVJoQlDGjVdV8qUJF4sFUMHfF3k -p8BH83HhimIM3rHiuqv9EJ24z7Y9ZtNzATDZBMxvme8 ---- 3ebErblfggeme6JqKsheljbQr/QLk/EY4pKPdLBmtIg -qw S{V ssh-ed25519 BFt3Fg XIcZtfUlxRs0soVwX4r2S4tZ1+6Mg0Lku7So4yEDgU8 +wPkX9ULKNZ+VkS2IDGGjTLiCr4ugogFQmkj7K6n7aOw +-> ssh-ed25519 uqg2jw btHyM+dMgUyhxwUkcRpiqPiOPzz6cpTRHD1ZPW0RTCA +ZLIXVbZ/FDvhuX3FZuNcclQL8T736ILfhudrR5Dn5L0 +-> ssh-ed25519 a0HhMw Kvl92RsQe+9M4VTQAQKnVgJxzmPgpzkSTLbEq0ZNIUE +XWXKU7e4ZXKxWk9YnbKuQn82dPPn2AC4mpksoEnWHfw +--- RgMEIYrUSY8fi/qXFJiUiaBFoI9z4WbG7iy3x5RvAQA + +&&2]ȺR6\K., +Y ɤaAo s` +0vTB)^0-Ee%k#iZ^~5apc;8g?nN *Ak7Uh s-EAaΉI׭J ssh-ed25519 kElbzA tqjANmTi92F+J3s1Lr0enIdlnrjGINiy8C3S3LlwLnY -xnQYW0XjpG1nXIAvknGaitpeO9M6AoYga/8i9zKkHWw --> ssh-ed25519 uqg2jw u6VDTedM6+IZqoRwhgyMlzfjmxWWMbucO1JcGPt/9jc -kgp4mvi9eZnHr5lMgNdV99/0eelMMiivV8h/0pU37OM --> ssh-ed25519 a0HhMw QB8jMTyztNjTnel71eT0Ay7zScr+UV3+jRxGVGMqEHs -WQ+w6gAq7TyKYuxUTgvKOM07iblbfXgjCrKXH1Yo2l4 ---- tUXEoQeQipDhevvNSYDXG7K+ksTaiaZW8uTXWvEZ6pY -xaE>\G@rOOUU0uwP87suOZWoJ -)leeà";78֎q \ No newline at end of file +-> ssh-ed25519 kElbzA w0lkpAAytuQB4TW+cZwlA8Yxj4hSn6XidCrToSIqE0M +/uI8UqRwxnAsjju5Qmgns1YIWdCOW2GvGyyLGFS8nII +-> ssh-ed25519 uqg2jw 9ALpppM5izrNPdsbh0v6R1OZmU96wrlfZME/NQw/EQ8 +beCx2Cs9d5GzLUmwAkfwjWTyIzsQErpzUjO/dNN+8to +-> ssh-ed25519 a0HhMw iB1TdOcYWge4Q6wc73Ol2gWc3or4+E4SkQaPoL9Func +tU7CZQVSH32zxcffCZoScFBGssbFapydAGsGQzNS92M +--- 4CJM+a3+hhGzdH/bnNfpp1t+1qa7YDF5K8zcfLbrVDM +yi !y2>6igNz:0xnEIqƿkqhn^#\PզWSf \ No newline at end of file diff --git a/secrets/grafana-admin-pwd.age b/secrets/grafana-admin-pwd.age index 1da7fae..c4fd8a1 100644 --- a/secrets/grafana-admin-pwd.age +++ b/secrets/grafana-admin-pwd.age @@ -1,9 +1,9 @@ age-encryption.org/v1 --> ssh-ed25519 xSWWeQ E+gCcIlUnT8vAqwQ09HNXosMXWGvGZKkoNgfpSWZUj4 -A0JaLcXvHSnR2hNTv/tBBap3MeLE9ACjSE1ZS6d2zeI --> ssh-ed25519 uqg2jw d8f1wLaJOD4sAtDJhepze/44pz1MXIoSQGBccaZsCz4 -2cN1d1XmOw+72j0LhdOUEmySQUAEwVw0WJ6qQjlE+P8 --> ssh-ed25519 a0HhMw DUYGuMdsdyf4/urAB9fyrS8DUNExYRu+99N/OjQSfXI -sQpNRvMwcWLF90tQnnSoLxZHF1rU0BHQaCkQf3SOkX0 ---- KE8/92DAZ/sp2uUC7sCS2xRPfXjjxXalYvPtlGTGTyE -N]+*1NS6oE#}"͗\rm \ No newline at end of file +-> ssh-ed25519 xSWWeQ WMV3AZdK2U046xt0RT7C1O6GSnooPco9iYCvJwbwiFg +m+KCPob0a84nPNorJHuDTjpcq6QBWQmc8+PjPzaPB0Y +-> ssh-ed25519 uqg2jw UQoZQyUIO5oLwMAQI3MdPPw6+OusFCsQMCKkSiBCnnQ +83jp2AdcBI9p1bhPnk5eQSAAgNhfG4e6WAZK1hhpKXA +-> ssh-ed25519 a0HhMw no+5eTnSbfSxAffuemm8O2P2Klqw28HXaanfK5qJ20o +uZtEg6bEO4LrFnMvr3aQBgEvziDcNBGL5Eda3Ds781A +--- 4xMxweR7fMCZRVUDGSc6R6UmtDI2VtmQcpiHlqwTdhU +Ŋ;JIǹ|N:J;$~CD$6 wz[S \ No newline at end of file diff --git a/secrets/grafana-secret-auth.age b/secrets/grafana-secret-auth.age index 7117960..40521a2 100644 Binary files a/secrets/grafana-secret-auth.age and b/secrets/grafana-secret-auth.age differ diff --git a/secrets/mqtt-password.age b/secrets/mqtt-password.age index b73ae69..8e0b9d6 100644 --- a/secrets/mqtt-password.age +++ b/secrets/mqtt-password.age @@ -1,9 +1,9 @@ age-encryption.org/v1 --> ssh-ed25519 VfYKTQ JSw2XU6P0sCVScvHUxzrZX4bWSYVpQUvDiHuxDCdr1A -B0AniniDnZvnpsPhEjl+kRwN8erwgCJLAwjg4/n7BJo --> ssh-ed25519 uqg2jw 4PD4SUNql/7ClVurWB7026hAxwmzLsTfUjAxFxTuTB0 -mVUy3mlLuPgZoffgd3ND0g/AA0LA98NHxPor0iAiq+M --> ssh-ed25519 a0HhMw Bgryc0746uvBsXqjAaEFASgt9nmnLKBHpoFfQZk7ZzE -vRbsn7feVb6Sa5BibZKyUlgAxsfj1TYhk6DI3GmgGxU ---- D/cka14+lxoBHB2O82bGf4cuYGhHnuTeJtv/xlfUWVE -F Jлĸ`buyț;7@3Kt{ץl \ No newline at end of file +-> ssh-ed25519 VfYKTQ VIcgl0K8TCfByw3ePvmRpzr3jiCSvaUpDTJcsi3osz0 +90OEuN6K3ZMMd819DLklg1K2YtfV42r+TM7BEd+yjIw +-> ssh-ed25519 uqg2jw 0le3Ee/zXgRvR49ObKCKm4Cf5PJFqIjC02ImdHAyrg4 ++9j6RKYhEkQEXRSzHXUygNTYLo5u8XNknffjWMp0wOQ +-> ssh-ed25519 a0HhMw TzncAEpgB3FDus/b73WimP534QF7aQydMy1eOydjqEI +fBPnnfFZKS7rpPkWrrmq5MMRpV2gfSRUrQjD66Pw1KQ +--- 63G0AZIezivRLdi9qFDvfNPGorwupWEBVu+6cgO1/Cg +QjӘn~ZEt%'}PP#|^^N' \ No newline at end of file diff --git a/secrets/nextcloud-admin-pwd.age b/secrets/nextcloud-admin-pwd.age index 6768b58..4374139 100644 --- a/secrets/nextcloud-admin-pwd.age +++ b/secrets/nextcloud-admin-pwd.age @@ -1,9 +1,9 @@ age-encryption.org/v1 --> ssh-ed25519 S1eK8A hUCJEaG4UdI3zqRJMHCBEnpozRifK9oJdFat2EzIOX0 -hY8TLD7kLSk6v6Nn5lUJ4ZZdi5yyow5kF0siJK9wGFE --> ssh-ed25519 uqg2jw mQgK1YLhShSmmjne8CYPqo45CGeLsSMliMXlCXX5SCo -SyxNPzahNJEBiS1LvIDqQdZ18yBbJ594oIbp9CFUS+A --> ssh-ed25519 a0HhMw EOW69SECq4eX3mf+ExDCD+c+FsuIw1taRopuJC/iRik -oZe0daQU9PUYVD94JebTEo5SGoGcP/Zwj7TL9dDGZYQ ---- 4lazuOb4pssKTDxombzrQF5Hq1ReslIEUmYhhJpcVY0 -W8VbT_Xr 49vݜ]X,ᅻem \ No newline at end of file +-> ssh-ed25519 S1eK8A iYqnaZLB4k05Y7EtgY8Tu0sSzSaFcw9tCwgUuBWCPEg +IEf056RsERZtoG2ylXJ+ZKATiypah/WYpq33H4fu3Bo +-> ssh-ed25519 uqg2jw m9j5hY6tZpJnF9ojFsIl52gt5EqifDr3nVcAa9YTlwA +T00VddmIxA8ssjZKEVJQj+YRW4OnI95n1bkVlF4ajCY +-> ssh-ed25519 a0HhMw +8Kn9YaYbdC1D5wWlUfG67h3L/xHOuk8t2NIWe4DkQg +ZwvNdJUE0hI/XfJXpwlByefsN/NwlfnA1Iqslr4+66s +--- orXwCTLcvSasnOZKN3trsK2UlTpkqwg5ldMJiOveWxc +,(m NuXN/!M&@ЁڒRo!߆"ʋ:- \ No newline at end of file diff --git a/secrets/nextcloud-secrets.age b/secrets/nextcloud-secrets.age index a40bdf7..e77bd5d 100644 Binary files a/secrets/nextcloud-secrets.age and b/secrets/nextcloud-secrets.age differ diff --git a/secrets/paperless-admin.age b/secrets/paperless-admin.age index 4cf0b40..7c86ecb 100644 Binary files a/secrets/paperless-admin.age and b/secrets/paperless-admin.age differ diff --git a/secrets/paperless-oauth2-client-secret.age b/secrets/paperless-oauth2-client-secret.age index 777214b..a81a7ff 100644 Binary files a/secrets/paperless-oauth2-client-secret.age and b/secrets/paperless-oauth2-client-secret.age differ diff --git a/secrets/scaleway-password.age b/secrets/scaleway-password.age index 66b9f0a..983daca 100644 --- a/secrets/scaleway-password.age +++ b/secrets/scaleway-password.age @@ -1,12 +1,11 @@ age-encryption.org/v1 --> ssh-ed25519 PCrpYA lEqP8LC9SVfPLCAW3wX8AJUUsv2PMm7Cy9NFW4gp+Dk -UvHKKiZfui54JqkkQEJzdyF+AcrddRxm/J3DVC9QXLo --> ssh-ed25519 aichPw X7D48uUYzEi67qqb7ZMRad6azSCgluhitfhjmOh9GD4 -Dm/FyPrwBzkwnYNhwkTp+IljlUIlrRrd82hQMVqbbjw --> ssh-ed25519 uqg2jw 2R6gD0kc/IShL9e3NZ23d6R7ZsYZuES3ByBmjXZSB3k -2ii58NpRI7uvCmw336WoGmVgsOCD8n/dXRFYDcU2MTk --> ssh-ed25519 a0HhMw LGDeft0z1KCfbwIjnY7Vc20u8jvlOEAZlq5jIdjgG0o -lazYQ0ntsfi/OqLaD+qeOviMsU5+OxZdcFTv0T2xKQM ---- +sZuPxzWBUycjLRBZy0v9qq08l5fw46bi7AoDNhEfbY -)i 4)IF*, }%;c7kiL_yd)-7G#"6ɖ#۵ -ߠ \ No newline at end of file +-> ssh-ed25519 PCrpYA FVQ/DJuuUM/gKjtHZMBujeWOKKxb3p3kCHKCzkWm5Cw +9XZ4PWaIfLZKeyVRLxE/3Cq1O4CSTe2LMGA8BOE9eDI +-> ssh-ed25519 aichPw FBSB/6HKz20F0EpPPdQl/TdMbSwSTY85oe+kgAGtMis +FcJqlHeDBpH4JVDVSLB050LypaDOGkei3tRcAsLh+Bw +-> ssh-ed25519 uqg2jw 7eXM1ioOx/7Aj6//f0ayj4YHAlCNfu46Rniv9nAVf3Y +KQ4DGIN0ehCgCq7Rb9dIt2h8JftapNTvma2ytpbQdv4 +-> ssh-ed25519 a0HhMw 9zZ2tBmL7A7umg5pdjwmjRz9hTvk3sI/OY+cBoZ2Wxc +X2aI5neSKl42OfwsaK9zKpcTOdFaOMdx20fcdyabzXs +--- 1QcLSTnVfMoDBT1Fpfsn8YuXgg9VKeAmiuCIuTkj45c +H䜀WME%1BtG68%WU3Uo8q"q}ߘ쾶Bg `~ \ No newline at end of file diff --git a/secrets/searx-prometheus-secret.age b/secrets/searx-prometheus-secret.age index 703edf1..8a4f00e 100644 --- a/secrets/searx-prometheus-secret.age +++ b/secrets/searx-prometheus-secret.age @@ -1,11 +1,11 @@ age-encryption.org/v1 --> ssh-ed25519 BFt3Fg 3NEBLRGxRT6B854MuvmmawgrDg5ITEJjEBHo78DMHCI -Aw+vI//kySahrr1/kX2GPwCKxrGXeqnK27mudSEN8v0 --> ssh-ed25519 xSWWeQ 2Nrt2mu0g5FFjitS+AhcTlLp9G45grvC1hd1mRcoQEs -TbWtU/NtfvwFi0Th9NX3TyUoz+xev/mKTcMkLPCSFLI --> ssh-ed25519 uqg2jw UI5zqhiBDoRECwpSUteB9Ao8M5NrY0w9MnbHu2DkkA8 -+bYDP32xMRrIsvwbyyFIRmWOWScJFAx4fJJSdkmxlZo --> ssh-ed25519 a0HhMw EUF0iiuMRWg1FSHZHzzNmyfaSAdQZodQ/ktnG9P0BnA -5VgnyHJenJN6+kKy9Mgkm1NeXdTgrFwNgIO0zSV58ag ---- aGKRsJBidbuP+6dTKIRewWSbFSUpp5tUnC5vzmjiOZI - u49KP1_!_D `bF-вn\|]:y2A;ȏ)'(6Mk#fƬZ9^J \ No newline at end of file +-> ssh-ed25519 BFt3Fg bJnEbdwQPAns27ZLCTMFpusn2EiSVBx1BI0eWGIPo3M +GXDBGU0vH5BNkMdDct58Ptfrjo9VkGe4NsO8qKzpits +-> ssh-ed25519 xSWWeQ EzNrLYHiTRB4qy3GM4+UgQ1xsSfmwYg2UZZrbGXAnV8 +/rpXgLCiPjZtK30KEL4gdsI9nNfvwvtMAOhZWDMMMp8 +-> ssh-ed25519 uqg2jw R5qstlWR6Me8EL5deCEPxduUH06GGvGPabiwp++VEDE +qHB/rmJ656pUe9kROogyyJ5K087vs0ouurXxY6XItOA +-> ssh-ed25519 a0HhMw D67rVz/os2DiCV2st/JAtn61imyNNwvvt91YX0KNMAg +qmYbCID3Ck8QMyZHB7XRsxMKqkGBn+Vn22uIMg5xtno +--- QTpgKrCKAHwfZ88ZM8DTu6sxocVEJ7FtGSeZ2uekugA +fJqlNqb#_ʠFmmZo 7͇>ߊǠ]mcd.t9]r*GSJtm'5s+XP \ No newline at end of file diff --git a/secrets/searx-secret.age b/secrets/searx-secret.age index ce05591..15303f2 100644 Binary files a/secrets/searx-secret.age and b/secrets/searx-secret.age differ diff --git a/secrets/shadowsocks-password.age b/secrets/shadowsocks-password.age index bbcc9c2..d1238a0 100644 Binary files a/secrets/shadowsocks-password.age and b/secrets/shadowsocks-password.age differ diff --git a/secrets/snmpd-config.age b/secrets/snmpd-config.age index fe88017..303bd06 100644 Binary files a/secrets/snmpd-config.age and b/secrets/snmpd-config.age differ diff --git a/secrets/tailscale-authKey.age b/secrets/tailscale-authKey.age index 0ad58e1..9675fa1 100644 --- a/secrets/tailscale-authKey.age +++ b/secrets/tailscale-authKey.age @@ -1,19 +1,19 @@ age-encryption.org/v1 --> ssh-ed25519 1nWE1Q 6l+mGYR/h3PzfysAEUtP2TNmeOEEZ9o82I1pZIToQ2Y -spI4bdtauaYFqkPfVypgfsbP3vPGn3U26lAgCr3CYCA --> ssh-ed25519 l7h2MQ vpUtGCSUb3X0NRbkWgsBZpHs0qh8jsOrgK1wfae4FnY -9EJQnJfEjnXKn29vRhGmEgvfyhubV6pgQA6IiUadZZ0 --> ssh-ed25519 BFt3Fg MHaCOLAjmolqPKh9hLnxLh/HOnXFOgNMS9ysGgsydy4 -kr++uM5j2kfbA/HlIhUUPG8yvcMRr8FGu3/Vbn45I0Y --> ssh-ed25519 cQlmdQ TjxYlOSGctoISvfdSVZNNM35Qnzwhw3eYc1xpNZiHBo -RbX5U08YnrBDsgJbUONzKXS2rd3fRUM5HKCrIIMQfN0 --> ssh-ed25519 xSWWeQ RPGfOPYUIeyohrDaxxTk6O2xARZ8vSlya3yWf0ii1hc -1GZxQ1CTLTNqXNh/+zWZ+niIzurGyevvg4dMtH9IkkY --> ssh-ed25519 HvFEmA D/YWDe82ntgGM6H0CKz39km7i7TPvKtzvrTiOZu/ym4 -2JamJ3qulNn4fyhlcJHGjmtrQPQldu1z+B8H4nxnSh0 --> ssh-ed25519 uqg2jw cox9atJoC0RViohv/F/4ZB0Dv8sGXLe/3YF3gsOFVls -/pCnksPXaMJCmjpCIyLcnZ6aqMLGZKFSXyhUWopO9+E --> ssh-ed25519 a0HhMw HPiF5X066nhR8aYX31ER5sRZ69VgJ9ReB1W73bTcTxw -yVPkb0pTJtO4llwBaqbu8JlkpN+nVexe5KKBLG7Ec84 ---- SUmzHO6cT4UoMCXLS3w/4dDJkk1qH2a0GGubIODXT3c -+;JQ{(@ H?dG88}nwJL24zwZ-C-`Ӥ.ghRzP]ku#>Ä \ No newline at end of file +-> ssh-ed25519 1nWE1Q gGyfb67NoNjMNiPH9hLZB8HfL8uoKbeQdVarVW3BN2c +EKUYPZYmS/OQtFihzBYSEJIZUD5HSKbvm7qLBgnheWQ +-> ssh-ed25519 l7h2MQ cGiRXQo37sqjTmQVwTTQuL+xpDLaXW8odgiKowPwDGI +8KzvN+BMnls7GeO3rlxx3rt7rpaBxTji6GwpisbbTQM +-> ssh-ed25519 BFt3Fg mQIKogVZLMjRlxBorHDTMnXuu74TaDw885BGxL257ko +MZtGnf0FnQ0hL9WrQtp+L+NDs7sN1XKKhiiM642rKu8 +-> ssh-ed25519 cQlmdQ ZPeVWB90YD5iHa5YM5NoxTP3rCOp5PwC28nfZIkj3QE +n5/32QG8mfwv0gwtGffl1JZZwM3EkggbS2bruqwpGNc +-> ssh-ed25519 xSWWeQ w5ChshbAPHLhYJWGbpzPgYoWOSl6Lk7QmfdspQL1nRw +fGSscR65V+HCEgXiQ3WuN39WNZEnuuj7mPJ0Jx1OKBQ +-> ssh-ed25519 HvFEmA 1HIGPd1ph+3blpYw9kloYPv00lW59/twhUgd9UcRMVY +v6S24bbz43HDGw0iqPdxP+1SAQHofZdVLIzK6+P0a9w +-> ssh-ed25519 uqg2jw TIaNrQ2D7/DYP7oU+bAp1T8Z5DfqzV80HhQIlCGggU4 +LU107d5OIoy+srYGMbDu9uoBozlN88hyKureFe5oD5Q +-> ssh-ed25519 a0HhMw OVXOFydOhpW/dXa0JdO34d+CxmBkLIFhrdtoI8XZfi0 +nAT68yv0YwhIVoB3fg78LcbnFCWFEBw2u9pJLqOWn30 +--- Yf+GsVXfAaa2a3tbGFgcmHPXymWd7kG47rJ4KCjTl9g +[u)}-iiؚ@]VKL1a1/شIdS\ڬIy(tAi]ZR/ÏXT \ No newline at end of file diff --git a/secrets/vaultwarden-admin-pwd.age b/secrets/vaultwarden-admin-pwd.age index 63e6bd9..767c8c0 100644 Binary files a/secrets/vaultwarden-admin-pwd.age and b/secrets/vaultwarden-admin-pwd.age differ diff --git a/secrets/watchtower-secrets.age b/secrets/watchtower-secrets.age index a6c9c15..9c2e930 100644 Binary files a/secrets/watchtower-secrets.age and b/secrets/watchtower-secrets.age differ diff --git a/secrets/zigbee2mqtt-password.age b/secrets/zigbee2mqtt-password.age index 1bdb5da..f9f0712 100644 --- a/secrets/zigbee2mqtt-password.age +++ b/secrets/zigbee2mqtt-password.age @@ -1,9 +1,10 @@ age-encryption.org/v1 --> ssh-ed25519 VfYKTQ W7A4T5lJq/mEHYZS9NrPjTVfBIq23tVk9Qzz6OK/UwY -Al4WLJL6XkibZ1kEgGn5sMo/6CBc4bYrdgGJku5g3fc --> ssh-ed25519 uqg2jw Otswqv2cM8Da89mOkaQ/A/6SMqXTbUhN9/tPFJunEws -KI/EfCRWh+J0qEEel4BUp8pUwGIYIyNjk9ISEhpWVgM --> ssh-ed25519 a0HhMw UDkq229Hgj5bNb3gi7Rj8MrfJmmRrlwF+m1qoTsdbEI -hj9F0kUtBcjg8+fqrzw8kmjEbhGaWLUCOUmT3/J0kHA ---- q3eJLLMihb8xnbJAwEt608NZtqPM1x2gVXMfrj7wWyM -i!R |y{Iy Qy\ \ No newline at end of file +-> ssh-ed25519 VfYKTQ 6Py9mXS8y0SPxhMC9+Pv/07aQd1cJjU8YCXlD4VRkRA +3ufRuZnrcz0ISAxlPh0JnNK2SR/ms4rspvAlrcCaf1w +-> ssh-ed25519 uqg2jw bS8DxxRr0n/oLFdFS0jk8RVFzIDsQDmIZzhIrZH2HGw +6L0tAR9ax+YXZEGmCtxxZUf61w08Tlq3lp7I5RVPV0o +-> ssh-ed25519 a0HhMw V59mE2aUvmwgB27Ci9d5/c5s/LK8CoI6C46tyB+6M38 +uWnbe1XS1VeSmsc7FsMt51DucK8Fp4Apaex5vz1fPIw +--- V5xPOO3w7QJ9MpWu2ivRpEqcHRHbfRLGZdH6+4cSKzM +$}``vglK~>ue ++~a|x*Vśe\]kw^e`oqjɳ T4ul \ No newline at end of file diff --git a/ssh-keys.nix b/ssh-keys.nix index feb311e..79570df 100644 --- a/ssh-keys.nix +++ b/ssh-keys.nix @@ -27,6 +27,7 @@ rec { librenms = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIM/dmfOVzj37ZYwLTs+jjQUQYRIgvW3NrtBDsr8rllss"; immich = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIF8H49AYwKmHLV5QwgqNjlFRhLVg/k3/kKR53/ihz/cu"; ilpost-podcast = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHo3tGrspZlSVbC1X/MHFFwDGj8G8+ZrZihU28DkbJEh"; + colmena = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOOVg0/MhkyTsZBITT0nZvH0hWskPJ7lyC5Mw70duczq"; collabora = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICSaXqZ+gqkbRJxsHRvCXw9U2Zip8YlPjbEIgPEzevO3"; };