kay/network: switch isp

2 files changed, 12 insertions, 34 deletions

diff --git a/os/kay/modules/network.nix b/os/kay/modules/network.nix
index 339f15b..8cb18bf 100644
--- a/os/kay/modules/network.nix
+++ b/os/kay/modules/network.nix
@@ -1,10 +1,9 @@
 { config, ... }:
 
 let
-  inetVlan = 722;
-  voipVlan = 1849;
+  inetVlan = 1003;
   wanInterface = "enp3s0";
-  nameServer = "1.0.0.1";
+  nameServer = [ "1.0.0.1" "1.1.1.1" ];
 in
 {
   imports = [
@@ -18,37 +17,16 @@ in
     "ppp/username" = {};
   };
 
-  networking = let
-    voipVlanIface = "voip";
-  in {
-    vlans = {
-      wan = {
-        id = inetVlan;
-        interface = wanInterface;
-      };
-      ${voipVlanIface} = {
-        id = voipVlan;
-        interface = wanInterface;
-      };
-    };
-
-    interfaces = {
-      ${voipVlanIface}.useDHCP = true;
-      ${wanInterface}.macAddress = "c4:54:44:d5:17:68";
-    };
-
-    dhcpcd.extraConfig = ''
-      interface ${voipVlanIface}
-      ipv4only
-      nogateway
-    '';
+  networking.vlans.wan = {
+    id = inetVlan;
+    interface = wanInterface;
   };
 
   services = {
     dnsmasq = {
       enable = true;
       settings = {
-        server = [ nameServer ];
+        server = nameServer;
         bind-interfaces = true;
       };
     };
@@ -71,7 +49,7 @@ in
         lcp-echo-failure 5
       '';
 
-      peers.bsnl = {
+      peers.keralavision = {
         enable = true;
         autostart = true;
         configFile = config.sops.secrets."ppp/username".path;
diff --git a/os/kay/secrets.yaml b/os/kay/secrets.yaml
index 47be11b..dae9fe0 100644
--- a/os/kay/secrets.yaml
+++ b/os/kay/secrets.yaml
@@ -1,7 +1,7 @@
 ppp:
-    chap-secrets: ENC[AES256_GCM,data:oTwucN94iWIzrCCAQySpkG+uEBERmEjXfoPm6piook8bS/q3kCd/DQ==,iv:IC1Ii+rnTvFa0F2bi0fnEAEO7XWV7Wues9T+28bhDnc=,tag:239vrwVzeTIVCIw8U30jtg==,type:str]
-    pap-secrets: ENC[AES256_GCM,data:S72mx8AP8MDWrYZ3TIOnwoKcVWiUzms1ZpckghHjjFcWhW5orOjPOA==,iv:4kNHSZ3+FMA9ROLEgrU38IWd+MBt+vf8CV3WGHkRCCc=,tag:rBtSZH8i7fE7fJhRRda7eA==,type:str]
-    username: ENC[AES256_GCM,data:GzRdyvnRKSS8iH+RuFU9g6zxXhxl0DeWWkAyF3sefZc0QQ==,iv:yTRruKpMda4N2J3Z8MEesrFxqV4g1usbYoxTeKlWf4M=,tag:8h9cpYn2Zy/32+2HJ76dFw==,type:str]
+    chap-secrets: ENC[AES256_GCM,data:XCOWJZr+4jzkCpx8ynr/86H7pkxQ0flnjjlMhyY=,iv:bVIMPO4KIPuJcsIT5L8mZ2aOgRGS8NBz8pxsr3RRQ7k=,tag:9mHPwlOAaxm5m039T6vP5w==,type:str]
+    pap-secrets: ENC[AES256_GCM,data:aeaRboKJwcuy60nlY+iW6zKp3Rm9V8WMTnzxFnk=,iv:ph5TLDeMMz+gvn+QWHCl5jvRWcLOKPM+oEpjfHPWJ4w=,tag:ukYsCONCblQvd5hRSgKUGg==,type:str]
+    username: ENC[AES256_GCM,data:+L9MTQDplyGuMoSMGsSwugEj,iv:Q+2UpahPeYGPix37YsaqORQeVrAm02b7lRk9h0b+vsE=,tag:cePjMJii1YDyL0Jnu5Mp3Q==,type:str]
 hurricane:
     username: ENC[AES256_GCM,data:pe3igN9AIbc1,iv:stBkppjkDC9nvV/fHaEtfs6KskoiqqEKxCp/KC+Xxeo=,tag:pH5CJXOOp/is7dQmt6wlog==,type:str]
     update_key: ENC[AES256_GCM,data:wwd+QWTgKEqstY5d2eWBnWJYq2EisTTaa/Ow4WwBNkyh5FYP+7PEyg==,iv:b93JvsfWppqlJtZxGAa3xbXgLEFs0A5Seq5pNjTnRW4=,tag:+W1t1M+Mm4LopVbcI1x+eg==,type:str]
@@ -40,8 +40,8 @@ sops:
             OXgwSml4bkc1dnloNUFsRGFFcXFHc2cK26l2eiKbZUkogmAXoha6HTUs3YFKixYz
             bTkpKKyOAIIin3YM975wwvkCuWNG4tbnHBHQFh5JGK2OEyLDXuV7Pg==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2024-02-25T04:23:28Z"
-    mac: ENC[AES256_GCM,data:SUFBHKTM2tQHX1Xtta3spl/GaaNrIAcNrLFzKzqb2ki3FhXnLLYu0wD+IBxuj1nxICn9TDprHFdcDenfFPV1mYWtmXLmWMeDcIGKXedYex2nakdlIYngGiLkEseuehft46YtoEqLJVksBFoLKmywRi+/ZGux/heSIyD14Toxb3Q=,iv:dqYGObF1SV3VBxSZtrggRdD1ROqvlp7tn8xLdNuDxx4=,tag:N/4L6NgIqYKQ8IbpFGru2g==,type:str]
+    lastmodified: "2024-11-22T16:14:24Z"
+    mac: ENC[AES256_GCM,data:KPA/xxdhEO7yY9AQZmC9oslMP04RTj8RsJPNAei8UPfMCoZIp9Hyzsa7qsej+ivl/GBFT0r/4PWrxbwMTSoS4N5SiSF0MxF7eRy9UZg8EynRp1R/duImpWgUcK3wtxsDw+XtgQv5NWFrfJQvKUrRGlKACfk3Ci+tiHBVYX0AbZQ=,iv:Djje4ORwIHMvdNJd9MGRs2rVwIZ1pd94OLG/IrO59Ik=,tag:V3Em/dWJs1gyo9Z7lCK3GQ==,type:str]
     pgp: []
     unencrypted_suffix: _unencrypted
     version: 3.8.1