diff --git a/nix/hive.nix b/nix/hive.nix index 92d7186..3406272 100644 --- a/nix/hive.nix +++ b/nix/hive.nix @@ -66,7 +66,7 @@ wg = { privateIP = "10.0.0.3"; publicKey = "pdUxG1vhmYraKzIIEFxTRAMhGwGztBL/Ly5icJUV3g0="; - peers = [ "vps1" "vps2" "vps4" "vps5" "dns1" "dns2" "minipc" ]; + peers = [ "vps1" "vps2" "vps4" "vps5" "dns1" "dns2" ]; }; tags = [ "apps" ]; }; @@ -92,17 +92,6 @@ }; tags = [ "apps" ]; }; - minipc = { - publicIPv4 = null; - publicIPv6 = null; - wg = { - privateIP = "10.0.2.1"; - publicKey = "ecYfTot7RrJyNebSZTQ1wciOhvrpNSSbkR15twpSSl4="; - peers = [ "vps3" ]; - noEndpoint = true; - }; - tags = [ "home" ]; - }; }; }; @@ -311,16 +300,4 @@ system.stateVersion = "23.11"; }; - minipc = { name, nodes, modulesPath, config, pkgs, lib, ... }: { - imports = [ - ./modules/minipc - ./modules/wg-mesh - ./modules/nas-mount - ./modules/postgres - ./modules/immich - ./modules/tailscale - ]; - - system.stateVersion = "25.05"; - }; } diff --git a/nix/modules/caddy/default.nix b/nix/modules/caddy/default.nix index 463b85f..13f445e 100644 --- a/nix/modules/caddy/default.nix +++ b/nix/modules/caddy/default.nix @@ -6,7 +6,7 @@ let "github.com/noratrieb-mirrors/certmagic-s3@v1.1.3" "github.com/sagikazarmark/caddy-fs-s3@v0.10.0" ]; - hash = "sha256-m5RHlrheqzoGqKQxixq+xTd2hlnCTets9zCT7aFka8g="; + hash = "sha256-mrsiXQi+5SIA/vhRuyiPUE5EXmLgUHCC5I+L8ARFDDg="; }; in { diff --git a/nix/modules/default/default.nix b/nix/modules/default/default.nix index e3b668a..260523c 100644 --- a/nix/modules/default/default.nix +++ b/nix/modules/default/default.nix @@ -2,12 +2,9 @@ let pretense = import (pkgs.fetchFromGitHub my-projects-versions.pretense.fetchFromGitHub); quotdd = import (pkgs.fetchFromGitHub my-projects-versions.quotdd.fetchFromGitHub); - networkConfig = networkingConfig."${name}"; in { - deployment.targetHost = - if networkConfig.publicIPv4 == null - then name else "${name}.infra.noratrieb.dev"; + deployment.targetHost = "${name}.infra.noratrieb.dev"; # TODO: ensure that the rust programs have frame pointers @@ -23,8 +20,6 @@ in nixPath = [ "nixpkgs=${nixpkgs-path}" ]; }; - nixpkgs.config.allowUnfree = true; - environment.systemPackages = with pkgs; [ vim wget @@ -32,14 +27,10 @@ in traceroute dnsutils nftables - htop ]; networking.hostName = name; - # Swiss german console tty keyboard layout - console.keyMap = "sg"; - time.timeZone = "Europe/Zurich"; users.users.root.openssh.authorizedKeys.keys = [ ''ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIG0n1ikUG9rYqobh7WpAyXrqZqxQoQ2zNJrFPj12gTpP nilsh@PC-Nils'' ]; diff --git a/nix/modules/immich/default.nix b/nix/modules/immich/default.nix deleted file mode 100644 index 9d3b52c..0000000 --- a/nix/modules/immich/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ config, pkgs, ... }: { - age.secrets.immich_secrets.file = ../../secrets/immich_secrets.age; - - services.immich = { - enable = true; - mediaLocation = "/mnt/nas/HEY/_Nora/immich"; - secretsFile = config.age.secrets.immich_secrets.path; - host = "0.0.0.0"; - database = { - enableVectors = false; - enableVectorChord = true; - }; - environment = { - IMMICH_TELEMETRY_INCLUDE = "all"; - }; - openFirewall = true; - }; - - services.postgresql = { - ensureDatabases = [ "immich" ]; - ensureUsers = [ - { - name = "immich"; - ensureDBOwnership = true; - } - ]; - authentication = pkgs.lib.mkForce '' - #type database DBuser auth-method - local all all peer - ''; - }; - - networking.firewall.interfaces.wg0.allowedTCPPorts = [ 8081 8082 ]; -} diff --git a/nix/modules/minipc/default.nix b/nix/modules/minipc/default.nix deleted file mode 100644 index 39adc61..0000000 --- a/nix/modules/minipc/default.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ ... }: { - imports = [ ./hardware-configuration.nix ]; - - networking.networkmanager.enable = true; - - boot.loader.systemd-boot.enable = true; - boot.loader.efi.canTouchEfiVariables = true; -} diff --git a/nix/modules/minipc/hardware-configuration.nix b/nix/modules/minipc/hardware-configuration.nix deleted file mode 100644 index b8476f3..0000000 --- a/nix/modules/minipc/hardware-configuration.nix +++ /dev/null @@ -1,42 +0,0 @@ -# Do not modify this file! It was generated by ‘nixos-generate-config’ -# and may be overwritten by future invocations. Please make changes -# to /etc/nixos/configuration.nix instead. -{ config, lib, pkgs, modulesPath, ... }: - -{ - imports = - [ - (modulesPath + "/installer/scan/not-detected.nix") - ]; - - boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ "kvm-intel" ]; - boot.extraModulePackages = [ ]; - - fileSystems."/" = - { - device = "/dev/disk/by-uuid/9327fdbf-f6d2-41ae-b69f-6dbb97ab388a"; - fsType = "ext4"; - }; - - fileSystems."/boot" = - { - device = "/dev/disk/by-uuid/2A59-D3C9"; - fsType = "vfat"; - options = [ "fmask=0077" "dmask=0077" ]; - }; - - swapDevices = - [{ device = "/dev/disk/by-uuid/db30dd66-fa2a-46a4-b81a-b0fc935db5ac"; }]; - - # Enables DHCP on each ethernet and wireless interface. In case of scripted networking - # (the default) this is the recommended approach. When using systemd-networkd it's - # still possible to use this option, but it's recommended to use it in conjunction - # with explicit per-interface declarations with `networking.interfaces..useDHCP`. - networking.useDHCP = lib.mkDefault true; - # networking.interfaces.enp2s0.useDHCP = lib.mkDefault true; - - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; - hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; -} diff --git a/nix/modules/nas-mount/default.nix b/nix/modules/nas-mount/default.nix deleted file mode 100644 index 0379576..0000000 --- a/nix/modules/nas-mount/default.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ ... }: { - fileSystems."/mnt/nas" = { - device = "nas:/volume1/homes"; - fsType = "nfs"; - }; -} diff --git a/nix/modules/postgres/default.nix b/nix/modules/postgres/default.nix deleted file mode 100644 index 79f0e6a..0000000 --- a/nix/modules/postgres/default.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ pkgs, ... }: { - config.services.postgresql = { - enable = true; - package = pkgs.postgresql_18; - }; -} diff --git a/nix/modules/prometheus/default.nix b/nix/modules/prometheus/default.nix index ef04088..d0e67a1 100644 --- a/nix/modules/prometheus/default.nix +++ b/nix/modules/prometheus/default.nix @@ -85,13 +85,6 @@ scrape_interval = "1h"; static_configs = [{ targets = [ "localhost:7846" ]; }]; } - { - job_name = "immich"; - static_configs = [ - { targets = [ "minipc.local:8081" ]; labels = { server = "minipc"; }; } - { targets = [ "minipc.local:8082" ]; labels = { server = "minipc"; }; } - ]; - } ]; }; diff --git a/nix/modules/tailscale/default.nix b/nix/modules/tailscale/default.nix deleted file mode 100644 index 9756f48..0000000 --- a/nix/modules/tailscale/default.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ ... }: { - networking.nftables.enable = true; - - services.tailscale = { - enable = true; - extraUpFlags = [ "--advertise-exit-node" ]; - useRoutingFeatures = "server"; - }; - - systemd.services.tailscaled.serviceConfig.Environment = [ - "TS_DEBUG_FIREWALL_MODE=nftables" - ]; -} diff --git a/nix/modules/wg-mesh/default.nix b/nix/modules/wg-mesh/default.nix index 636dc13..abb904a 100644 --- a/nix/modules/wg-mesh/default.nix +++ b/nix/modules/wg-mesh/default.nix @@ -35,9 +35,7 @@ in let peerConfig = (builtins.getAttr peer networkingConfig).wg; in { inherit (peerConfig) publicKey; - endpoint = - if !(builtins.hasAttr "noEndpoint" peerConfig) || !peerConfig.noEndpoint - then "${peer}.infra.noratrieb.dev:${toString listenPort}" else null; + endpoint = "${peer}.infra.noratrieb.dev:${toString listenPort}"; allowedIPs = [ "${peerConfig.privateIP}/32" ]; # sometimes there's some weirdness....?? persistentKeepalive = 25; diff --git a/nix/nixpkgs.json b/nix/nixpkgs.json index 8d760b2..10dd445 100644 --- a/nix/nixpkgs.json +++ b/nix/nixpkgs.json @@ -1,6 +1,6 @@ { "nixos-25.11": { - "lastUpdated": "2026-05-28T12:57:27.843Z", - "commit": "b77b3de8775677f84492abe84635f87b0e153f0f" + "lastUpdated": "2026-05-10T14:35:41.703Z", + "commit": "0c88e1f2bdb93d5999019e99cb0e61e1fe2af4c5" } } diff --git a/nix/secrets/backup_s3_secret.age b/nix/secrets/backup_s3_secret.age index 72aa71e..1aba70f 100644 --- a/nix/secrets/backup_s3_secret.age +++ b/nix/secrets/backup_s3_secret.age @@ -1,14 +1,13 @@ age-encryption.org/v1 --> ssh-ed25519 qM6TYg vf1l0o7K8ZIZGEBx2x7EzWKG7UKFQtuOhBqj/Nyq6xU -8b0863lHC83pZZ/dIkKS3f7L+PE0I+m0f2zqtef4tuU --> ssh-ed25519 91VHug r5WkIt9V+TM/zupGjYH7FrIz2ZSctKh0cWixaaL8vH8 -c0J8wy8gRmgoA5vEA3AeXa8orH2amWdIgxJJDaBSjTQ --> ssh-ed25519 XzACZQ Z6z3pornKWMM08RxpWV4YjWs8qKF9xn8lNS6S3SpFSI -1O4YNGfKjiY/BJDKwm1J3ZOhpPrMAiTdUHfZ305mSco --> ssh-ed25519 51bcvA cxBUjrD7stWdK400O/2HJM3YcKGjDGpWZt4Yq1sVdVg -mw2xRTGFWiWI959J8GOCTp/kiV85+k2/+bYJpw95/ew --> ssh-ed25519 vT7ExA 8bQ4LWtqj2AodnJHcV8lEk+3EcZBfWHUVHQKcG4nCwI -dIfddL4LTMun+EQQuPdLJNkGVysvTPm2059vQUUnEGk ---- VIlkl9DdBWVgTiJvBK3jgdpsLgGkvv/dFfbZLEYMmT0 - GE=0bʮP*&^V)?0,vpaȧ}p笆Yǭ[;̞@[o g$xܶ9g -{Y}_!([RV U'qC%SZwTC=5aIJxF)J \ No newline at end of file +-> ssh-ed25519 qM6TYg Iwzv4FA1pIES6SynmQejkarTCRc3xwqJhbPK+U197BI +0F6drTGs14E6tf0/eDcWu2y9b9yYLXjkAkHV0hT01MQ +-> ssh-ed25519 91VHug NhInO02XlDKVDYeEk+Y4jmaAG03YO1yy50R9vnUGPWU +0lgqjusLVxCLIQA8BSQveTNKEQf7uyEctRX+TDqipj4 +-> ssh-ed25519 XzACZQ vtBUTFyr4gjqcUsn3WCYOPspjnVwL19izhKYGX4kiy4 +bW6zwWar6COr58s/U6GJZsOPicAECUJr2VQZ0nOneF0 +-> ssh-ed25519 51bcvA itN8U0WXocUWmsO7Hy3a94j+aUyH83BN4iG9RK/9lCk +Eyuawwp7+bv9/f2UOihOqFLcETsFgPS+iJRrLID6jT0 +-> ssh-ed25519 vT7ExA tJoU7e9muJvOLU1a50SI7+KgbHYke/vaMn77u9gAyTw +p0Ofeh74R/UTpaBRDITNjwwXkUs/grBnsHiSvzUxCKU +--- EsDITASaNlbxImI3s/hCMpOM6Up4UrZgez1fTJlRT1M +:,ߐ n.|*#Ca%Iw$` ssh-ed25519 qM6TYg I4FIet5K6KGjWaCvKbhK7UV4LFJthRpRVDO/FoARzxw -F/KQtQI78KlLe1jT84oxdg4UG8QuG8xAVAutzVM+kJw ---- TEgDiZeZQL2K8Nq/xqUKrkPKSXyO5NgRbx8SkfGl62o -(Lנ* 2ڃjED* ȹ^䥶IJsy:7 oRe \ No newline at end of file +-> ssh-ed25519 qM6TYg 8d5Jze4wRBsRqy+/ifnIMf5IhQZrn2Hs0k4/RCJoAko +IUgnzcCHmQhsrJfUuOG5s7nl98/X+ycpr0JWQeqc1Ps +--- dNJXPA7jEVJs5yQmvcaidVnJoN5pRMbh6okQsjjDabc +f ssh-ed25519 qM6TYg pA28Ib4AvSxoAZuGE7ZDW7CpA1GQkYm77WKNahcUFEE -HjzZ2b/iVig4reIgU3z0O1El+tct50LS5fp+SiQB+Pk ---- ExFpE2FxaqSuuSMtQTU+kzVz4rI2SriLKhcy0JHZXPo -Kz)`Q= gXg}| R!wD6?^4HγMV]`7L0T61Nd1 \ץC~ϝF \ No newline at end of file +-> ssh-ed25519 qM6TYg oDQzYAbe3UasUjgyw2AAtcYaID6nKD+j6C2R05R8Bw0 +NnPZ81p1PafEEfYHP+MafDdrhq83aJ2NuH8iYz2Uk/Q +--- FM0robN+6H2uAp+ASaCVxlLmD6xVp5oNHHAz1BE8/+A +6K(6F Ys#+\,\L:R@t糆Bp +.6> L}`QD 5Q-iӧF 1V \ No newline at end of file diff --git a/nix/secrets/garage_secrets.age b/nix/secrets/garage_secrets.age index 0da71d3..96d1e66 100644 Binary files a/nix/secrets/garage_secrets.age and b/nix/secrets/garage_secrets.age differ diff --git a/nix/secrets/generic_backup_password.age b/nix/secrets/generic_backup_password.age index a3789b1..1e72b6f 100644 --- a/nix/secrets/generic_backup_password.age +++ b/nix/secrets/generic_backup_password.age @@ -1,13 +1,13 @@ age-encryption.org/v1 --> ssh-ed25519 qM6TYg AcP/Za8jdEONeSNcC2fm0rZg1VOMvqCreXdpd/iDKDY -dgBlpFUcvP/n86idjIWuKsx7jX6xEWQJKY+pdGG8XVY --> ssh-ed25519 91VHug R4SIqnNLIoIVGIR0XnUsh3RCz+20M3pWoQGJta4y2CM -s4O6GBECMUQpUX7yhx9CrNgedDn6yomCg8Bkke+4vu8 --> ssh-ed25519 XzACZQ OVHPNsSR5IfrAslyKuIMAZakz+k12GUGNYsGc7e5WQ4 -IQKyRtlh7lkwIdH79IYCYod93+qAqap6rGL/VJ04Mdo --> ssh-ed25519 51bcvA NYivGhQwqPbjLY+Bb08ow38Rb1SBfbEotPwdDr/v7gE -VRT0QUnImc0unH4DoEg07+PhQ0a3IsJRrJIcgDzBtjU --> ssh-ed25519 vT7ExA 6gW6MAGGmz7wqrE1cNgAJqhLyLBDnAkh3IFB/EJf7Us -nhE8i7G/n/CnLTOUYsprFFjWCA+v/CmOpYRB8dAAjaE ---- WvW+S65yf7YP+UsQH7VY1CSRqIFyNQAMBzVDCKcgk28 -wBэ*N%uz>9`?T7L?):g07޵ Lbxa޷$ ? \ No newline at end of file +-> ssh-ed25519 qM6TYg EOynzb0Op5bNKRZ1jRaS+ZZDowhMmGYkv4u0OjWqJjE +po5rR/gfWwB24nNa3w5VqW8o8AGEqTk40yQTTxNUfEI +-> ssh-ed25519 91VHug /NK1O4g1DWl6xNwHgkizeLJoFomY2zy/heEMChzrwWQ +yc+fwswX7at6eEcAjJrcYhdGlJwHJa6ZFpbBhntVtsA +-> ssh-ed25519 XzACZQ RUMXGNZ6fpgmOVGKuspoOf5cgGUvjyzCmBipU64BikI +XID++wcObepaGXScGD8KJwSHyX45UjrT2oRlh/VYGHs +-> ssh-ed25519 51bcvA TmB9sS4plGSx0ScZxYr2sWCo0UesyceyYPKWi+rVUy0 +yZrk2FbXpqb7XZoullu0JivQ97yTQLBiDv8BOox3evc +-> ssh-ed25519 vT7ExA n0kaB8lgH4OWR9l3hxlMT7tSjYZzNNlQLZJXnzHKf2Q +kswoozAAVll/lFIG66Iikzu086tnzGF523fVnAGLFbw +--- Sa3qvrEI+FxIoDUmXRW4tEcNjdhWPw4U15Xy197wb6w +8q93lx~J/VdhoIL{`O!76Һ6Ze._l?Jrf4 \ No newline at end of file diff --git a/nix/secrets/grafana_admin_password.age b/nix/secrets/grafana_admin_password.age index 7598694..18d4ced 100644 Binary files a/nix/secrets/grafana_admin_password.age and b/nix/secrets/grafana_admin_password.age differ diff --git a/nix/secrets/hugochat_db_password.age b/nix/secrets/hugochat_db_password.age index a0c5bde..07af726 100644 Binary files a/nix/secrets/hugochat_db_password.age and b/nix/secrets/hugochat_db_password.age differ diff --git a/nix/secrets/immich_secrets.age b/nix/secrets/immich_secrets.age deleted file mode 100644 index f485b4c..0000000 --- a/nix/secrets/immich_secrets.age +++ /dev/null @@ -1,5 +0,0 @@ -age-encryption.org/v1 --> ssh-ed25519 yMKb8Q wDQ9QOIpJMfsxGr63x9PozZEVfy1M0XvW9MvIjBjlSo -eAbDN8ZB52vcC1zEXKqjWUYb+vvIJVQ+f9CZmk1Jcos ---- ZRGd4IncBO5g0BIoezzfvCxNMAVP3cgmsF8Co06u+fc -Ui,W b%d9:dq{ ŽL[M ,d8{6 \ No newline at end of file diff --git a/nix/secrets/killua_env.age b/nix/secrets/killua_env.age index 531b5e3..30a6d95 100644 --- a/nix/secrets/killua_env.age +++ b/nix/secrets/killua_env.age @@ -1,6 +1,5 @@ age-encryption.org/v1 --> ssh-ed25519 qM6TYg 4XizqcJTul2c4nKebIgHNBlX1wfNM6ZdJIi+uD4STCI -wLKLC8dfC1jVWNLQR2pmJM3+yvlILUkn6be+x/l1Se4 ---- kgeOkLbbLqXAK8urZUOVhqPKn4AWulo4hGbOkgr+fOU -BSXN ssh-ed25519 qM6TYg bPkp8HZ9R6dGxYgND2mPKC85fyDhuNyhlnobEZnGRmw +xFKtdyfAEQyFQt8c0hKB5uB+YYVow4nEJkejcDBl5Ls +--- xSKVxbaHOvIFnprTjxfV1rv1L1jc/Y2PkB7TLbWam3E +_Tfv@$&kc* s L]v"Ft!4qۉ27"db8~0亁xyJ`(nb]r8䈺{$tYqua^W96x) \ No newline at end of file diff --git a/nix/secrets/loki_env.age b/nix/secrets/loki_env.age index 75520f9..2c2ee27 100644 Binary files a/nix/secrets/loki_env.age and b/nix/secrets/loki_env.age differ diff --git a/nix/secrets/minio_env_file.age b/nix/secrets/minio_env_file.age index 180971c..b23894b 100644 --- a/nix/secrets/minio_env_file.age +++ b/nix/secrets/minio_env_file.age @@ -1,7 +1,9 @@ age-encryption.org/v1 --> ssh-ed25519 qM6TYg bv3MPWeJTJj/lrwKDBAv4T+OrRdD3ViwX8HLCmCKghE -MGP87vT3Rmf+aqhMMXyZIs4OeMkS+uc+je6Zkod0hrY --> ssh-ed25519 XzACZQ cUkJyWCO6HkdxCqSnv9onmEUhEQY+Pj4seR/lH8KSAg -qTUgF/iT2IoJf7UOleaayWbkJbn5dgSVHKctKWnqfIw ---- BOvXie+k6OIewLDVF+Rx2YzkpytshqkFGCL/uYgljNQ -}pSS y*Sp*>ݖ  u:0b:=)tS\HNb9_mٝj{)(<3&Ә`R [{aܓ! \ No newline at end of file +-> ssh-ed25519 qM6TYg LSDtwlm9BBqnpzsXoeCQnJ7YImkiMJvqfet0MROaBFA +h/efW4ApyMTnp/p+3tUa8RaMreI00/T5Q4Gh71lFeTk +-> ssh-ed25519 XzACZQ of8qdZPKfTtCKNMA+eHgX+WijYZHrHrzq0alH1mTJyE +rVW21YZw3kbe1TCQj/Ch1krrJt0o6PXThAV/eUbY8B8 +--- gWUT/+evFTR4ARdKZK01i8qgDCjt/EKnpKCAS5fCt1w +(H At_ï +5oJV.D̀#lGu#ɉK!-T~"ksҖoǣip1> +𗣫iD6yPOia$/]:dk]A3 \ No newline at end of file diff --git a/nix/secrets/openolat_db_password.age b/nix/secrets/openolat_db_password.age index cc08707..29aa8ee 100644 --- a/nix/secrets/openolat_db_password.age +++ b/nix/secrets/openolat_db_password.age @@ -1,7 +1,5 @@ age-encryption.org/v1 --> ssh-ed25519 qM6TYg 7Nt/x/IT9ofXjrRRV7coT6nrrCSOCkqUqflm1oXLXTk -BafDaEiVpuT3SDVXvuD31WIKe0QlvAGoyn4MzUm9LfQ ---- BsY9/meRTzX5oCBD+w9f+2TO/TdPD936xOjgtQMWuag -RN|- -[6q -r7d% [3K`I{!u5ƃnӺMvodz A~ǍT QGh?Nw/YBQn_`_,ZFV8yw \ No newline at end of file +-> ssh-ed25519 qM6TYg ONh+83MLxToMgANja31F4qVxE47NVjXat06RLj4qG0E +9vRKxWSdW2Bvc/KsWqbbi5mGhLekViT87WhGnPf5ZUM +--- m/MMUEWaa8RewCOG6fOBQpu8M+pgFMWUs67NQcnI4c8 +J%ϻlNBי#^@fTrxt=If&ICl@ /D8c{MR39擻ն3`;$hھ>sO핅! U} \ No newline at end of file diff --git a/nix/secrets/pyroscope_s3_secret.age b/nix/secrets/pyroscope_s3_secret.age index e96d5b8..58f14dc 100644 --- a/nix/secrets/pyroscope_s3_secret.age +++ b/nix/secrets/pyroscope_s3_secret.age @@ -1,5 +1,5 @@ age-encryption.org/v1 --> ssh-ed25519 XzACZQ ver7uyV552D1F9hTxFYb61szNWPeIxsTr4M6RWZH1DY -BF2bL0xu6rAx21EQkGF8KNc/4+jqo/0E6O89vZ8WhfQ ---- b3peeNoZ70tv7mAtQokJ8IUgE6nTGPvUkSf8p6jika8 -<E7L{WJaO oL֡[Xd-!04U?Cyz1l e1e!_IP2Ce1WzVR}kAVnCb)%̪RwhAwA66Zkqlgz=K \ No newline at end of file +-> ssh-ed25519 XzACZQ m7q/k7PLJpNDFEFxm1SNobF2abWhncqxWri+CbVqkCc +3NB/uTmOdkPH3N+kZrSep7u0A57KpQzI4tlzyT6Z5rg +--- cI9WvpISFVi7fXb5pcNgyu3rH+4L8o5dZUnAxhQ1x4Y +Wj;lx8m Šq߮X+MJSzա4`=8$9`}w~ډשa6t۫Jtu"|p`Tb("j:I5PrSd3%[ok!gc\6sd52%j \ No newline at end of file diff --git a/nix/secrets/registry_htpasswd.age b/nix/secrets/registry_htpasswd.age index dce3ea8..a2098a6 100644 Binary files a/nix/secrets/registry_htpasswd.age and b/nix/secrets/registry_htpasswd.age differ diff --git a/nix/secrets/registry_s3_key_secret.age b/nix/secrets/registry_s3_key_secret.age index 5649f2f..11c6e78 100644 --- a/nix/secrets/registry_s3_key_secret.age +++ b/nix/secrets/registry_s3_key_secret.age @@ -1,6 +1,5 @@ age-encryption.org/v1 --> ssh-ed25519 qM6TYg /73Z7R1RE4lfUfVSeJqZjbGA5yjygfrxKi5iuMMxrno -tsbPaW/x9HFT/tG+5F3n/3SsuhmswVIfHVLNRAzdiP0 ---- jHapfTz6oq7gdrgBn+XNQdMZ67DbrFPBY6KKzb+wfjE -U1r(RMN8Ol$DNu3JonBOc%AT~RV##[;3*6/5gD]2%f)fxv -]h:d{_O~2tiz28 W>BT(a%͉l`\ \ No newline at end of file +-> ssh-ed25519 qM6TYg zUespYByALhutVeTKDYRCXpskuwotOzfTjWCVtGcXTg +LxTqOV8sk6zOQv1eAIvSfUoeCfpus5lB4VwQV7joMks +--- bCKKLMK0Alw89Sh6HB4EW76P29aNUC5btlNFHDBTsQk +4mXA/u U}hz <5f2<jYO=FWIW%%8f~` vl@:1ľkYwaL:\:G㚢H٭rkbEbt/N}v-xMXܿtGRptǭ.hbԓ8x5LF"qaG ssh-ed25519 LZU5Eg 3Bde2BfrG8qdngKCIg4xeXnkqqdrtcAZfW0REYwkmWc -0Js204/ZpkBK9mDZwhYOY1IGW8yA5L/iMAmrZR1r940 ---- V7Xj3KkcueKzPhl6wjk12zRrEmFPMpUcQd799p0Dqr4 -~TO80} Q. {q6Qu׆%N6Ќa|41րZՀ;Dz*^ѻ \ No newline at end of file +-> ssh-ed25519 LZU5Eg T16scfWokKj/4TaHvplWuIdHCs/oR4t3V9x4hFo9yhU +h8RoAXndXCwUBskJlJTLWoXapWMUTF0yPnqUV9u7qt8 +--- qGJTnOXdnz8D9eA8AKtYarVa1l75x10SqjhsKchfQ+E +aҿ/}=7_r^rԕ?y"oؘ;U`*(Ztz7s ,$^k` \ No newline at end of file diff --git a/nix/secrets/wg_private_dns2.age b/nix/secrets/wg_private_dns2.age index 1c04d1b..cfca638 100644 --- a/nix/secrets/wg_private_dns2.age +++ b/nix/secrets/wg_private_dns2.age @@ -1,6 +1,5 @@ age-encryption.org/v1 --> ssh-ed25519 5bWSnQ V/5bLxQqdZEF9tgSPGgm7nEpnyNGScgSVfjS3KOvxA0 -oKHKz5IIZNdsWhBCTCqvHVLAJGC+LEC7RuMgQHI9Wkk ---- 71jtq96kfCYsB8UGSccc2F6qWtj7DO658MeVWSD+L64 -UXd2ClEV~Fgip%N6 -t%͢Ż{LZ@B9${g&PBHQہ%4 \ No newline at end of file +-> ssh-ed25519 5bWSnQ eiSLsSWrjQldff9ZbhjhrvGgNGWxmxKu1JfsWmjo0Qg +cCLcVTC9hzN79cOMOuuOMo5VpwlBKraqxqeQuvVzqqU +--- bgLRe7t+KD2ehc2gAp4RERJ3nN5pGLA04L06KHVeQvw +ns4!nt3ܻ:#i? Jʷ '1d!? $/{uX6erL.][ \ No newline at end of file diff --git a/nix/secrets/wg_private_minipc.age b/nix/secrets/wg_private_minipc.age deleted file mode 100644 index b5f0470..0000000 --- a/nix/secrets/wg_private_minipc.age +++ /dev/null @@ -1,5 +0,0 @@ -age-encryption.org/v1 --> ssh-ed25519 yMKb8Q o1qLnZBL+o8wrQYM6bo01DsCKVmA/NCzLe84aO4NSlI -iEnVZGcr4wyMN5b5f9Qzt1lmycZVe+km/8ApNvq6ME4 ---- MiV3GRLz1rEy283zGsbTtrAbQgmdW0pobJE83BmPrmU -G^%Lj,sCIC&@>#t$.2R+p.4 ke^+sCgn-z{ \ No newline at end of file diff --git a/nix/secrets/wg_private_vps1.age b/nix/secrets/wg_private_vps1.age index c186827..ff02844 100644 Binary files a/nix/secrets/wg_private_vps1.age and b/nix/secrets/wg_private_vps1.age differ diff --git a/nix/secrets/wg_private_vps2.age b/nix/secrets/wg_private_vps2.age index 7b8faa9..aa84c78 100644 Binary files a/nix/secrets/wg_private_vps2.age and b/nix/secrets/wg_private_vps2.age differ diff --git a/nix/secrets/wg_private_vps3.age b/nix/secrets/wg_private_vps3.age index 50d20a4..a874cea 100644 --- a/nix/secrets/wg_private_vps3.age +++ b/nix/secrets/wg_private_vps3.age @@ -1,6 +1,5 @@ age-encryption.org/v1 --> ssh-ed25519 XzACZQ JO+9ZDfv/rjpGHSL8WBm286V164a2CwppavSZ4+L+Ws -hqfAaluHnH5XHzI/oc71q7HlKioHMAbKP9cg9wRJ6kw ---- maAUQCFkFuMs55Yr6wX+2q+VUM/c3h8rNb6u+VrJnEM -)WFj -},E\G&x@,[r+ ssh-ed25519 XzACZQ EsFwUOjtcoWVd5gJxu0vAfcXxGZovBBKcGuin+TE6kY +51vzn9SvfX8WCDe8f5dtblAhFykUIxLkvsNK6XjMSuQ +--- VTYLeqYga9RKPLxjB6JotAMC4StSGh9PNNnG3+kq6vs +]#A *R1*{TMڍíq2~pGJ#RWrWC ҷ# 3^͗ \ No newline at end of file diff --git a/nix/secrets/wg_private_vps4.age b/nix/secrets/wg_private_vps4.age index b39120f..81426e6 100644 --- a/nix/secrets/wg_private_vps4.age +++ b/nix/secrets/wg_private_vps4.age @@ -1,5 +1,6 @@ age-encryption.org/v1 --> ssh-ed25519 51bcvA CkaPksfSDKWRMaL4FV7vI4VZ2c8Fd2RlyRW8DEkOkgM -NrvBSSPDrwNL+YKgBTHqQuLhKgGy1+/H51JTsA70Dww ---- 6qkEageKcIweJ7wWcqb2HZp9zJNTyLcoQ+Gv/+O6CJA -(,zfD8)]|P+a {n$ Ax"Â]K \ No newline at end of file +-> ssh-ed25519 51bcvA 14yVvUnmbYRhz0jbTEsj5bEZnJleq6ZT3NgOqVybzFk +F0cCQQhghlR3rHDEiBwIWdBXv6Cfac+JL9MArEXOHuY +--- bB7RaiP/rNyTpjpoa2qXmZw7RCa73b2FEy2WN+CTpfk +M):8&=$8.U7~j]QHC$^"˿ +WCZ#uA!dXpx"1c \ No newline at end of file diff --git a/nix/secrets/wg_private_vps5.age b/nix/secrets/wg_private_vps5.age index 3f4dbff..6f2383b 100644 Binary files a/nix/secrets/wg_private_vps5.age and b/nix/secrets/wg_private_vps5.age differ diff --git a/nix/secrets/widetom_bot_token.age b/nix/secrets/widetom_bot_token.age index 366d1b9..1c91ca7 100644 Binary files a/nix/secrets/widetom_bot_token.age and b/nix/secrets/widetom_bot_token.age differ diff --git a/nix/secrets/widetom_config_toml.age b/nix/secrets/widetom_config_toml.age index fea9a10..cf9ff8d 100644 Binary files a/nix/secrets/widetom_config_toml.age and b/nix/secrets/widetom_config_toml.age differ diff --git a/secrets-git-crypt/immich_secrets b/secrets-git-crypt/immich_secrets deleted file mode 100644 index 8ad329d..0000000 Binary files a/secrets-git-crypt/immich_secrets and /dev/null differ diff --git a/secrets-git-crypt/wg_private_minipc b/secrets-git-crypt/wg_private_minipc deleted file mode 100644 index 73a8795..0000000 Binary files a/secrets-git-crypt/wg_private_minipc and /dev/null differ