diff --git a/hosts/ranni/configuration.nix b/hosts/ranni/configuration.nix index 55a951b..a8dcbed 100644 --- a/hosts/ranni/configuration.nix +++ b/hosts/ranni/configuration.nix @@ -62,6 +62,14 @@ in { boot.swraid.enable = true; boot.kernelParams = ["boot.shell_on_fail"]; + hardware.graphics = { + enable = true; + extraPackages = with pkgs; [ + intel-media-driver + vaapiIntel + ]; + }; + networking = { hostName = "ranni"; hostId = "00000001"; @@ -171,7 +179,12 @@ in { isReadOnly = false; }; }; - config = {config, pkgs, lib, ...}: { + config = { + config, + pkgs, + lib, + ... + }: { services.radarr = { enable = true; user = "root"; @@ -190,7 +203,12 @@ in { isReadOnly = false; }; }; - config = {config, pkgs, lib, ...}: { + config = { + config, + pkgs, + lib, + ... + }: { services.sonarr = { enable = true; user = "root"; @@ -200,6 +218,30 @@ in { }; }; + containers.lidarr = { + autoStart = true; + bindMounts = { + "/var/media" = { + hostPath = "/var/media"; + mountPoint = "/var/media"; + isReadOnly = false; + }; + }; + config = { + config, + pkgs, + lib, + ... + }: { + services.lidarr = { + enable = true; + user = "root"; + group = "root"; + }; + system.stateVersion = "24.11"; + }; + }; + services.prowlarr = { enable = true; }; @@ -209,8 +251,8 @@ in { enableReload = false; environmentFile = config.age.secrets.caddy_porkbun_api_env.path; package = pkgs.caddy.withPlugins { - plugins = ["github.com/caddy-dns/porkbun@v0.2.1"]; - hash = "sha256-X8QbRc2ahW1B5niV8i3sbfpe1OPYoaQ4LwbfeaWvfjg="; + plugins = ["github.com/caddy-dns/porkbun@v0.3.1"]; + hash = "sha256-sa+L2YoTM1ZfhfowoCZwmggrUsqw0NmGWRK45TevxFo="; }; logFormat = "level INFO"; virtualHosts = @@ -227,12 +269,12 @@ in { service = "sab"; port = 8085; } - # { - # service = "transmission"; - # port = 9091; - # } + { + service = "lidarr"; + port = 8686; + } ]) - // { + // { "http://ranni:8085" = { listenAddresses = ["100.76.159.53"]; @@ -240,30 +282,26 @@ in { reverse_proxy localhost:8085 ''; }; - # "danielpatterson.dev" = { - # extraConfig = '' - # header { - # proof proven.lol/de4a14 - # } - # root * /srv/site/danielpatterson.dev - # encode zstd gzip - # file_server - # ''; - # }; + "http://ranni:8384" = { + listenAddresses = ["100.76.159.53"]; + + extraConfig = '' + reverse_proxy localhost:8387 + ''; + }; "movies.danielpatterson.dev" = { extraConfig = '' reverse_proxy localhost:8096 ''; }; - # "git.broccoli.town" = { - # extraConfig = '' - # reverse_proxy localhost:3030 - # ''; - # }; + "git.broccoli.town" = { + extraConfig = '' + reverse_proxy localhost:3030 + ''; + }; }; }; - environment.systemPackages = with pkgs; [ helix kitty # For terminfo diff --git a/modules/default.nix b/modules/default.nix index afbcdb6..f6e1229 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -26,5 +26,9 @@ pingbox = { }; - ranni = {}; + ranni = { + imports = [ + ./gitea + ]; + }; } diff --git a/modules/gitea/default.nix b/modules/gitea/default.nix index bb2cdfe..f7c5052 100644 --- a/modules/gitea/default.nix +++ b/modules/gitea/default.nix @@ -10,23 +10,6 @@ group = "gitea"; }; - gitea_actions_runner_token = { - file = ../../secrets/gitea_actions_runner_token.age; - }; - }; - - services.gitea-actions-runner = { - instances = { - primary = { - enable = true; - name = "actions-runner"; - url = config.services.gitea.settings.server.ROOT_URL; - tokenFile = config.age.secrets.gitea_actions_runner_token.path; - labels = [ - "ubuntu-latest:docker://node:16-bullseye" - ]; - }; - }; }; services.gitea = { @@ -46,6 +29,7 @@ server = { ROOT_URL = "https://git.broccoli.town/"; HTTP_PORT = 3030; + HTTP_ADDR = "127.0.0.1"; DOMAIN = "git.broccoli.town"; }; service = { @@ -64,9 +48,6 @@ SMTP_PORT = 587; USER = "apikey"; }; - actions = { - ENABLED = true; - }; }; mailerPasswordFile = config.age.secrets.sendmail_email_key_gitea.path; }; diff --git a/secrets/age_identity.age b/secrets/age_identity.age index 0e9c9a6..27ddb7a 100644 Binary files a/secrets/age_identity.age and b/secrets/age_identity.age differ diff --git a/secrets/bigding_backup_repo_password.age b/secrets/bigding_backup_repo_password.age index e10b4e1..d81d120 100644 --- a/secrets/bigding_backup_repo_password.age +++ b/secrets/bigding_backup_repo_password.age @@ -1,18 +1,17 @@ age-encryption.org/v1 --> ssh-ed25519 eYYv1Q zSCVLgdOkqdlA8P9fo/rPyOtrqJ8omWhnr8LjFxT0TM -YUHflqTFrEkkhHKyOUycJcaQbgo/EG6LIAIfh76FH5Y --> ssh-ed25519 Bp5IaA fXKvvOeyVn5Paez3cKRLC+tB5hhPypVLUdMISTriE3g -1gGIq1OvWe1vZdxhp1/mViMEDH301Jvs2UygRDeWlM0 --> ssh-ed25519 T/DpgA xFGe3C68/A5rsVqyIK8yuwmxLBa+rw5ApdYnCpGwJAg -/SB1JL99vBw1K2c0tWG4YdC4YH6Gj9NL4hTRKNSm4ww --> ssh-ed25519 qMgRFg 1Ey+jvd0pxXpGNdHP3PzVxRYJWW5RlvWgEqlxCmdXFU -dU652UNTrTfh3PZE7WYP3ezUJmnkmc3HkfK8UFuszAE --> ssh-ed25519 dMZXNw A3QHm57KbPqJgvQj1VvAtc3vrf2e6Asxd6OinuKqPmc -QfQXU+mY4s0j85IZ9CbHHBypQ574paUW1FllPPK14f4 --> ssh-ed25519 +shbwg 8ZD7pYkZ0VE7IcKeooc1kQbkTfuLp9AJ0eCSsBM8pgg -7IE0MTJIjOm4lriosf8CRkEL1580xIjAkcLoqekRd2U --> ssh-ed25519 70Nt2Q mp2b5li39+K+E8aaHkLNQ9TKDxPbs20pCYqVGufb13o -N1x023/Pqk4epQ2USmbAu5e1L7CEPDK28sf3fKYj8O4 ---- FflES9idRdByENQWx8XQzTUx/kQRxuRtnqCdRcjk354 -iNagiFq`dLgeF < I -^Z猰Zfݺ/ C \ No newline at end of file +-> ssh-ed25519 eYYv1Q EAZDNmNVPn4csM/YdGJFlORxQDMMtO5Dn7x2XfFRaFU +vuduGWTaLD//qz0GlOdArY7i4n3Uhwi4+nFr4jj8P3Y +-> ssh-ed25519 Bp5IaA XOy6sVXfaDVKhN81OZOtVlroHKIxpKgMwnJxcQ+i8Gs +dxXJCjBLmLru9L/sJEBmp8wA563MBc4nZYhXkE5P3zY +-> ssh-ed25519 T/DpgA XKdq7MGI+Gl+NYrwuMBPs0Wy4Z2/ewdItW3YhgEW/xY +SSeYZXSqY+FOv4A6+oxKgu2CzUI8DPEXiI2iMDXCkS4 +-> ssh-ed25519 qMgRFg 6uBriCnYizzXcQ9Sj+PBHHHKajsBICdErIAN/m5zCwM +HiNfRVS3omZA9UopFXXlK7KzaLU5q78/murhClxw3Hk +-> ssh-ed25519 dMZXNw R7mVtYIYqYGRJ6T1u07eStvfXJPZRT/0yOc0a2haFAo +JNzKXxhW+MxJKCSlI6lJqpCbR3QYI+FAHlnXUpzW5pk +-> ssh-ed25519 +shbwg zIiwiExg9YyJ4ihqr10WPRv0deNFjj2on6EFFTnSFSU +WYem7R3Mwi8OBZPOqd/m0v+A8k9HUC0+e7BwlTbdIQc +-> ssh-ed25519 70Nt2Q VacvBAJYuKDhLKpoDsdoFtPB9po/Bq/lC6EKG7C3oSg +DrifwWRcqhHjt/yAcDrxKEPpY3ceL5VJy3BNPH7v4q8 +--- vwailf0HFStDtxF94IGxV1jHWyhLjagTFAROxkCqnv4 +P6ibɿ\ xgTCU!>6C \ No newline at end of file diff --git a/secrets/bigding_backup_s3_creds.age b/secrets/bigding_backup_s3_creds.age index 8cd0539..06e1b6c 100644 Binary files a/secrets/bigding_backup_s3_creds.age and b/secrets/bigding_backup_s3_creds.age differ diff --git a/secrets/caddy_porkbun_api_env.age b/secrets/caddy_porkbun_api_env.age index bb20321..58cce5a 100644 --- a/secrets/caddy_porkbun_api_env.age +++ b/secrets/caddy_porkbun_api_env.age @@ -1,20 +1,20 @@ age-encryption.org/v1 --> ssh-ed25519 eYYv1Q rVsIPgVhjo10brWN1BFiPhsVUkqLpADs/RwAC/0e0XA -hwy4T5yFEaNrNE/WaKhH2jFmi6KHQv+HPcVE+LGQIqI --> ssh-ed25519 Bp5IaA oXZMzYEYfilr0XJhpv6KEn7tloF0wiiTEREX1X9301E -L3VdyOmNy18+7xdnT8+6ZpEKDoYd9ftdfY0OEfuyoG4 --> ssh-ed25519 T/DpgA /uBVSvdvYl3Wx+Rn1RcSPXRm9we9x4xhwYz1zjh7320 -RBePasGticMa83tR3BB+e6L/ijp68ojimpgDHHWlRHA --> ssh-ed25519 qMgRFg 3gYoMffkqyTfK+Uevars9zcrnZu1Wrxm1IcuS5MiiUQ -DuA3AHbhU8l7GtiNKIBszZcDXuE0V5SsmhM4YDn89Ho --> ssh-ed25519 dMZXNw 4QxPt7cyXOFYzfD3NNu0s762Q8fUq3xnSMFlFLIuW20 -Mt+/Qp5aHmBmCpS7XY1YA/sPmkG4278GQFykkS5zytc --> ssh-ed25519 +shbwg RiP0/XkFjX5+QkEKnIIvimnpzUGfhDtJsIhrZOvDKXY -FwFKPr1SphnnbGbT7/X4Ocn6E9zt+ciZ1IQIimRq4fs --> ssh-ed25519 70Nt2Q PeLAFhxpQAQDWHjT19VX6sxLB+wo72irpNSw5irwjCk -CGtAKDuFMlH1+Apbd+Wj1XZ/ZHQvZs4TeOFE6cTmaqA --> ssh-ed25519 YAvvLw DC2byXFwxj5lcvcgIQCU/k7bPaCYYwjXxsFXMRUNswU -2BuZpjyJalXYkouut/8iyW+E8K7sK1x2e2Q5oJs6mvE ---- X/NOW1Ukj+Aqs8CB9FzbXXEXNyCHooaXkuaihgfJ5b8 -hv8!*IGԋ|c5@7xOJSd`o -\Y욞`YBN8J[b!4*Ϝ~;;oӲHù"xhq&W>p2)W<uiVIAI){*\gHo@}¶ψOw ?qgNo5tu1H9Zh^.0^H \ No newline at end of file +-> ssh-ed25519 eYYv1Q HLv7VwiVXzh/uYmcwjMa0eZw7sJ+QDd1O2pKELLwi3s +Gv05590x4magr/A8oi1yAwFrwEZ5VXK1jFl8ojLabng +-> ssh-ed25519 Bp5IaA yuIBqQ+wKpMH9tOOXG8sWF8dVrElBtAAtIFv27XiZlU ++LYw0xUKS8340E0e3B9z3ijydbM/EJk4jEXqToOl4Uk +-> ssh-ed25519 T/DpgA ZVI8HGiPa0L8ACjz3L/qCFjShimO2xlF1iEJ8D+VNUo +jUqRKYaNLzNUAHj3U7lGEhJjHYp6Zge3pX9ogv7OTzs +-> ssh-ed25519 qMgRFg kWK3YMixuoNaCLvfqvxkIyVt7X/Fe1RnTU+9LgxyH3I +lv4DI+XrKOU89bdR1VEFv7BtMMKOaQCVkG1ntENDhOQ +-> ssh-ed25519 dMZXNw +A8bV+j+yrc6PurfbawA1cXwJFoW+SK7IMZvE62TkH4 +fvawY41qd1/mj6yvYcl3j0hOEhao+rCyCVSOki8Xh2E +-> ssh-ed25519 +shbwg kbmKDfoo+Vh5EBxENBHfrBjP1cW9YjOEhPnMSSrspQU +2n0w1x/ZdpZBSJteCjNnleA3Am6xukaXGieBtfINYxk +-> ssh-ed25519 70Nt2Q F17IHEPl6iZKRIwRkZbtE9ekNobZf3uF8E47gZzM5QE +2poTmZo+Tkpsq0f5SigLajIaw3Ug+roWvkRZIJRd7vA +-> ssh-ed25519 YAvvLw 33rh0onpSuvq5RBZIOdb9vHKqxqFBYMVZ9tRQlwB9A0 +FbALwt60o6hj4B/fPlVqBKOW9BPv04H+z2/mz+3pYK8 +--- 1OPzsgbGklGa39hKcitpdDhUAhiy3U83PSh1OKNHP9Y +9XMPH1Y,MLb2ɍR035^h⫍ +rix[dM 6l;P,nX6@N~iȃi2o pd/[)vq9htuѥwɜԔsI9 gbtȒ{&t:w]wNӘ eS5֨IC9O29mR \ No newline at end of file diff --git a/secrets/danflix_env_file.age b/secrets/danflix_env_file.age index 513731a..956376a 100644 --- a/secrets/danflix_env_file.age +++ b/secrets/danflix_env_file.age @@ -1,21 +1,19 @@ age-encryption.org/v1 --> ssh-ed25519 eYYv1Q /FJ1oyRr1NdpjRjDkCt9EqlhnlNfHk4Nr3Q+3ZzfzHs -kttnif9pfO0B1KJAR9+PN71l6ASHE0cUgdgGOV5sg+I --> ssh-ed25519 Bp5IaA pWSfR3AvezhCV1OawRgL/7GaqPfHAQqdca/0feUDtmE -XrBA8V6HGVYTVhYIMEjSeUqt6xo1Eheu0i9gsGvPmzA --> ssh-ed25519 T/DpgA JoY5P9O3gIUI+5ZzKFGb/3pBaU3VoIZMzj/N7Y52Slc -MxiT2J8zQuxt0Bi47s4Azn/VjBA0jwl7GNmLNciPLqw --> ssh-ed25519 qMgRFg hiiefMaeC3Lull8BNmQS8LOW133yh+bZF5Ul8lJD12g -VB+LvQ3u773EnICwHTwnbz6t3QRiXUeqZ80ORpyYxl8 --> ssh-ed25519 dMZXNw 7hecbrFkb1pEX7nfSc2waSVVjXWjBq1WRYlriXBiw3Q -uYX/yp5BFsvnSZvFrg7++TF2orhkIfeyY3P9anyW3tY --> ssh-ed25519 +shbwg k6+8YGkOEf8vsva95dLcCcWcoHz61bc3govBmbr8aSw -HUip2uMG7NabSiNbepZlQud+5CZuZDRjYa/WXr0UR9o --> ssh-ed25519 70Nt2Q Yf7AMUayjTROhs3kehSNH24pfvP+q2Ckym8nPOiYPVA -2dDJCiAK6D+SayP08IObBGzBNxp4lG34nGHOZdeQ9Dc --> ssh-ed25519 YAvvLw XFtl1w6vh4G2pZWxwsGYRtDtH1tKLiRbRkf8MlpBlWA -Iv6dy3675mX4TPtVt4rHC3X2WuplLu6ZYDd8GhpDebs ---- 6QOw5zJaUQstwwOUxz7yNSgBXBu+rW5rIc6CVoKLCZs -F7`QeRjgXR -҄+s-k2"ҪqU0S/);d!7FXg-*{pz mrmT{=.i۵ol5G̡9"U" VЮ[qx -+!65vSA"'@ iДo \ No newline at end of file +-> ssh-ed25519 eYYv1Q ffwMqZJLmL0Liq7hbLi6VxlOWs4MGYEXwQfzlz8UIk8 +NOEzAl0dtRjKu7Fa+M2lK+hKA01nGJI7rLsp5wY23s4 +-> ssh-ed25519 Bp5IaA mAvPbcRrBFeNx5KDi3Wvg2znSKoDQRprRU87UEtGolw +wavKPW0pceKtNEPjrpm6ME4dL83iY51NEcNXPBqiTGQ +-> ssh-ed25519 T/DpgA AuNVM6nulH1/4XILIBaIeg5R27hi7EPZLwIj3Sd6eRs +knPUWlIyEQTCaAWcH+BaZMscQxUu6GKDi0a51d/TeXg +-> ssh-ed25519 qMgRFg KnjOL8+AX0gSSPaQFR/ucRTWEHRo0QeM5txuThx9J1w +4el7Eftb87dy4GQaH4F9jA2EunXUcAKHQFWU9lM3v2E +-> ssh-ed25519 dMZXNw XnrQPPNB1xad7t/AOgU5TXhtEeXf1AV3ZbIti+DvMmE +x62z4ZbXCeN7HBn4MiSkBRKaoTC9hitf9Ktft0Eez1U +-> ssh-ed25519 +shbwg uTTR1Lf7Y2EQsYTGEskjRAJlm275xI3I/2fTTW7tpBw +QRFcEq6HKXdhsINrNc5JWi7YbjSPW6Tzg5AqVP0++4E +-> ssh-ed25519 70Nt2Q nkKIu9WgEsb0Oi76oyrCoONYQcBcY+wtaRmYH6HrshU +QO9qDH13wV9SRXjbEzauxreuK4Zs85MhEq5WNf2F88o +-> ssh-ed25519 YAvvLw el91vp7yefRCnRSi9X21I0hPxiQJQG2vmHQcq3Rggi0 +MeGFtkqNuvQyelHePKBN5R3kI9HvWBJKzYeUJaw6XwU +--- RW3q/KPRYhBZOBU7HhHRwPhV14LtOkClG1l43BvujGA +:}*Rj1tOwЙ[I{g֣Dh=DRS0ߐB[!% [R!=&T'M`dEԙ=(d޳#ZQ49a\p+P2(pZ%$ޙCwSFƯ|kDҡzHV8QUnX1}Nj˄?| \ No newline at end of file diff --git a/secrets/danflix_hetzner_storage_box_pub_key.age b/secrets/danflix_hetzner_storage_box_pub_key.age index 8d5887e..b20937f 100644 Binary files a/secrets/danflix_hetzner_storage_box_pub_key.age and b/secrets/danflix_hetzner_storage_box_pub_key.age differ diff --git a/secrets/danflix_rclone_config.age b/secrets/danflix_rclone_config.age index dc8d2b5..b44ff8b 100644 Binary files a/secrets/danflix_rclone_config.age and b/secrets/danflix_rclone_config.age differ diff --git a/secrets/danflix_storage_box_crypt_obscured_pw.age b/secrets/danflix_storage_box_crypt_obscured_pw.age index 25f16e0..cc55c25 100644 Binary files a/secrets/danflix_storage_box_crypt_obscured_pw.age and b/secrets/danflix_storage_box_crypt_obscured_pw.age differ diff --git a/secrets/danflix_storage_box_crypt_pw.age b/secrets/danflix_storage_box_crypt_pw.age index 2fb2616..ef11737 100644 --- a/secrets/danflix_storage_box_crypt_pw.age +++ b/secrets/danflix_storage_box_crypt_pw.age @@ -1,17 +1,17 @@ age-encryption.org/v1 --> ssh-ed25519 eYYv1Q OVrTdX6/IeZTwVuL5vNqeJCcCHPwM3JDjmyYhw7a7hc -9j9k83/gE5273rM7BLdCtehiOUDCmIRMoWSAYxcolMo --> ssh-ed25519 Bp5IaA Hm8ZlSC6oC25eWWcab2u+7AUYaznl2LtXDCyb7jXUF0 -GlJsvW2RjSB0o3uDm7qhATucWXXAKHoGPqGJEEOIKPw --> ssh-ed25519 T/DpgA w5STeqIu1OM400VtFRCYhwLWsAvngoh9epasa80puEQ -EvNihPcHgbJFlIgBNAKeqvFBulklp0c5Z4G1soTFGoU --> ssh-ed25519 qMgRFg x1lKqUWyi2g6b3Fx+5DgoUyJrm5J4pr5KovZHahYlDE -ni8IinnSIkyb/gEIRrR68wUz0RmxPwgmZXQrXc+qNCI --> ssh-ed25519 dMZXNw ZbAEtoAfsGvcv2SOCMpMjVEHhW27bA8BcqhoZYxOmk0 -qAGl8+XpzOboy6oEee5KienTjqUMborfwp1/ovc208U --> ssh-ed25519 +shbwg S2wiZA48sOeUQAtGfLL92Wh4TsYKgAYGsIHGAd9Ivwg -LbHGG4DpuAyw4cRGd+pwmVe/PKQ2/+9/VO7WSTrQ2Bg --> ssh-ed25519 70Nt2Q IYF9364DhRSNY6NT4M1bZ22zMAzPO1rcYn8QWg8ecjA -Up15ieiwKTHsWNt5Sv2QCRPKNJydMko23qgy2gya7g8 ---- vMk1t7JRnLp2p7cj9gqTQgOj8zxqL0Y/as1fvr5ySO8 -c@Dix1aKpmb2 t e,;!1˛xa G$rN~m]y #S \ No newline at end of file +-> ssh-ed25519 eYYv1Q DkvqMZR4rAohR1WJlrCf+scaLWmNnx4mrrpgcqD7gmc +nwqDls/jnivUBmxLzYdcGnWSpKa8DsvSyK0liIQ+wEY +-> ssh-ed25519 Bp5IaA czaim73JnR6W+IxYafvYffYH1gKeHNYG3ADk6Ca2vDk +LaGtGNeIlTl3h0W550q96FxVI7Fck/eZ0x6S+9kEW78 +-> ssh-ed25519 T/DpgA uvJRphdkclhfMX+9LgBhgy1cftqwFuq3+5sfJiDdIic +745R5UFsFjnqrqObeNyAAXSbEqjjb9dabvUROrV+gRk +-> ssh-ed25519 qMgRFg wNQxgCkIj1siNkJs9LfOd3KEx0fAvulACdL750boti8 +bR8o6gcCL4HdElSbRrjrilphwGtYaAxTNV/L3nMBw/4 +-> ssh-ed25519 dMZXNw yKvxiUeyY/sXlQWbMNFoR3LUEkIVRxVq8Si5BHRQw20 +KpBldK1O/1BcZ09GouMWPtKbzWwChlATGvRlTZ/JPWk +-> ssh-ed25519 +shbwg z6bYYoy9SkF1LSVHpPJXujhF7lH8jsB6hOg908elpmc +et4d4F1Aid7f1TKcoEGrHOOScgBwgSwGyRAsjtxYKkk +-> ssh-ed25519 70Nt2Q wqR+O1nWUqC2vCjSCF1/JWerZ9njpYbBrXusm0A2xzU +cBoOmd7wIX7DhsiDKiC/xc4k1ieiJ4MB/gNShGax9d4 +--- zJ+CdN6Qu8l0+5tCDKz0ZZLwhthLZD3DmWfgL536eS4 + @V ]-ped}r1I_9<=Z@n3ў*e}-:BKX \ No newline at end of file diff --git a/secrets/gitea_actions_runner_token.age b/secrets/gitea_actions_runner_token.age index 5352cd7..714675a 100644 --- a/secrets/gitea_actions_runner_token.age +++ b/secrets/gitea_actions_runner_token.age @@ -1,19 +1,19 @@ age-encryption.org/v1 --> ssh-ed25519 eYYv1Q UXIcxbKj5W1NupI0CpaFxLppMCy1ogABjJmrPrdtgj0 -H0nPi/Rbrdl3SvmL8yttjGYeK11AZYPrHntStknlGbs --> ssh-ed25519 Bp5IaA +jfI6PsuBMmMxbLLmbKFi5lubuDS2w1jpwYW7xXUfH4 -CoDWFDf3cGgLOH7q2usK7HXAyBpN8fP5vSb318XxEM4 --> ssh-ed25519 T/DpgA Llf5Z/2bPU+roE1sYzD7nk+OSqypp9lbjdwF9RA0dUM -w+KuaZAX3yEV2UsVT1UH2LGlPaxRX3yTmMDv1hZEtFs --> ssh-ed25519 qMgRFg nPvPNnuJL/+8Z06KJMvDCHzPNdRRSydVl/EJAklG3y0 -yyhTW5IOnGKtGrP73Ng4f0XTVjPIoYjDpiUNT4XwxWg --> ssh-ed25519 dMZXNw 1M7QevdGvzm1FZqyb1RHgTWEZcSzZZtXoJz0mo7JixA -Zw9KQgwfg6ikr3WNFZPallshniPx1lr0TIRlvGkyZaA --> ssh-ed25519 +shbwg DxHb7VM8pEaoiXl3eq4hCt89pxWiJw3FsqApRwPZhWQ -08tu5y9rv/ni+VieCvFImaJQHPZ/f6OPlUbbJfHUYEQ --> ssh-ed25519 70Nt2Q i+r0HJI4SNGpIzuVgtHMhEkZGCRL3JcWhoYKH687vHM -5mkfXvRuCN3+G8UkTE3zklkAd0DrTVyMG6ukDEJDs4I ---- 1M0mHhOXN1Mf+T5Ru8N+NBbVmUPeeKJpTcaR348JSFM ->QHX:.jq'xE{X/PH=5, Z"Sx -b8T -{@,`!o L9 \ No newline at end of file +-> ssh-ed25519 eYYv1Q NT/I7M2advY0rxFGH1wf2fS6131Ey2WsO+0lbHt0RTI +S8P3ev5JgbIAYTBLsX5HCTeaf2aGUc5FpceG6RruVec +-> ssh-ed25519 Bp5IaA DUNGRltZxtHuQISWvpdwN7NE9oWK/jYzyNuCNY9BwlM +q+B+BSRscrB05a2vzIOllHgwwsAw5ksjhaWyj2voqRU +-> ssh-ed25519 T/DpgA wqIIQl4g4DnpH9hBoQGfmP8fTIYipkybPQOWP4NmKTM +3aitfrlKD4HXik+pELBz3TiM7ktfpoKXcoiP2zbaS1M +-> ssh-ed25519 qMgRFg 0RJ2GTE21a2FgZgKZnb4i+70lmZdzqIHBAqyy6uZK1o +pecEVAN7+Y6dEXpY1Xz/SPWi1MVZx3rH9+YC0JUmNfo +-> ssh-ed25519 dMZXNw eSSiM/impi/GBNv8zzOzTnRwoR68mvr6o24kai6IDUw +VnJgTwJACdcsCgGzavaTn7bvb2VR9lvoJrEuQbx/aFs +-> ssh-ed25519 +shbwg uZaKYv0qROENTDHPlBT+LssNVFsA+BJznONnM0ap3Xg +6shNfpwayPdm0rmiKxmgSSQTt68fP2HxLrNC/thpvxs +-> ssh-ed25519 70Nt2Q OHAh0XRwfpYbeGs6MtOO1qx4FtmTN3B/IfYjhXIGlAg +hzJxbNQJZxmAeGhisVfTmzgR+P2mDDegackb5z7psFc +-> ssh-ed25519 YAvvLw 4ZznIEadBPmHkN/i4+P2xiGrIfaLe9J8va/xuQY8slE +k1BgyixkYxJxbKi/GxCHi15sAEjhzI/29oxrT56qtPo +--- HHCsUeX+Y2A6NkA2c0RfShW/DylAZkbEGMiR6lpht18 +rS;?HƊpiPFLu.2@JN,vxKcʱezR8dV\ )<^4j$c﷦F+ \ No newline at end of file diff --git a/secrets/minisign_private_key.age b/secrets/minisign_private_key.age index f9d7be2..5740156 100644 Binary files a/secrets/minisign_private_key.age and b/secrets/minisign_private_key.age differ diff --git a/secrets/rclone_password1.age b/secrets/rclone_password1.age index e7286c9..4213adb 100644 Binary files a/secrets/rclone_password1.age and b/secrets/rclone_password1.age differ diff --git a/secrets/rclone_password2.age b/secrets/rclone_password2.age index 17bdec2..3cb5df8 100644 --- a/secrets/rclone_password2.age +++ b/secrets/rclone_password2.age @@ -1,19 +1,20 @@ age-encryption.org/v1 --> ssh-ed25519 eYYv1Q N4l07Kmf3b7b69uKJrQ6nNThBrl/WbAmN57ihC6ZjQ8 -2oCASRRc1qY7ruScP757xaZ3vSlrimWNRYajbqvEruY --> ssh-ed25519 Bp5IaA UiiJj3sGm34sFQEfYEb/+MRbdcLJQIcvcna7Dodqojw -vqS1RePJ1pfvThr4zllPg30T97JuL2ebp4ZXqf1n4x0 --> ssh-ed25519 T/DpgA Tg/toD5n8zs/GeyjEOzPVTK8dXnzA1ieSU3st4vGAyU -DySirOIZiB6e7SHkTH9ZSHjsU8L0a21vDpqqq5CzjuI --> ssh-ed25519 qMgRFg xD/GsOCpw5kwJnSn+IQXPIgL3rYWJInA6RWYyVlrLzg -2ApxGOhCWdggoS8FiYpAr8enOGX60x1ZwRnUE4Xl7c4 --> ssh-ed25519 dMZXNw 1EDPyLIR4bY+nbwU583HNq1FobJpwbm5UUUa23SjxhQ -0FZN6SQD8k/WIcnGTSrM5jQjTPh2obBJqCIG6WvRwDQ --> ssh-ed25519 +shbwg /A8nm8jMT+GYbYrpuFQREAEMTBwb2aGy6MgP9GV1lQA -4k2SHB7JcmH1RVUq82NRYtg6UfMvngvmd2d/taL5IgA --> ssh-ed25519 GzHGXw 0/LHMO8FjcikUiHglUxsWMLEDxQGAsyJsSFZa+/6FA0 -xVRk7Ekf4BNxS0BiDEG2Sk7N50ETl/NZjCVF+D8vS5s --> ssh-ed25519 70Nt2Q BsNN322tifiglQwn1h6oDAgT52wzlH3eDXqrOlE7yV0 -f52H1I8DbK15UW6+pNHayYWuV9z4tPKkg0t6hHippfs ---- psLzR6pho+xpxI4aNw2xGh+zfdgfxDghBRbwZE8O+X0 -qcZq*(g}\bLiʔ_^561jŧ9PX^ \ No newline at end of file +-> ssh-ed25519 eYYv1Q RIMmsWmolEIOQUGgoIQRlmjTWqDLQYInJbPVeB7f/wU +06vZZhfXi1zqHznmbub9/wqsE8XvTlULe181cCz1oFc +-> ssh-ed25519 Bp5IaA LdaP3AOLKqGe3ala1UGFf0e7EThr9ptn4qUYzYSktz8 +c/6py1I4vJOtmoNRjm/99nlWax+J5pdMhh1GUzpIsMQ +-> ssh-ed25519 T/DpgA xvmg2ZQwPzUM9J6C0ggBPoRbW5R0w92unR3+W6dyo0M +lNDyhV3PBS56HDXrTECTdcHUVb2rSNA3GsirYdxjhN4 +-> ssh-ed25519 qMgRFg OLu/nzVnSnB6PdI5ZO0Nfp0Ga8ekWa5sWmqXhwYQ5VQ +x2LlyRBvB0Pw2yYi43KXeHUgJQ25OQEIX65L8wmcXz4 +-> ssh-ed25519 dMZXNw m3ydHsFKsxmbA3e6jcLVoZV60Y+OLmoOb4d05DQQsDU +MDOCsqlPc9rR3d0+sDbv0tPxr+hX3Kpc+E2HfZo87uo +-> ssh-ed25519 +shbwg eQnubQCP4+mjipTkxIrIEZ8rboOy2A/T5MWLe4Txz0w +Y6GEm6UZDegoPuUXxbK/LkrqZBY86rHt475anCnoFxg +-> ssh-ed25519 GzHGXw Z8Ut75VgG0ttf2LLjgfUb9TbxpW8nfSTLvx7FJoXDA0 +pjfgN5XokETssMCbolQ0nr2+4sTa1C0+oxg4IUIEgVw +-> ssh-ed25519 70Nt2Q Vmm5Dw+N8OVT9JawsVnYoC1FIOX7bKEb54Gb1cYMFC8 +/FNGoN4CbLahBtxj8zaNRjE7wM/3hXVJSFsfP0AJxc8 +--- HOnH0WA6bQZ0y9HEjgzmOo+P3hRosz1fM5tRVrYZ09A +, +9Or4ǔխ Hě7pkR+m wR S)& \ No newline at end of file diff --git a/secrets/secrets.nix b/secrets/secrets.nix index 776dc7e..e1276a4 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -29,8 +29,8 @@ in { "minisign_private_key.age".publicKeys = users ++ [system1 system3]; "bigding_backup_s3_creds.age".publicKeys = users ++ [system4]; "bigding_backup_repo_password.age".publicKeys = users ++ [system4]; - "sendmail_email_key_gitea.age".publicKeys = users ++ [system4]; - "gitea_actions_runner_token.age".publicKeys = users ++ [system4]; + "sendmail_email_key_gitea.age".publicKeys = users ++ [system4 system5]; + "gitea_actions_runner_token.age".publicKeys = users ++ [system4 system5]; "danflix_hetzner_storage_box_pub_key.age".publicKeys = users ++ [system4 system5]; "danflix_storage_box_crypt_pw.age".publicKeys = users ++ [system4]; "danflix_storage_box_crypt_obscured_pw.age".publicKeys = users ++ [system4]; diff --git a/secrets/sendmail_email_key_gitea.age b/secrets/sendmail_email_key_gitea.age index a9bf08a..59802d9 100644 Binary files a/secrets/sendmail_email_key_gitea.age and b/secrets/sendmail_email_key_gitea.age differ diff --git a/users/daniel/default.nix b/users/daniel/default.nix index 2ce5335..1916345 100644 --- a/users/daniel/default.nix +++ b/users/daniel/default.nix @@ -95,8 +95,6 @@ in { file = { ".icons/default".source = "${pkgs.capitaine-cursors}/share/icons/capitaine-cursors"; - ".rust".source = pkgs.rustPlatform.rustcSrc; - "bin/update" = { source = ../../scripts/update; executable = true;