From a42623f01eeeff81953ea4adbcbdf5a426241334 Mon Sep 17 00:00:00 2001 From: Nathan Date: Fri, 24 Apr 2026 20:53:46 -0500 Subject: [PATCH] hotspot broken --- modules/features/hotspot.nix | 43 +++++++++++++++++++++++++++++++++ modules/features/networking.nix | 35 --------------------------- modules/features/secrets.yaml | 7 +++--- 3 files changed, 47 insertions(+), 38 deletions(-) create mode 100644 modules/features/hotspot.nix delete mode 100644 modules/features/networking.nix diff --git a/modules/features/hotspot.nix b/modules/features/hotspot.nix new file mode 100644 index 0000000..d93727e --- /dev/null +++ b/modules/features/hotspot.nix @@ -0,0 +1,43 @@ +{ ... }: { + + flake.nixosModules.hotspot = { config, lib, ... }: { + + networking.interfaces."eno1" = { + useDHCP = false; + ipv4.addresses = [ + { address = "192.168.222.1"; prefixLength = 24; } + ]; + }; + + networking.firewall.interfaces."eno1" = { + allowedUDPPorts = [ 53 67 ]; + allowedTCPPorts = [ 53 67 ]; + }; + + networking.nat = { + enable = true; + externalInterface = "wlo1"; + internalInterfaces = [ "eno1" ]; + }; + + /*sops.secrets."hotspotPass".sopsFile = ./secrets.yaml; + + services.hostapd = { + enable = true; + + radios.wlo1 = { + networks.wlo1 = { + ssid = "laptopHotspot"; + authentication.saePasswords = [{ passwordFile = "${config.sops.secrets."hotspotPass".path}"; }]; + }; + }; + };*/ + + services.dnsmasq = { + enable = true; + settings = { + dhcp-range = [ "192.168.222.2,192.168.222.4" ]; + }; + }; + }; +} diff --git a/modules/features/networking.nix b/modules/features/networking.nix deleted file mode 100644 index 98bf869..0000000 --- a/modules/features/networking.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ ... }: { - - flake.nixosModules.static-eth = { config, lib, ... }: { - - networking = { - interfaces.eno1 = { - ipv4.addresses = [{ - address = "192.0.2.2"; - prefixLength = 24; - }]; - }; - - defaultGateway = { - address = "192.0.2.1"; - interface = "eno1"; - }; - }; - }; - - flake.nixosModules.static-wl = { config, lib, ... }: { - - networking = { - interfaces.wlo1 = { - ipv4.addresses = [{ - address = "192.0.3.2"; - prefixLength = 24; - }]; - }; - defaultGateway = { - address = "192.0.3.1"; - interface = "wlo1"; - }; - }; - }; -} diff --git a/modules/features/secrets.yaml b/modules/features/secrets.yaml index 561990b..e26a760 100644 --- a/modules/features/secrets.yaml +++ b/modules/features/secrets.yaml @@ -2,6 +2,7 @@ remoteBuildClientKeys: laptop: ENC[AES256_GCM,data:SZRAZ36nSueWVLcdvpgZpltp/aORqAObFWhgqtIrTYccoK/3F7l0J+VJzF51FASa6spbGJL2BSbzOygyal609pvJc9Hb9bIN85GMzV1P4lha62iC8dkuVLXezPU=,iv:veQJxL4QTxFg2UKm2+I3RQXyuwW2rXEV/gXIQ7nBtlY=,tag:9C9Ltzwz823yY029p9K41A==,type:str] pi4: ENC[AES256_GCM,data:zT7V70DbBj5OIl5dTkUjvdqrxSiPcc+oFvL7R2ZAuytSQWdo9MR+WuuhN1Zeo0Ho9eGcbS+Qwr/Vs+yIYU+XaUlgawHM6aiUXoQmQE/yJFOPYUcmi0R4mxD0nkPZ0w==,iv:HQ+bxpeHZq9cezF6omZ1OMecfOw74pXzBujndhXnLPM=,tag:AM5O21nYzb4xzybOPvBwRg==,type:str] android: ENC[AES256_GCM,data:srkEb7oAxcN5++sTWQo43C8M4JNpfeeJlcGLGUA6gp74kcES1HnIs87ZtCik121oMSYD15LZ8p/x/AV2QdGMobQFxoMQ2NEehhP66n2EoXcEos3BXqUlbphiBGMRfVK9+w==,iv:bmDbVfVSZLU+EsZh/GBBY9QVcfHZJB9gLZYeI3NYoGY=,tag:biE4/DN7z2wRyFBjK7vEnQ==,type:str] +hotspotPass: ENC[AES256_GCM,data:str2NCiO3mkWQiNWC1fouqHl,iv:gtwKki5hs9PHMzrK516QxZ4iLx8raIV7vCdJ7RpPd/E=,tag:j+Yw431Mghqt//bFUQnSSA==,type:str] sops: age: - recipient: age1yqgyp2uxz4lzrc9f9ka0mfjl5fr6ahf8nf24nlmran2wulg6fpvq9hyp9q @@ -31,7 +32,7 @@ sops: NXNhczV5Y3o3dmJ2RVk3eDBRd1FDdEkK4ELlB6suN3R3GJ6XRQCvE9mgiXUOMFs3 Yi+VfJTi3pkUQEi8MZP64Nl6IR5dXjUoPXFhBNcplmLf09JDjH4LJQ== -----END AGE ENCRYPTED FILE----- - lastmodified: "2025-08-26T22:28:31Z" - mac: ENC[AES256_GCM,data:hTEenm/UO84leu7alRdWlicKKrwNlaRR7ZQzhDtOCUcXemvwe30WkSq2mdzOnSo0uMSg1HZIlna8oRUd31ENe1aWfl69PlYPxEicmN5UHykVboXydw6m0yPoAqHj+nqG/vkWsVp0JN8HvTc59mzD+1DfydhJA3m0juaa81w5GsY=,iv:HBkE78QhX1wZANpvDW7nOIOTKBdCv0/dUc1Xv5+OQmQ=,tag:6I2z8MgZxnXjqd4iikA9nQ==,type:str] + lastmodified: "2026-04-24T23:13:22Z" + mac: ENC[AES256_GCM,data:m/4/y5r+BTeq5AtR6u3+vKxgTopGu+kIOGjaKMtNp/SSY1x086hzBfnB8p3BtLFijxYVrEqM/4JxvKU3m41jOtx4/1oSM/BXjHRUl+7diDSOcBaBtJMH2xam2b7Jlg4J0bW4ai3QnEQVF1A00dcmmEUqa/LZInFYSOXjB+FICCo=,iv:RcqpkSk8BSkcreVG1cY5f2OukCgcT36vqCyOfqoNXIs=,tag:aIDe4Tv5BygBYbyQ8GGr5Q==,type:str] unencrypted_suffix: _unencrypted - version: 3.10.2 + version: 3.12.1