amd 40 current 2024-10-19 19:26:52 24.11.20241014.b36c6a9 6.6.56 *

developing-today · Oct 20, 2024 · fbf5162 · fbf5162
1 parent 5ce4194
commit fbf5162
Show file tree

Hide file tree

Showing 4 changed files with 66 additions and 55 deletions.
diff --git a/doc/NanoPi M3 - FriendlyELEC WiKi.pdf b/doc/NanoPi M3 - FriendlyELEC WiKi.pdf
diff --git a/doc/Running NixOS on a NanoPi R5S.pdf b/doc/Running NixOS on a NanoPi R5S.pdf
diff --git a/hosts/networking/default.nix b/hosts/networking/default.nix
@@ -10,72 +10,41 @@
   ...
 }:
 {
+  imports = [
+    (lib.from-root "hosts/networking/wireless/us-wi-1")
+  ];
   networking = {
     inherit hostName;
+    useDHCP = true;
+    enableIPv6 = true;
+    firewall = {
+      enable = true;
+      allowedUDPPorts = [ config.services.tailscale.port ]; # needed? # put into tailscale-autoconnect?
+    };
+  };
+}
     # hostId = deadbeef # 8 unique hex chars
     # domain
-    useDHCP = true;
     # useNetworkd = true;
     # dhcpcd.persistent = true;
-    enableIPv6 = true;
     # nat
     # https://search.nixos.org/options?channel=unstable&show=networking.supplicant&from=0&size=50&sort=relevance&type=packages&query=networking.supplicant
     # https://nixos.wiki/wiki/Systemd-networkd
     # systemd.network.netdevs
     # https://discourse.nixos.org/t/imperative-declarative-wifi-networks-with-wpa-supplicant/12394/9
-    firewall = {
-      enable = true;
-      allowedUDPPorts = [ config.services.tailscale.port ]; # needed?
       # allowedTCPPortRanges = [
       #     { from = 4000; to = 4007; }
       #     { from = 8000; to = 8010; }
       # ];
-    };
-    networkmanager = {
-      enable = false;
-      unmanaged = [
-        "*"
-        "except:type:wwan"
-        "except:type:gsm"
-      ];
-    };
-    wireless = {
-      enable = true;
-      # userControlled.enable = true;
-      scanOnLowSignal = true;
-      fallbackToWPA2 = true;
-      secretsFile = config.sops.secrets.wireless.path;
-      networks = import (lib.from-root "hosts/networking/wireless/us-wi-1");
-      allowAuxiliaryImperativeNetworks = true; # TODO: can we disable this?
-      userControlled = {
-        enable = true;
-        group = "network";
-      };
-      # whats extraConfig.update_config=1 do?
-      extraConfig = ''
-        update_config=1
-      '';
-    };
-  };
-  sops.secrets."wireless" = {
-    # TODO: us-wi-1 module in hosts/networking/wireless/us-wi-1, make-wireless if wireless is not []
-    sopsFile = lib.from-root "secrets/sops/common/networking/wireless/us-wi-1.yaml";
-  };
-  # # Ensure group exists
-  # this would be for users that aren't root or sudoers or doassers or whatever
-  users.groups.network = { };
-  # TODO: check if not needed?? https://github.com/NixOS/nixpkgs/pull/305649
-  # systemd.services.wpa_supplicant.preStart = "touch /etc/wpa_supplicant.conf";
-}
 # systemd.network.networks = let networkConfig = { DHCP = "yes"; DNSSEC = "yes"; DNSOverTLS = "yes"; DNS = [ "1.1.1.1" "1.0.0.1" ]; };
-  # boot.initrd.systemd.network.enable
-  # networking.useNetworkd
-  # systemd.networkd.enable
-  # It actually looks like there isn’t any options.systemd.networkd anyway (just options.systemd.network and boot.initrd.systemd.network), though systemd.network.networks.<name>.enable and systemd.network.netdevs.<name>.enable both refer to systemd.networkd; these docs definitely need attention.
-  # @efx: You probably just want to set systemd.network.enable = true and forget about boot.initrd.systemd.network entirely, unless you want to boot the device from another location on your network.
-  # systemd.services.systemd-udevd.restartIfChanged = false;
-  # systemd.services.tailscaled.after = ["NetworkManager-wait-online.service"]
-  # tailscale module??
-  # networking.useNetworkd = true;
-  # systemd.network.enable = true;
-  # systemd.network.wait-online.enable = false;
+# boot.initrd.systemd.network.enable
+# networking.useNetworkd
+# systemd.networkd.enable
+# It actually looks like there isn’t any options.systemd.networkd anyway (just options.systemd.network and boot.initrd.systemd.network), though systemd.network.networks.<name>.enable and systemd.network.netdevs.<name>.enable both refer to systemd.networkd; these docs definitely need attention.
+# @efx: You probably just want to set systemd.network.enable = true and forget about boot.initrd.systemd.network entirely, unless you want to boot the device from another location on your network.
+# systemd.services.systemd-udevd.restartIfChanged = false;
+# systemd.services.tailscaled.after = ["NetworkManager-wait-online.service"]
+# tailscale module??
+# networking.useNetworkd = true;
+# systemd.network.enable = true;
+# systemd.network.wait-online.enable = false;
diff --git a/hosts/networking/wireless/us-wi-1/default.nix b/hosts/networking/wireless/us-wi-1/default.nix
@@ -1,5 +1,47 @@
 {
-  "I win again, Lews Therin." = {
-    pskRaw = "ext:iwinagainlewstherin";
+  config,
+  inputs,
+  hostName,
+  host,
+  system,
+  stateVersion,
+  lib,
+  pkgs,
+  ...
+}:
+{
+  networking = {
+    networkmanager = {
+      enable = false;
+      unmanaged = [
+        "*"
+        "except:type:wwan"
+        "except:type:gsm"
+      ];
+    };
+    wireless = {
+      enable = true;
+      # userControlled.enable = true;
+      scanOnLowSignal = true;
+      fallbackToWPA2 = true;
+      secretsFile = config.sops.secrets.wireless.path;
+      networks."I win again, Lews Therin.".pskRaw = "ext:iwinagainlewstherin";
+      allowAuxiliaryImperativeNetworks = true; # TODO: can we disable this?
+      userControlled = {
+        enable = true;
+        group = "network";
+      };
+      # whats extraConfig.update_config=1 do?
+      extraConfig = ''
+        update_config=1
+      '';
+    };
+  };
+  sops.secrets."wireless" = {
+    # TODO: us-wi-1 module in hosts/networking/wireless/us-wi-1, make-wireless if wireless is not []
+    sopsFile = lib.from-root "secrets/sops/common/networking/wireless/us-wi-1.yaml";
   };
+  # # Ensure group exists
+  # this would be for users that aren't root or sudoers or doassers or whatever
+  users.groups.network = { };
 }