feat: move wifi and bluetooth settings to options

home/default.nix

@@ -3,7 +3,7 @@
   imports = [
     ./graphical
     ./terminal
-
+    ./desktop
     ./hyprland
     ./hyprlock
     ./foot.nix

hosts/brontes/configuration.nix

@@ -18,10 +18,6 @@
     efi.canTouchEfiVariables = true;
   };
 
-  hardware.bluetooth = {
-    enable = true;
-    powerOnBoot = true;
-  };
   age.secrets.rustypaste = {
     file = ../../secrets/rustypaste.age;
   };
@@ -34,10 +30,17 @@
     portal.enable = true;
     mime.enable = true;
   };
+
+  modules.system = {
+    networking = {
+      wifi.enable = true;
+      bluetooth.enable = true;
+    };
+  };
+
   services = {
     displayManager.sddm.enable = true;
     dbus.enable = true;
-    blueman.enable = true;
     pipewire.enable = true;
 
     tailscale = {

hosts/marr/configuration.nix

@@ -14,21 +14,24 @@
     ./home.nix
   ];
 
-  device.type = {
+  modules.system = {
+    networking = {
+      bluetooth.enable = true;
+      wifi.enable = true;
+    };
+    type = {
       graphical.enable = true;
       workstation.enable = true;
       gaming.enable = true;
     };
+  };
+
   # Bootloader.
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
 
   boot.initrd.luks.devices."luks-7adaa102-d438-4e9e-9972-4a3c91b887b3".device = "/dev/disk/by-uuid/7adaa102-d438-4e9e-9972-4a3c91b887b3";
 
-  hardware.bluetooth.enable = true;
-  hardware.bluetooth.powerOnBoot = true;
-  services.blueman.enable = true;
-
   hardware.graphics.enable = true;
 
   # Configure keymap in X11

hosts/raptus/configuration.nix

@@ -24,11 +24,6 @@
     rustypaste.file = ../../secrets/rustypaste.age;
   };
 
-  device.type = {
-    vm.enable = true;
-    server.enable = true;
-  };
-
   boot.loader.grub = {
     efiSupport = true;
     efiInstallAsRemovable = true;

modules/default.nix

@@ -3,7 +3,6 @@
   imports = [
     ./sddm.nix
     ./locale.nix
-    ./networking.nix
     ./fonts.nix
     ./portals.nix
     ./env.nix

modules/networking.nix

@@ -1,43 +0,0 @@
-{ ... }:
-{
-  networking = {
-
-    networkmanager.enable = true;
-
-    firewall =
-      let
-        wgPort = 51820;
-      in
-      {
-        enable = true;
-
-        # Open ports in the firewall.
-        allowedTCPPorts = [ ];
-        allowedUDPPorts = [ wgPort ];
-        allowedTCPPortRanges = [
-          {
-            from = 1714;
-            to = 1764;
-          }
-        ];
-        allowedUDPPortRanges = [
-          {
-            from = 1714;
-            to = 1764;
-          }
-        ];
-
-        # if packets are still dropped, they will show up in dmesg
-        logReversePathDrops = true;
-        # wireguard trips rpfilter up https://nixos.wiki/wiki/WireGuard#Setting_up_WireGuard_with_NetworkManager
-        extraCommands = ''
-          ip46tables -t mangle -I nixos-fw-rpfilter -p udp -m udp --sport ${toString wgPort} -j RETURN
-          ip46tables -t mangle -I nixos-fw-rpfilter -p udp -m udp --dport ${toString wgPort} -j RETURN
-        '';
-        extraStopCommands = ''
-          ip46tables -t mangle -D nixos-fw-rpfilter -p udp -m udp --sport ${toString wgPort} -j RETURN || true
-          ip46tables -t mangle -D nixos-fw-rpfilter -p udp -m udp --dport ${toString wgPort} -j RETURN || true
-        '';
-      };
-  };
-}

options/default.nix

@@ -1,7 +1,7 @@
 {
   imports = [
     ./media.nix
-    ./system.nix
+    ./system
     ./container
     ./server
   ];

options/system.nix

@@ -1,41 +0,0 @@
-{ lib, ... }:
-let
-  inherit (lib.types) bool array string;
-in
-{
-  options = {
-    device = {
-      pubKeys = lib.mkOption {
-        type = array string;
-        default = [ ];
-      };
-
-      type = {
-        gaming.enable = lib.mkEnableOption {
-          type = bool;
-          default = false;
-        };
-
-        graphical.enable = lib.mkEnableOption {
-          type = bool;
-          default = false;
-        };
-
-        workstation.enable = lib.mkEnableOption {
-          type = bool;
-          default = false;
-        };
-
-        server.enable = lib.mkEnableOption {
-          type = bool;
-          default = false;
-        };
-
-        vm.enable = lib.mkEnableOption {
-          type = lib.types.bool;
-          default = false;
-        };
-      };
-    };
-  };
-}

options/system/default.nix

@@ -0,0 +1,37 @@
+{ lib, ... }:
+let
+  inherit (lib.types) bool array string;
+  inherit (lib) mkEnableOption;
+in
+{
+  imports = [ ./networking ];
+
+  options.modules.system = {
+    type = {
+      gaming.enable = lib.mkEnableOption {
+        type = bool;
+        default = false;
+      };
+
+      graphical.enable = lib.mkEnableOption {
+        type = bool;
+        default = false;
+      };
+
+      workstation.enable = lib.mkEnableOption {
+        type = bool;
+        default = false;
+      };
+
+      server.enable = lib.mkEnableOption {
+        type = bool;
+        default = false;
+      };
+
+      vm.enable = lib.mkEnableOption {
+        type = lib.types.bool;
+        default = false;
+      };
+    };
+  };
+}

options/system/networking/bluetooth.nix

@@ -0,0 +1,19 @@
+{ lib, config, ... }:
+let
+  inherit (lib) mkEnableOption mkIf;
+  cfg = config.modules.system.networking.bluetooth;
+in
+{
+  options.modules.system.networking.bluetooth = {
+    enable = mkEnableOption "activate bluetooth capabilities";
+  };
+
+  config = mkIf cfg.enable {
+    hardware.bluetooth = {
+      enable = true;
+      powerOnBoot = true;
+    };
+
+    services.blueman.enable = true;
+  };
+}

options/system/networking/default.nix

@@ -0,0 +1,6 @@
+{
+  imports = [
+    ./wifi.nix
+    ./bluetooth.nix
+  ];
+}

options/system/networking/wifi.nix

@@ -0,0 +1,14 @@
+{ lib, config, ... }:
+let
+  inherit (lib) mkEnableOption mkIf;
+  cfg = config.modules.system.networking.wifi;
+in
+{
+  options.modules.system.networking.wifi = {
+    enable = mkEnableOption "activate wifi capabilities";
+  };
+
+  config = mkIf cfg.enable {
+    networking.networkmanager.enable = true;
+  };
+}