diff --git a/machines/router/default.nix b/machines/router/default.nix index 25e31d4..ff42011 100644 --- a/machines/router/default.nix +++ b/machines/router/default.nix @@ -22,8 +22,7 @@ # networking.useDHCP = lib.mkForce true; - # TODO - # networking.usePredictableInterfaceNames = true; + networking.usePredictableInterfaceNames = false; powerManagement.cpuFreqGovernor = "ondemand"; diff --git a/machines/router/hardware-configuration.nix b/machines/router/hardware-configuration.nix index 58343b9..ad6ae33 100644 --- a/machines/router/hardware-configuration.nix +++ b/machines/router/hardware-configuration.nix @@ -10,8 +10,6 @@ # Enable serial output boot.kernelParams = [ - "panic=30" - "boot.panic_on_fail" # reboot the machine upon fatal boot issues "console=ttyS0,115200n8" # enable serial console ]; boot.loader.grub.extraConfig = " @@ -23,6 +21,8 @@ # firmware firmware.x86_64.enable = true; nixpkgs.config.allowUnfree = true; + hardware.enableRedistributableFirmware = true; + hardware.enableAllFirmware = true; # boot bios = { @@ -31,20 +31,18 @@ }; # disks - remoteLuksUnlock.enable = true; - boot.initrd.luks.devices."enc-pv".device = "/dev/disk/by-uuid/9b090551-f78e-45ca-8570-196ed6a4af0c"; fileSystems."/" = { - device = "/dev/disk/by-uuid/421c82b9-d67c-4811-8824-8bb57cb10fce"; - fsType = "btrfs"; + device = "/dev/disk/by-uuid/6aa7f79e-bef8-4b0f-b22c-9d1b3e8ac94b"; + fsType = "ext4"; }; fileSystems."/boot" = { - device = "/dev/disk/by-uuid/d97f324f-3a2e-4b84-ae2a-4b3d1209c689"; + device = "/dev/disk/by-uuid/14dfc562-0333-4ddd-b10c-4eeefe1cd05f"; fsType = "ext3"; }; swapDevices = - [{ device = "/dev/disk/by-uuid/45bf58dd-67eb-45e4-9a98-246e23fa7abd"; }]; + [{ device = "/dev/disk/by-uuid/adf37c64-3b54-480c-a9a7-099d61c6eac7"; }]; nixpkgs.hostPlatform = "x86_64-linux"; } diff --git a/machines/router/properties.nix b/machines/router/properties.nix new file mode 100644 index 0000000..2f75b63 --- /dev/null +++ b/machines/router/properties.nix @@ -0,0 +1,17 @@ +{ + hostNames = [ + "router" + "192.168.6.159" + "192.168.3.1" + ]; + + arch = "x86_64-linux"; + + systemRoles = [ + "server" + "wireless" + "router" + ]; + + hostKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKDCMhEvWJxFBNyvpyuljv5Uun8AdXCxBK9HvPBRe5x6"; +} diff --git a/machines/router/properties.nix.disabled b/machines/router/properties.nix.disabled deleted file mode 100644 index d635bc0..0000000 --- a/machines/router/properties.nix.disabled +++ /dev/null @@ -1,21 +0,0 @@ -{ - hostNames = [ - "router" - "192.168.1.228" - ]; - - arch = "x86_64-linux"; - - systemRoles = [ - "server" - "wireless" - "router" - ]; - - hostKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFr2IHmWFlaLaLp5dGoSmFEYKA/eg2SwGXAogaOmLsHL"; - - remoteUnlock = { - hostKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJOw5dTPmtKqiPBH6VKyz5MYBubn8leAh5Eaw7s/O85c"; - onionHost = "jxx2exuihlls2t6ncs7rvrjh2dssubjmjtclwr2ysvxtr4t7jv55xmqd.onion"; - }; -} diff --git a/machines/router/router.nix b/machines/router/router.nix index 4a7eace..72052f4 100644 --- a/machines/router/router.nix +++ b/machines/router/router.nix @@ -31,8 +31,10 @@ in networking.bridges = { br0 = { interfaces = [ - "enp2s0" - "wlp4s0" + "eth2" + # "wlp4s0" + # "wlan1" + "wlan0" "wlan1" ]; }; @@ -64,142 +66,173 @@ in services.dnsmasq = { enable = true; - extraConfig = '' + settings = { # sensible behaviours - domain-needed - bogus-priv - no-resolv + domain-needed = true; + bogus-priv = true; + no-resolv = true; # upstream name servers - server=1.1.1.1 - server=8.8.8.8 + server = [ + "1.1.1.1" + "8.8.8.8" + ]; # local domains - expand-hosts - domain=home - local=/home/ + expand-hosts = true; + domain = "home"; + local = "/home/"; # Interfaces to use DNS on - interface=br0 + interface = "br0"; # subnet IP blocks to use DHCP on - dhcp-range=${cfg.privateSubnet}.10,${cfg.privateSubnet}.254,24h - ''; + dhcp-range = "${cfg.privateSubnet}.10,${cfg.privateSubnet}.254,24h"; + }; }; services.hostapd = { enable = true; radios = { - # 2.4GHz - wlp4s0 = { - band = "2g"; - noScan = true; - channel = 6; + # Simple 2.4GHz AP + wlan0 = { countryCode = "US"; - wifi4 = { - capabilities = [ "LDPC" "GF" "SHORT-GI-20" "SHORT-GI-40" "TX-STBC" "RX-STBC1" "MAX-AMSDU-7935" "HT40+" ]; - }; - wifi5 = { - operatingChannelWidth = "20or40"; - capabilities = [ "MAX-A-MPDU-LEN-EXP0" ]; - }; - wifi6 = { - enable = true; - singleUserBeamformer = true; - singleUserBeamformee = true; - multiUserBeamformer = true; - operatingChannelWidth = "20or40"; - }; - networks = { - wlp4s0 = { - ssid = "CXNK00BF9176"; - authentication.saePasswordsFile = "/run/agenix/hostapd-pw-CXNK00BF9176"; - }; - # wlp4s0-1 = { - # ssid = "- Experimental 5G Tower by AT&T"; - # authentication.saePasswordsFile = "/run/agenix/hostapd-pw-experimental-tower"; - # }; - # wlp4s0-2 = { - # ssid = "FBI Surveillance Van 2"; - # authentication.saePasswordsFile = "/run/agenix/hostapd-pw-experimental-tower"; - # }; - }; - settings = { - he_oper_centr_freq_seg0_idx = 8; - vht_oper_centr_freq_seg0_idx = 8; + networks.wlan0 = { + ssid = "CXNK00BF9176-1"; + authentication.saePasswords = [{ passwordFile = "/run/agenix/hostapd-pw-CXNK00BF9176"; }]; }; }; - # 5GHz + # WiFi 5 (5GHz) with two advertised networks wlan1 = { band = "5g"; - noScan = true; - channel = 128; + channel = 0; countryCode = "US"; - wifi4 = { - capabilities = [ "LDPC" "GF" "SHORT-GI-20" "SHORT-GI-40" "TX-STBC" "RX-STBC1" "MAX-AMSDU-7935" "HT40-" ]; - }; - wifi5 = { - operatingChannelWidth = "160"; - capabilities = [ "RXLDPC" "SHORT-GI-80" "SHORT-GI-160" "TX-STBC-2BY1" "SU-BEAMFORMER" "SU-BEAMFORMEE" "MU-BEAMFORMER" "MU-BEAMFORMEE" "RX-ANTENNA-PATTERN" "TX-ANTENNA-PATTERN" "RX-STBC-1" "SOUNDING-DIMENSION-3" "BF-ANTENNA-3" "VHT160" "MAX-MPDU-11454" "MAX-A-MPDU-LEN-EXP7" ]; - }; - wifi6 = { - enable = true; - singleUserBeamformer = true; - singleUserBeamformee = true; - multiUserBeamformer = true; - operatingChannelWidth = "160"; - }; - networks = { - wlan1 = { - ssid = "CXNK00BF9176"; - authentication.saePasswordsFile = "/run/agenix/hostapd-pw-CXNK00BF9176"; - }; - # wlan1-1 = { - # ssid = "- Experimental 5G Tower by AT&T"; - # authentication.saePasswordsFile = "/run/agenix/hostapd-pw-experimental-tower"; - # }; - # wlan1-2 = { - # ssid = "FBI Surveillance Van 5"; - # authentication.saePasswordsFile = "/run/agenix/hostapd-pw-experimental-tower"; - # }; - }; - settings = { - vht_oper_centr_freq_seg0_idx = 114; - he_oper_centr_freq_seg0_idx = 114; + networks.wlan1 = { + ssid = "CXNK00BF9176-1"; + authentication.saePasswords = [{ passwordFile = "/run/agenix/hostapd-pw-CXNK00BF9176"; }]; }; }; }; }; - age.secrets.hostapd-pw-experimental-tower.file = ../../secrets/hostapd-pw-experimental-tower.age; age.secrets.hostapd-pw-CXNK00BF9176.file = ../../secrets/hostapd-pw-CXNK00BF9176.age; - hardware.firmware = [ - pkgs.mt7916-firmware - ]; + # wlan0 5Ghz 00:0a:52:08:38:32 + # wlp4s0 2.4Ghz 00:0a:52:08:38:33 - nixpkgs.overlays = [ - (self: super: { - mt7916-firmware = pkgs.stdenvNoCC.mkDerivation { - pname = "mt7916-firmware"; - version = "custom-feb-02-23"; - src = ./firmware/mediatek; # from here https://github.com/openwrt/mt76/issues/720#issuecomment-1413537674 - dontBuild = true; - installPhase = '' - for i in \ - mt7916_eeprom.bin \ - mt7916_rom_patch.bin \ - mt7916_wa.bin \ - mt7916_wm.bin; - do - install -D -pm644 $i $out/lib/firmware/mediatek/$i - done - ''; - meta = with lib; { - license = licenses.unfreeRedistributableFirmware; - }; - }; - }) - ]; + # services.hostapd = { + # enable = true; + # radios = { + # # 2.4GHz + # wlp4s0 = { + # band = "2g"; + # noScan = true; + # channel = 6; + # countryCode = "US"; + # wifi4 = { + # capabilities = [ "LDPC" "GF" "SHORT-GI-20" "SHORT-GI-40" "TX-STBC" "RX-STBC1" "MAX-AMSDU-7935" "HT40+" ]; + # }; + # wifi5 = { + # operatingChannelWidth = "20or40"; + # capabilities = [ "MAX-A-MPDU-LEN-EXP0" ]; + # }; + # wifi6 = { + # enable = true; + # singleUserBeamformer = true; + # singleUserBeamformee = true; + # multiUserBeamformer = true; + # operatingChannelWidth = "20or40"; + # }; + # networks = { + # wlp4s0 = { + # ssid = "CXNK00BF9176"; + # authentication.saePasswordsFile = "/run/agenix/hostapd-pw-CXNK00BF9176"; + # }; + # # wlp4s0-1 = { + # # ssid = "- Experimental 5G Tower by AT&T"; + # # authentication.saePasswordsFile = "/run/agenix/hostapd-pw-experimental-tower"; + # # }; + # # wlp4s0-2 = { + # # ssid = "FBI Surveillance Van 2"; + # # authentication.saePasswordsFile = "/run/agenix/hostapd-pw-experimental-tower"; + # # }; + # }; + # settings = { + # he_oper_centr_freq_seg0_idx = 8; + # vht_oper_centr_freq_seg0_idx = 8; + # }; + # }; + + # # 5GHz + # wlan1 = { + # band = "5g"; + # noScan = true; + # channel = 128; + # countryCode = "US"; + # wifi4 = { + # capabilities = [ "LDPC" "GF" "SHORT-GI-20" "SHORT-GI-40" "TX-STBC" "RX-STBC1" "MAX-AMSDU-7935" "HT40-" ]; + # }; + # wifi5 = { + # operatingChannelWidth = "160"; + # capabilities = [ "RXLDPC" "SHORT-GI-80" "SHORT-GI-160" "TX-STBC-2BY1" "SU-BEAMFORMER" "SU-BEAMFORMEE" "MU-BEAMFORMER" "MU-BEAMFORMEE" "RX-ANTENNA-PATTERN" "TX-ANTENNA-PATTERN" "RX-STBC-1" "SOUNDING-DIMENSION-3" "BF-ANTENNA-3" "VHT160" "MAX-MPDU-11454" "MAX-A-MPDU-LEN-EXP7" ]; + # }; + # wifi6 = { + # enable = true; + # singleUserBeamformer = true; + # singleUserBeamformee = true; + # multiUserBeamformer = true; + # operatingChannelWidth = "160"; + # }; + # networks = { + # wlan1 = { + # ssid = "CXNK00BF9176"; + # authentication.saePasswordsFile = "/run/agenix/hostapd-pw-CXNK00BF9176"; + # }; + # # wlan1-1 = { + # # ssid = "- Experimental 5G Tower by AT&T"; + # # authentication.saePasswordsFile = "/run/agenix/hostapd-pw-experimental-tower"; + # # }; + # # wlan1-2 = { + # # ssid = "FBI Surveillance Van 5"; + # # authentication.saePasswordsFile = "/run/agenix/hostapd-pw-experimental-tower"; + # # }; + # }; + # settings = { + # vht_oper_centr_freq_seg0_idx = 114; + # he_oper_centr_freq_seg0_idx = 114; + # }; + # }; + # }; + # }; + # age.secrets.hostapd-pw-experimental-tower.file = ../../secrets/hostapd-pw-experimental-tower.age; + # age.secrets.hostapd-pw-CXNK00BF9176.file = ../../secrets/hostapd-pw-CXNK00BF9176.age; + + # hardware.firmware = [ + # pkgs.mt7916-firmware + # ]; + + # nixpkgs.overlays = [ + # (self: super: { + # mt7916-firmware = pkgs.stdenvNoCC.mkDerivation { + # pname = "mt7916-firmware"; + # version = "custom-feb-02-23"; + # src = ./firmware/mediatek; # from here https://github.com/openwrt/mt76/issues/720#issuecomment-1413537674 + # dontBuild = true; + # installPhase = '' + # for i in \ + # mt7916_eeprom.bin \ + # mt7916_rom_patch.bin \ + # mt7916_wa.bin \ + # mt7916_wm.bin; + # do + # install -D -pm644 $i $out/lib/firmware/mediatek/$i + # done + # ''; + # meta = with lib; { + # license = licenses.unfreeRedistributableFirmware; + # }; + # }; + # }) + # ]; }; } diff --git a/secrets/backblaze-s3-backups.age b/secrets/backblaze-s3-backups.age index 99f7857..2b4541f 100644 Binary files a/secrets/backblaze-s3-backups.age and b/secrets/backblaze-s3-backups.age differ diff --git a/secrets/binary-cache-private-key.age b/secrets/binary-cache-private-key.age index 6187ee5..48d97ea 100644 Binary files a/secrets/binary-cache-private-key.age and b/secrets/binary-cache-private-key.age differ diff --git a/secrets/binary-cache-push-sshkey.age b/secrets/binary-cache-push-sshkey.age index 8d1eb43..00e6789 100644 Binary files a/secrets/binary-cache-push-sshkey.age and b/secrets/binary-cache-push-sshkey.age differ diff --git a/secrets/cris-hashed-email-pw.age b/secrets/cris-hashed-email-pw.age index 056857c..3b72d4a 100644 --- a/secrets/cris-hashed-email-pw.age +++ b/secrets/cris-hashed-email-pw.age @@ -1,9 +1,9 @@ age-encryption.org/v1 --> ssh-ed25519 6AT2/g lQvZqYp05ofMG2kPUYVMOkJssssOmg9lLiTDxscDFHA -JWRyQo5MqQjz5b+uNLhLYgqOqWpQZdG9dU9ptfhWYaU --> ssh-ed25519 w3nu8g kqS10jUVfZqs/x3R3dm0IFGfouGUJUakLjwn0TogbgU -RbUZQudujtzn7ci1HRchuUoXSyBb/KbKta/QvIbIeso --> ssh-ed25519 evqvfg U29OBOuOrgX8/Uhok1AQ8p8inLf+bBWHJhvDWCHkZko -oBwfJlFRQqUHYlyVRxqqdMkxKe2uTP7Z2ZCwk+Bk9yU ---- XMwxBGyVUG3OX1m8OnC1Eavnj+HCywi2VFGC6Vnp/k0 -d~O7rΘVVʉn4bKdyp<,p "0CdBM2k jأD~%)45 \ No newline at end of file +-> ssh-ed25519 6AT2/g /5WB1i5RrjWIbnBErUWliedwnv8qTIsl8r8zbWNkOmA +wr8fN2FbNnCRUNgV3aZPQibXHy1MNjMP9SMK7urHL+o +-> ssh-ed25519 w3nu8g exWaIxM68nwycLphws0PRnRvvdOuT7h3xOZqndsAHxo +EIUTjS57F5MKGt6bJjaFxHnbTFzUrpmrTVqNZoQ060Y +-> ssh-ed25519 evqvfg SAQyzljqtBd65bpZo6yMsIAS1d5ymjKBoODjOQMUdTs +/roobEvljSoREVHygqLNKTJHWG6rDdhXmlc4BM/7Em8 +--- Gp+OLOIN5aqR3G1fSM+Epdw4B6RTXrB99Ty/YUWI0S8 +ʞo;3eɁu T d ssh-ed25519 WBT1Hw +mmh+AeldhS/z282wz0d6rfklNpQLFE4M+hAL20XH3c -zyyxtRp6P6ZFdn+1NqVonEfYPtozAgDEZQWnCUbahak --> ssh-ed25519 6AT2/g TZYBBcBMnmUegRKEx4tBvbFroHV+AM+KKuE0lNOD928 -w0d0EBpnrF9rk2SH5ROLyqqgmb2y0KD0sDiSa+gt5Vw --> ssh-ed25519 hPp1nw bQSu9KjCmPIwjHrw3GXI8F807y1kCi9CvCKE/Q4+fBA -BbYsl7XxNsDET3ldgQWtJCEI6euMZ/BtghEBxlOo+kg --> ssh-ed25519 w3nu8g +MWibl8Un6Ga7bNAaFqZ83H4ERtBfkAeFI4q6BtpUHo -mB4oxmiYNgrUBwNrG5slhQtT6yttSWiaq0M0DYGrK8A --> ssh-ed25519 evqvfg gcBt9ZQ2Um08Q1b1k1UQhj0oUpLbKLuFycs4cfAe/G0 -YMK/4+LfAYuj6TwT+NOdLQNHfuj9rnhFaNUu+tkMX9M ---- 9dISdhi6vbWXis37GEw2vb/ZaBFR3srYKlyc0N1cEP0 -h~4ZK1ytud,z(W6] Z?S0Q;*vw~GP -B@,\1g.^ 3)Zf$xS&4ƏmEj[OK:ZL \ No newline at end of file +-> ssh-ed25519 WBT1Hw ZMrG+yubAhxfDf/hh8gSfxZuvM5hsOBQu/V/KfdcNyk +un2XWeWmt9pYLAk4n54A52T96sgvasNgD65AiYL9YO0 +-> ssh-ed25519 6AT2/g KxgJ1UJ1amcXzpcFmFFi3C3umo70iwmL5GxDaqfk1j8 +VZkDd3vgf1xX9kdzrDhmv2w/Ubq6UUJyw7UAkqmWlOU +-> ssh-ed25519 r848+g MXTm1V8lHIb4oHg0glttyooeECLn0uVrHaY5NzAE718 +Qv+vEeuFz+sew5GmR17ALXKmpfByjwi2j93dMVAU5WY +-> ssh-ed25519 hPp1nw 7dxkddbQHdVi+7dpxBHXYi8pNgMsRjfj8KLqgJFYqQc +984ysvTIvdjJirkUIfNMEUVKkzUTCBDAOgLbKZj5AhU +-> ssh-ed25519 w3nu8g fC2KGM9/I2Sl0VHkYZy7YbvmF5CMWRIUahgGaGiZPVM ++IGvvjHj14bV9PS2r0L3pFNV+eDCE63ZmNdHfCG0yCw +-> ssh-ed25519 evqvfg fAr1POoqc5y1stRkCJfgCHSW8QXIPEiFZT0STSP931s +wFWWX6tPV0mV5HC3be7a2xr4Pax35rT16S0h7eiF990 +--- N5A6/IK5wKwzUT20Hxu/37ovLEkLGGj7Y30p1hu5fNM +r&BHA%ǺhRղ~!ĝ{b[U?k(D +B7[b/[Yy[yOCjT-9:x(;Xy\NhLPymGf4aT< a@ \ No newline at end of file diff --git a/secrets/frigate-credentials.age b/secrets/frigate-credentials.age index b4eb091..998bc67 100644 --- a/secrets/frigate-credentials.age +++ b/secrets/frigate-credentials.age @@ -1,10 +1,9 @@ age-encryption.org/v1 --> ssh-ed25519 hPp1nw z8hVbU48K+xyH8zxVXjy7sE35GcdSTeGIu/ywdtRBkQ -ynwH7Jug9yK4iCLYIwUn5paYQISWDVYTkq+7rklAW8Y --> ssh-ed25519 w3nu8g hP/IbrLUi/tvOOu5pRKWGIfbiGnQofR/s7V9kUcMUzs -kZLewvTi5JQ5enF5Bl7wiGUJ2W3THTQVXkyXhLM/Xqg --> ssh-ed25519 evqvfg s+mq+Pr3fCKSm6dG+p7tF1piR6KZztgH/j0+0S9W7i4 -T9KzT/+WK/XOeuWIyf2/eNQz/ytmOYzAjzzZmlY2Ppg ---- A4sCAKn9DQwaSQIdyRYe9XwKvMosCLmdP7RQId7l6vA -BQ{Ui&V,93l`<ʋ(-=iv -& 7#&͇߿eeKi[eޮlD?U-Np,cן- !LMxh釺 \ No newline at end of file +-> ssh-ed25519 hPp1nw p8uus03Jrn9HtEelmufFx2orYkSlyAq90L7bTm3n/GQ +Ki+Pf1RG27H2wmgxXz2u7fqlU2hrxTmBZCn8RMIh8wI +-> ssh-ed25519 w3nu8g UQQYC93hQLRIgaA5P3Upax2HzfNddWkjTkAyZF5/hFs +33fVUBBaJFRhDIuZoM8Rn1fd0JwqjmyXsbu4pioxXw4 +-> ssh-ed25519 evqvfg /J1fpbZORlnYADjqAcF8kV81e+mlxXC4mhMwozG7YXw +KYAtHd1MyNiEKoN/RgBCOsn/uCvXIjusXPFWW4urMFY +--- KVdBWZjlOA44GAK3GubvPaXlbg1zdpxL7+rJ4hv4Lmo +X/{[P+$_Z,t\#e f>,0i;VBQ8,'JRו=LL@bp?HM2up'g:W;YXsN Omy~ \ No newline at end of file diff --git a/secrets/gitea-actions-runner-token.age b/secrets/gitea-actions-runner-token.age index 88b6809..49d2462 100644 --- a/secrets/gitea-actions-runner-token.age +++ b/secrets/gitea-actions-runner-token.age @@ -1,9 +1,9 @@ age-encryption.org/v1 --> ssh-ed25519 hPp1nw bo+iestejjHIx0accmbyOgLJPRH5xMugtfwKgax+DCU -smaxrCeUgUu9a5mnFlDBbTbw7gNFcLi6mVb3px8gYk0 --> ssh-ed25519 w3nu8g bhpGV/Yfqfl7mrBgjCgVZEJIsRjXVOmQ2rU7dh+FQzw -2irMVi9Vx3/PZT4fqYfcnU7q7wRCtUFOUPZ/X6fQuXw --> ssh-ed25519 evqvfg aic8EzOuwt6ojUoHaAlhy0IWmSzuOvXjBQrK/QSS2Vs -tfw0GyfsovxlMeySyQULMECEoiEjPtdkoQ4OP/t9K9s ---- uNvusvjFFt4Fza4a/hmns/tWm9LTE4fULWJ/1Gg3Izc -Ax;[o'L@^~9\jvCUϳ$hq ɝ2Ht?y\vȌ`K!7Y7 \ No newline at end of file +-> ssh-ed25519 hPp1nw 5wFHyqBRdZxUDa180U3RgrL4DWNF3BO60C1ytWdZvXM +anPvoQk7kvz/wBddKYquSZ7b6dslhIrhV8wnMpC725E +-> ssh-ed25519 w3nu8g McO3H/GkcqQavMokZhXAsRijGq0wiXzmN1GH29n12wg +ooFxa+vYd49JSwdj9Knc8iDFyxX4elDb3IjOjrC5Cmo +-> ssh-ed25519 evqvfg pW/T4WXURnk7G+HL+O3STBWkQ+5by7EgwOPTcMNakyw +HByJjWNhOg7PSms4Px9NO0FnFcMj1Ig2rOXhCNQri7Y +--- LCgnSaNDEKv8du0OxZoLtyF4W02E/6pC/e1h0+XDDGA +Vib[큐%{tL8P[2z{g/KGAZ嚜0pSg PY$ \ No newline at end of file diff --git a/secrets/hashed-email-pw.age b/secrets/hashed-email-pw.age index 6eb8f6b..5cde73d 100644 --- a/secrets/hashed-email-pw.age +++ b/secrets/hashed-email-pw.age @@ -1,9 +1,9 @@ age-encryption.org/v1 --> ssh-ed25519 6AT2/g kXgY0gJW/LpFYNukKCxa/Dhht4hxmoht+CIENXngW3U -OFTjvs35H2HLGENEChI9fEowlvp6W7hTWFNRZ1PziW0 --> ssh-ed25519 w3nu8g jWZ0COxc+hFs7bVNTKcWa7oBmLqPmlqktpZ0gpwIUEo -xf4aKirzqHUWppJghPwyCj6SzPntH5gxcP3ch659RIU --> ssh-ed25519 evqvfg KR2lx8vs0Eseh37tLtcfDDXE2BoyxCr91vqlnpJraA4 -5HiO7QB7sAC0YlDgkq4gOH0Pp83et9+0UPS8+BA+juk ---- vt6f6yWyfunZS7pihgt97hFccp0hqlkOeLWdfsq5SAo -Z+m8v[g_Ks81h1=@. 2=2?8\f3oy ga8(.?8mt,] \ No newline at end of file +-> ssh-ed25519 6AT2/g kH4DufpuybglKzupJsGvWKfWsZ5xhRwefdPKkx/AuW4 +QrDu/vSbgEIgYSnraG5u37RNp6Mp6ARjqzAduy9iX/Y +-> ssh-ed25519 w3nu8g mBt4VQNJAMwcseVhc8k/mB5XThbQT48OnstkWaGQ8zQ +6w7lMJA8giG9PVux1ncjCPrN7ER0S7uWi8UjhOOeMS8 +-> ssh-ed25519 evqvfg uM4SAf1aMCvtRKdPn5BFr1EWlBGVgbgjp6OkuMV7GnU +Zi5X5TL7phRpwsbUVsFgS0qHvqtLdckz01qDfVypn/s +--- I92hNxGkHSHR/fQhUI5UAXvzIvMd+YBih9nFP5IZW3w +_N/ nHaehB[Դq\+M:FgPnhN/2l83q> rHtUJGn \ No newline at end of file diff --git a/secrets/hashed-robots-email-pw.age b/secrets/hashed-robots-email-pw.age index a505174..8606080 100644 Binary files a/secrets/hashed-robots-email-pw.age and b/secrets/hashed-robots-email-pw.age differ diff --git a/secrets/hostapd-pw-CXNK00BF9176.age b/secrets/hostapd-pw-CXNK00BF9176.age index b492370..37f1384 100644 Binary files a/secrets/hostapd-pw-CXNK00BF9176.age and b/secrets/hostapd-pw-CXNK00BF9176.age differ diff --git a/secrets/hostapd-pw-experimental-tower.age b/secrets/hostapd-pw-experimental-tower.age index 9a36b2f..e70f77b 100644 Binary files a/secrets/hostapd-pw-experimental-tower.age and b/secrets/hostapd-pw-experimental-tower.age differ diff --git a/secrets/iodine.age b/secrets/iodine.age index 48efa62..8e5675b 100644 Binary files a/secrets/iodine.age and b/secrets/iodine.age differ diff --git a/secrets/librechat-env-file.age b/secrets/librechat-env-file.age index 16bd61b..e4b237a 100644 Binary files a/secrets/librechat-env-file.age and b/secrets/librechat-env-file.age differ diff --git a/secrets/nextcloud-pw.age b/secrets/nextcloud-pw.age index 4aa1360..1940950 100644 Binary files a/secrets/nextcloud-pw.age and b/secrets/nextcloud-pw.age differ diff --git a/secrets/oauth2-proxy-env.age b/secrets/oauth2-proxy-env.age index c898bf6..f1d3831 100644 Binary files a/secrets/oauth2-proxy-env.age and b/secrets/oauth2-proxy-env.age differ diff --git a/secrets/pia-login.age b/secrets/pia-login.age index da6b691..3baa8bf 100644 --- a/secrets/pia-login.age +++ b/secrets/pia-login.age @@ -1,12 +1,12 @@ age-encryption.org/v1 --> ssh-ed25519 6AT2/g nn9O3nzI2M9+vKJ3qoKL3xs29iYp2n01xTrmtdbzs1k -atqBqI77ADuCnV04skh/2KCco5Pgwlz0vSnruiI0dzU --> ssh-ed25519 hPp1nw tBTDeKMPoCpuoQNdnHdggQdpeYYRXhtJZqCA+o5CPkg -q5BYRcZYY8oGot4F5fhx6hZfVpClvOTycQ6kMTXykqk --> ssh-ed25519 w3nu8g C80+Mp8qRkpSfJBCH3XduSv/oT2bJ6TqVxkyh1NfRFo -9EEh97C2uFzP3a8DB+4YEgjqJyoa97rRT9tXEFGbMFE --> ssh-ed25519 evqvfg qByh1A/4ylqHIuvvMqHl0lGBxwWIlwz+pGDdox6zJXE -Ubym3YKOcekSR+O6dLD+322Kgk3152WDW+Tsu32MYY8 ---- 4QA63y/d1AXP95G6MHZLJlVyB8LSPVO886QcT2j2tVo -~H;eg77+e|!k0eh?k^mkDP}\ˣ+ 5[ -7 \ No newline at end of file +-> ssh-ed25519 6AT2/g rk3jNJlQwab++isNOPpQJZlb4rL7nIAYfoAhlvY9QTc +J+6/MRepeixmDQzz3bRd/AMJpZls60dUBjrHh+p759Y +-> ssh-ed25519 hPp1nw GnjIH+V6mLcXvfNhiBBwqBvY6NO8W+1sPcgvu6fS0nI +qP6jDxd+0h/AZhsBs7om0BDutrPmP/1NUEuZ7LBlxmw +-> ssh-ed25519 w3nu8g QwztUaCCtEVeI9AbJn5dKH07Y2fal+Nn9/bsnBkTJgI +/Ce0a9bGv6RmQiK8C3wIvMCh5DM+m/EujYFsXgNjieY +-> ssh-ed25519 evqvfg VLoQNzz62Q1KawvTHWeyBfCGTlGYNPQcdTaPq7cLxDo +eabkTR9iUPYqCj50R7rwYcrMqcs+RHWqRZai2KKzPMQ +--- fQkT/xI/iptJd/UmihEcUWx77d2wr6bOj5lecPa/P8o +,VlzOP'24o|Km FYL&>\@emVnm6nuO@wR^_ +ztF~ \ No newline at end of file diff --git a/secrets/radarr-api-key.age b/secrets/radarr-api-key.age index 1f4cb7c..d95b134 100644 --- a/secrets/radarr-api-key.age +++ b/secrets/radarr-api-key.age @@ -1,9 +1,9 @@ age-encryption.org/v1 --> ssh-ed25519 hPp1nw Uhd03cBQ85Yw4FjsXkBDfrcAsTBVVOFVFrnU7sPbTXY -/5XIXty9cNwNPV/MXdjoOttmKMXt6PB0/7OMSl7scZ0 --> ssh-ed25519 w3nu8g CzC59hO2YLD+Bbzvi62KXvFlyPXrx/OD8hVeQH3hfFU -V7OtV9QjRYNg2+kMk1K4V9RWb8AsgkQ4OlIRs7hwYyo --> ssh-ed25519 evqvfg XTSo+9xdmL57Mkc7NNw3Xy1kJrE0Sc+81h+OEHfiCVc -PguEYlZkPMMiMaEpK+gamgl7V9/gaEUpUuV8O8tIUVs ---- 81iRaeiLWHHzFBoWSa6JFdp9mkKZ1TT9mdRXZaQ4N0M -J :ŊR9RrTP Ni%ۺ/L{1^OW:ҏo4 \ No newline at end of file +-> ssh-ed25519 hPp1nw MRItBkM6GC+jht3ly0K04wCptE28UI9FmFAm2+8KHHw +Pbz+oZcWtzSz4eyWyRbi/a89Q3PripNJ+PYM/wiLKq0 +-> ssh-ed25519 w3nu8g a5G6FrbGmglm2Ba2T6NPsaVP+/4g//jh9ui/BVzR0EU +f0xNuCbhC0FqqFH6CD9jPAgWmTEZqga/fRjU6VMdfSk +-> ssh-ed25519 evqvfg 1lhGzpY7I0fKimq6sQ/zWUHCFSEaN31rmGCckUepfHY +3OfNrzAajS6azIT90CmVnBzXLXcwMw/BRhOfbcuuz3c +--- vagzuZWeWUcZTBISnL4vNVcpMX2CbJGHwfaAFiIZeHM +en!_% \ No newline at end of file diff --git a/secrets/restic-password.age b/secrets/restic-password.age index ff48d34..c208eae 100644 Binary files a/secrets/restic-password.age and b/secrets/restic-password.age differ diff --git a/secrets/robots-email-pw.age b/secrets/robots-email-pw.age index 25ff702..362c882 100644 --- a/secrets/robots-email-pw.age +++ b/secrets/robots-email-pw.age @@ -1,11 +1,9 @@ age-encryption.org/v1 --> ssh-ed25519 6AT2/g HGqc2dbbCJNR5JR8mNfM8VRSBAWGzvBR0IdQVTM3jys -speCXu0Q79q8DXVpxYKacTh3zq0/6KXdWc1yvMJCrwA --> ssh-ed25519 w3nu8g /ArJSkSyJ0+/GGUln+PULXLu2v9IFatasIZ4d97ClnQ -tsoXfqg2mC+3YVPHVvkrqXCN6CEpOGDBrS8vzBLkrXA --> ssh-ed25519 evqvfg qJ+4dEvSS8E9tI3q0iXJAnqEZqEE6s2Hn4BAgkjWaEg -1s0rlm960TEiIefYqdqwMgff1A2WTavuq0e3GNrxFi0 ---- KbFFpe+ZN1XxXV6biHn9Vm1jw1ZaN0/wAW9/GmrQdJ8 -i -2wx$ɩ;8su\GѣS'.*&Q^&$B/V8?Ѩִ x -;*)HC \ No newline at end of file +-> ssh-ed25519 6AT2/g LnQtCha5IIh5zokvLXRVBrL/Szq4Xpl/069ErdPhz1w +E2M0aK4aRgiTpqSYB3Bzpy7ZqayES5LomFDf+faxVXc +-> ssh-ed25519 w3nu8g HHwFH0wJFiDre/GNjcYQd28bfo1lZ1FIsEllnVhsL2M +PX1y17/8uuExa7KEQYtprfTNSDPczr/SE940xaZARB0 +-> ssh-ed25519 evqvfg SArOP2lww7Tlh/r4bD4mKTJcdpGyoaUn6VI3geYZvDo +Wz9Hi8j3fMSYcM5ek3nQg9ErHHP2lMgdk5Ub3n5Aw0A +--- igI6cN3XWmK1V3Zy0V9wgC6vsOvBsjrKu2B4gVbEIRY +A5byN^1_`B]OCklMxᲗ7[1$e%d#dً lmJ!9y \ No newline at end of file diff --git a/secrets/sasl_relay_passwd.age b/secrets/sasl_relay_passwd.age index 5e43404..6f6b0ee 100644 Binary files a/secrets/sasl_relay_passwd.age and b/secrets/sasl_relay_passwd.age differ diff --git a/secrets/searx.age b/secrets/searx.age index 2288291..a109014 100644 Binary files a/secrets/searx.age and b/secrets/searx.age differ diff --git a/secrets/smb-secrets.age b/secrets/smb-secrets.age index af36824..23b7595 100644 --- a/secrets/smb-secrets.age +++ b/secrets/smb-secrets.age @@ -1,17 +1,17 @@ age-encryption.org/v1 --> ssh-ed25519 N7drjg EazSO4KSpDf7Xi3pTNdhm800ZA5EIIhMbwYp+L42yD0 -FDktPGF+bWrlPuwD8QNId3tUxt3kPO5JZ9GQ1B4vtPQ --> ssh-ed25519 jQaHAA 2UJ/6JUgZBaiVVj6Y43dIvebrozJW4kuR5xfWIWSVSA -nhZ/CMdHMIN/GjFV/WMmNvRkPYcmgtjihFtNwASS/4E --> ssh-ed25519 w3nu8g fLbN1n9ncJz5xW4BnmOfOMI5tdODrZGwhOczWz81NDc -MP1Z2q1KMmvh76opIwG9ZepFiLRJBnfnGKAGSLvb38k --> ssh-ed25519 evqvfg ZgT1jg/k43AdfVIny9i3PxD0FRG3CWHEKJwL/r/VX28 -Qme90RlNTtlDZcCbbxmJQ1BHphkYC1fLA7MKWTn+jEA --> ssh-ed25519 jQaHAA C5hiPm6jr4TZa+Hl+ruODqSvl9PAx7bvhAMPiNjCe00 -2trojxFes701L8D1XvWPQBCWJB6rwgppPcGK3jDhCBY --> ssh-ed25519 w3nu8g IuWEPi/Tacoc2Oyey92eJQun4r0RGjY6GAd8oHTQ4Xk -u6iVh1p2x/ACIHQO9mcVuR3Xmq2ln/F97vlYjWphvMQ --> ssh-ed25519 evqvfg q1Xp4IxCTofR+RDdi1Hoy+8NOO45u1U9/m/t6eBDUhs -WkQKg8LGQoIPuICvj7KcvgF4RMyG15txHG4uFg3v7X0 ---- 4WXmmAwvor5BDjArHN3T37/zxKOO3c8jtMaxGigAcMA -ж[j U.w@BHr7Se/x1;SU(8{=N;_]VY2D";C7-.Vr >*2 T \ No newline at end of file +-> ssh-ed25519 N7drjg lVrCcpRGeAJ+62CF+fTT+iGKmaaiBk2rmtzS3jz4ux4 +BbMLKa0uCoopsV0BekIcApzyJggQf4uFICuC26inA/c +-> ssh-ed25519 jQaHAA k7JCJlbAKDuH+bLhaoiQQssN5gfwPw9w30J3OAA4nWg +fQ6te5iDG54mn5oXdarxMYPeze4ZWbk1yPAsLsTFby4 +-> ssh-ed25519 w3nu8g r3wLOavRLT++n+NaBRtcQqKXFTFhRYGl8naqUWNR0kE +pYkqQIiwzpN/XkDBrfCuFPc3yzyFjRbdCcFmRaY8iIU +-> ssh-ed25519 evqvfg b+BUWYHdu1z38I0BMqpkSf5qaeaCm2C+vf9Hcqgjlg4 +PK0y5MadYrM9ANyTMdHKXRTNi5cwD8/+19mN+vaTNiM +-> ssh-ed25519 jQaHAA 86i8je5q4vVBfdi/Ws8/n4R/Z25uLw1e6zXDza8SwiI +5yuvdl0InHxrjRyi4SJOWEo6pWZt/mX8BsaFer3NwlE +-> ssh-ed25519 w3nu8g N2QWi7I8V//jfK2ZGsXwBkEt2Zh7/5zpWCKUNV30bFA +ZmjY/lwFaVeM88FZSGwG+BYHi+32UPffZPZPbVcw+J8 +-> ssh-ed25519 evqvfg cZflDyFn9H85TnSbi2HFrdVvlT5uZ+6+l4stOaoyOxE +3HpWWCbWoU1ufbi02xpXnU47Ti6YjrpMVh/mS5jgO0M +--- wF990HQn1zh8JVo2alfC/QhpFimLsLDtj26DREVYr18 +QhE{+帻R(+ NYI ssh-ed25519 hPp1nw F3GP7ySGf2wVUdTr1K6iChf0DczmaMnJjDWNl4sIVws -NgfyXX4F14kyrgzuMfExb3D4pY31tzFjGkq2UmC3JMM --> ssh-ed25519 w3nu8g tnpGVKL1bYFJOhbbOa+TyEOhaXTVUk9D7HtSUWoM+WA -cM8Jm2uKXkt31UFFdSWq3pClQhJZXUksEBMq1/xu7GE --> ssh-ed25519 evqvfg A3Ght96pdzoWpNpX/jmoBOz+uQUaoF3C2yw+VCOe22c -btao6WVQSwHv07hnkbpv44Pc7r3Essyoz3Spst+pDMQ ---- J1ZZ/XeiLUpkfOl6xOckks4FxqdzPZJyglYhZf4Sa48 -5 #Im\E"H,s{l'!ˉz?Z@-X>PG -)+S \ No newline at end of file +-> ssh-ed25519 hPp1nw aoj3IvYutQWfkOYOcDu0g7/FX05Y1t5NE2dP/x50gw8 +KV2kpClMmBPavyyhtC2coc3Gw9/QJQwXxfM13aKRrvQ +-> ssh-ed25519 w3nu8g ZjQIXYV3oK5ppG9ltfojwZ0Z93wFvXdiVBnFz5ncSSQ +CI3je4tMSb9ws+IyAgBVokFdy7z23n2EwtDrvLTziM8 +-> ssh-ed25519 evqvfg bWwaEp5s9nvzzQXbPd3rwmy4Ei9PWZg3Gk2I1nYBcCM +PwLLVWVI0GY4snYRadT92NZFneuA54yzL+Ie4RWDxDk +--- aqM1/sssbDgs4DNsGHqiaVH1LCyhh0vtoHSD3ju67Ew +&g~*YEoE,yE{*d_A=6 =M'ͧr0f \ No newline at end of file diff --git a/secrets/whiteboard-server-jwt-secret.age b/secrets/whiteboard-server-jwt-secret.age index 996dfe2..f21f4ae 100644 Binary files a/secrets/whiteboard-server-jwt-secret.age and b/secrets/whiteboard-server-jwt-secret.age differ diff --git a/secrets/wolframalpha.age b/secrets/wolframalpha.age index 4fe4f75..d6f701d 100644 Binary files a/secrets/wolframalpha.age and b/secrets/wolframalpha.age differ diff --git a/secrets/zigbee2mqtt.yaml.age b/secrets/zigbee2mqtt.yaml.age index 007b544..c2fd409 100644 --- a/secrets/zigbee2mqtt.yaml.age +++ b/secrets/zigbee2mqtt.yaml.age @@ -1,9 +1,9 @@ age-encryption.org/v1 --> ssh-ed25519 hPp1nw WkcqGYW9EwuqwdPa22bZ2yyxxSUlfZ1Y+NggCyFR/Qc -Nccy64qgRnPj+6pDRPEvHCo4TRszDL5x8NUoljvAeZ0 --> ssh-ed25519 w3nu8g gr+GjbS4lanuXX6QRpzMl/3cuLInJ+djyoSnN/tH5xM -md07riIXJ2eH43nL8SJFU+dThXu3kUePO/ZaV9iuS4k --> ssh-ed25519 evqvfg rP45WmM5H7O8dFoOQHPeVDY0JqiIDYgJsPyQjh4jC1w -R7VH7PhaSCRW5bUAgC0Rlic6FV0IAiqKWFA8ah4/3Q0 ---- tyRX1o1ewWqSvvaHYQjzare0j6oW6VT1tdnqTN4Or34 -"TZS㵈ձ7Wv[i Cܻ<@yulǽRs򐍃퓴y`{_ \ No newline at end of file +-> ssh-ed25519 hPp1nw FnUaydWe7+2dVUIYrKqx2/0AzRPN3ZylczJBkTqeeXg +boSEnMZmQyre4mJBQkEPuXuRP90woU1obqMdh+uQKhM +-> ssh-ed25519 w3nu8g pIDzDUVLZuZUCn6tGKpCLVS7OmhQiMgtMvuCKfWcgiM +zZxCUe0LslQ0ZqHV6sSMNQ5fhyscDFxVmJk0h2voEfc +-> ssh-ed25519 evqvfg eukXn1jUoHwP/cVmYCJ1O0kYQw+Xsad1PswvbcFUMEk +B0AvuWyfqK8ZFgCAW/iuXB0sKoKmB9d62ZNRTdDG43w +--- 0aziJ5/DCB9kJUqWhIggCqRnsuqu9s/g4Rt4vbwsBJk +FVi`1XFII@omfQ=彈臼i?b? P6A-Y[G9 \ No newline at end of file