From 229db966d7bed645ce96b12f52c97552e45f1007 Mon Sep 17 00:00:00 2001
From: Tim Keller <tjk@tjkeller.xyz>
Date: Mon, 5 Oct 2026 16:35:11 -0400
Subject: enable nas on T430 and rename wg tunnels + add new tun

---
 hosts/T430/configuration.nix         |  4 ++++
 hosts/T430/resources/secrets/wg.yaml | 10 +++++-----
 hosts/T430/wg.nix                    | 12 ++++++------
 3 files changed, 15 insertions(+), 11 deletions(-)

(limited to 'hosts')

diff --git a/hosts/T430/configuration.nix b/hosts/T430/configuration.nix
index 161745c..cc530d6 100644
--- a/hosts/T430/configuration.nix
+++ b/hosts/T430/configuration.nix
@@ -39,6 +39,10 @@
 		enable = true;
 		autologin.enable = true;
 		wifi.enable = true;
+		nas = {
+			enable = true;
+			home.enable = true;
+		};
 	};
 
 	# Configure home
diff --git a/hosts/T430/resources/secrets/wg.yaml b/hosts/T430/resources/secrets/wg.yaml
index b7af96e..3e29c4c 100644
--- a/hosts/T430/resources/secrets/wg.yaml
+++ b/hosts/T430/resources/secrets/wg.yaml
@@ -1,6 +1,6 @@
-wg0: ENC[AES256_GCM,data:ZWvG10UxVMb7e8wxTgQqybp2NsziJdTRDqF/ZJ1N3bf220P3l59jQcHyHi7l9UFbUhErM/zxXc0/B7AE1TPzcFGZRxqQC3TenCCW8RuKkm9bXcctseXtLqRr/EYRH07952dTzvdN/eBxLXLPqgi/K1qnuWBLS2zf/WKAJyCFsKPlzhH6lA7+VAM16Q9m+0nktruQ34DMok1LBlN7DN/gZkJWx6Ipzst4f9lrDiSm1QNmxskGUqDdPWednIJ8d8iW2j5xFBgzE0iUyZu0VwuOqP2ioUTYLiLGbx2/XrRXyz66u5gx1agBtpeAirWmNcmJlDl8olik64tXQoemHUHXQokpsuR1ENnm2DFqB1lVbXA3Q00cyzYX08cii7olGHKbVaty2n4RMAFwTBh2fRYs4LsH+cyn4umhLkOhUEbFInujrA5vVltQv9h/r4Y22osBgVNuSQ4I5hl4d348yc45yCENnW6iSs8Diu141l+IbxvQPIpbR462ctYtM+TRJW4AFbgPUdHrRD7DrURnyP9ZePSIU/1pPFZNeNJjYwDETXaz,iv:WLgAIxHhKLgw8TGfuXTlh7rkcjIawYjb3J6mo3sRSmE=,tag:b7tZzypGa8EmUinCJcDkoQ==,type:str]
-wg1: ENC[AES256_GCM,data:MCojgM00HJuTgY+K6KBUnDqH4Y8Jerc37vnYO4SC/srlNXxp5QKAuyTDwb7bjmGboyOHq//GLbRMDN5vZEeUQNGyjsycElmSl76bcLS2XPdGrbxGZD7HQY9PY+Z0V1avwVovRrITfG2irffnVxqfis8R5GBOovy/MRhyjG8B6vhastYoGp1ncAmAV+QsUGn/MTeKr+MpZ1Q+SGyeu8gAvPknOEzrR8WqK0ySbWKCQjeEe38kLNwhSNI1cp4Md02dskNUWnVKRyvfXOuYoPsGAmhVikZ+C4yFlndEJoQ5IJPbTO0mv2394bKtflCyB2hnerrTd+NaZcRgPP72Lvw3gDmx7olweL7f2uzr5Vs4NO1AIWcw/MkJxW2UU4GzHbJZM7H3b/IUY1+y8UDEk4rtBT9t+M5LapuVbpagwulIP7+O7Bjsgb4ZJxaGDjtUe3JcUgMDRAexDa7lioDZMpWT5UPRvUczfncqXs+b40vo02eZqiAxtWVK/8587uo=,iv:lsCA/USQc6ADWdRVYIQHXQtdtukEf7cXNTXIKzlynDU=,tag:xlW4MCIwMC8A8f2maHhPQg==,type:str]
-wg2: ENC[AES256_GCM,data:mFHUtIJl3i8I2pzVC3qd/hMiD8u2Cc9uvu8DcHS7SSMM2bBfUJA0jpbIuuII+KrBS+7rOsrFHIj6sk+E825CkJxskXPrAYUdsebQiOvmYDEox/A2SNPS/pAHDiEil0f3TxHZoiw8KRz7zu9HVX7hkhSxrzlmg78wO7AcsJwk2LwKSBfVEZK/P8d1YRxDjIbkbFqJp9sTrSWvhASH9ecS31bxgdTPjj3EadWtVgpoE0MzRcic15Bc3vIZ+wOajUjKIFx+pcZMJjPyid9uUxCluh+5WBJPtNUypVjs34JNYwG2c6AMG/qiGttiuk9h9xABtL068+to2+Gjqk2n/LG1YNRsnlrVgM1CowUfFksNbxOepaUpISt9UsUe4NXIeT6UMh2MsqGae7+gSrQGtE3FHuS3gIHFd3btUB6xA/EmNYoioVRxwrfL3BL+Y1nxBVVZ,iv:qSkkL9vkH3HWpRswtCABw74AN5Zss3KzY69VoTq5Vqs=,tag:KaA5RWBGZAjZjzYZXUppKA==,type:str]
+wg-office: ENC[AES256_GCM,data:Ft2P1nSMqs+0obsZdulyIV5oCxid019t++A0bAHTkcpysmwCuECHODZL2EHgpbmvomMKQyzKPPdrSgGS9H+Dar/+Qko70zPSs8uQit2j6yhceSwNtb2ivD2hFCTtQr9pvSr8HgpxKtmw22tGpfXXHTmu+xBlHFizvTMEAqKdz+bvspLk/ANbcbmLVYXrb5NwksF0vaZSOkzKnpeyDyhvb8Z5GGmvWTPzP3ILK7RzpPb11/9vgyBjyyMkQfT0QpwkE7OlaH4ffX/Qg1d0T4tWOA4Fsi3h853FZ1Rukh5f3YPSsEqgLNJpClDrprYM3m2d3dDUYen4F3+58MvF8K1CWLigs9RwxqH2F5ztloHDpLAzKp/9l3xOt869uNiOqKF68102lYdCP20AQDt34Xory8Qls7QMYo0auUb7m/XVdhHQD/ohyjDHIGZG6BrbuRtuMgAu8PZh8MpdeZw1xe+5oPb2XrL3dpR7xZ/eHpcy58zVBl8SQaoCP85e1uBabnqN0fbiVFDdUNL52xTEyRknrK7RISX0zPiwDvdMRIAa172C,iv:92BzIjqwiCIfLzl9El4QoU701Q7XZE6JgpPbZZCh4ZY=,tag:+KUlo0fF5h3kMveoU4NQ9g==,type:str]
+wg-home: ENC[AES256_GCM,data:BJ29Dvv7I2nKKqpmKkUu5xrvyRXcTGURnGTmqwWbp3vbKchC1DnAyqLIeTFp7opB1kZItVTUpjvR7J8jn+48Y/xGnRNaEGdIPZwAIXPRdgX0QHFBUdw4YjBYVA82+/QqfIUBvzp/iHOsBRLkG1UNTKMozytFR6OZJNUHH8pukx5vO/ioEVOR26lfYuHH47+KOEktLpu5VlpdY7DXkYLY0/yof7MT3/9NY1KD2PWEZIq9yquPWnA+yTvm9cyhkNOQWsCC/0K5FjN/oKtf/SCt3Jb2LzuxF09+xVvzbvewhTnc3QVF0Hhf9OruJymrICNGAqYFFZCBL48nzfA7eSgaU6bg8Toq9XIuHxQ3NIrr8k7D3KmRGq2cDFL11SUolnouTgSmkfv+JBulpaOY8IjgCDZT2lmHiHdGjVKcq9MGSIUb7K6M8oXi9nbev8QZQIhdgQXRE3HZ1HJQE/3VcFTlEsJ2Y6kAIEEiAHaLK9wyrpQVYPQplVVVTapCYoE=,iv:afhs9kQqstlhmBKXQ7okSENzNt2Y9VXsQVzvENoe/Fo=,tag:hJJkQH75rNeSfs8mOkdxVg==,type:str]
+wg-office-alt: ENC[AES256_GCM,data:Wk6di/P4yh0PhhfdUUB3af326glrnaqGepNoJmBkuVptmPZi0GdnrBL5/dXxTKLI3ZjGLonwf5JCX7VcXZTRzXwv8ntv0ts87pgaQcueDE7BFqlYjdlmQz6Rv+58ETCnm5yMu1F2oRkHp93ONPpZumyNmqV6lhzQlzf2XgSzVSI/eNPJ6eb2UmQHFs4hjyl3WUPKI21VlNIwNwikQXBVo4si9SUNOIvLkSYzfurkfqQLRWt6O2OJdRx1ZWMFcHp5YKuUDHFRwKym2226I16vvic0XOJfi6Sic6uZQ5GwuiPGB938uectXyfasOC0YQ2Fzj0HqR/mpQJvwj49ulwljDvDqFDjMQMmKYPa3EiTFegaUgEMOLjnQySJpAwThkZHEOo9M298L5TZKIIHiKWTsJa6PX82SeNOw0+3FDNdFEM9gQbGUIlQmRadlQYEY7VE,iv:XwM1xtriFkQLNzSIVhA/FtON9HccFh2qR4SSmSDF7r0=,tag:O/+m9RQbtYmGsQnxsF/OsA==,type:str]
 sops:
     age:
         - enc: |
@@ -12,7 +12,7 @@ sops:
             YJkmDZzMcXikXXiro96AprP9dXJXvMPKYPGl2Zsal8PlGFPBoHW2GA==
             -----END AGE ENCRYPTED FILE-----
           recipient: age1w80rc0dnuu8nw99gw64c596qqetm78jdnsqajr0u7ephykekr39qfz8vnv
-    lastmodified: "2026-09-24T23:54:31Z"
-    mac: ENC[AES256_GCM,data:iWYtHmKpcqT3riAPXw5g0MPSnK3DzKp7TU7EBgEfZtkh/A/cENsDiCQfJwPIxqHsXh0PVGiIJaF8zYHS2sr4h+/PzE3O+sTG9bSdiHa4UGY9yHlRbe4p0V/xjtjnqFYzMm1eFj+WCdCJNbIK8OnP5ziXERL60/glETejhKStN5c=,iv:KWsCdOcYkMhlotSk6EdXIKc7YVjQlukrP7zd4oj4eXI=,tag:ad+qHZXVWd0i2CzZaNfJOg==,type:str]
+    lastmodified: "2026-10-05T19:03:13Z"
+    mac: ENC[AES256_GCM,data:17HpRszIH6PbDBOV91Q9J3fQvGJnqdCG32X5OU5kzBR7sA/zMVZSNGpT/Qz7J+11ZvWn+LzErnLpZSdfg+HIBUdmxgmTaKBSPHL34O5N0vHkbt5L1Vbys+RHiK1Gb/JnqfCSu5CSwSQRmbC5GIpimHL/Ke3iaMyTvmb0nxWqG/0=,iv:I84zf/PYlSIRpUaEj7TjzqslbYJj3RfC1BhC/FaT1zI=,tag:O/YK/FVCzE3hIAl/xh1hYA==,type:str]
     unencrypted_suffix: _unencrypted
     version: 3.13.3
diff --git a/hosts/T430/wg.nix b/hosts/T430/wg.nix
index 00023b9..d6a5e47 100644
--- a/hosts/T430/wg.nix
+++ b/hosts/T430/wg.nix
@@ -1,11 +1,11 @@
 { config, pkgs, inputs, ... }: {
-	sops.secrets.wg0 = { sopsFile = ./resources/secrets/wg.yaml; key = "wg0"; };  # Office
-	sops.secrets.wg1 = { sopsFile = ./resources/secrets/wg.yaml; key = "wg1"; };  # Home
+	sops.secrets.wg-office.sopsFile     = ./resources/secrets/wg.yaml;
+	sops.secrets.wg-office-alt.sopsFile = ./resources/secrets/wg.yaml;
+	sops.secrets.wg-home.sopsFile       = ./resources/secrets/wg.yaml;
 
 	networking.wg-quick.interfaces = {
-		wg0.configFile = config.sops.secrets.wg0.path;
-		wg1.configFile = config.sops.secrets.wg1.path;
-		wg0.autostart = false;
-		wg1.autostart = false;
+		wg-office     = { autostart = false; configFile = config.sops.secrets.wg-office.path; };
+		wg-office-alt = { autostart = false; configFile = config.sops.secrets.wg-office-alt.path; };
+		wg-home       = { autostart = false; configFile = config.sops.secrets.wg-home.path; };
 	};
 }
-- 
cgit v1.3.1