From 397966651d90555f1bd3b6e1153559614978b10c Mon Sep 17 00:00:00 2001
From: Nydragon <contact@ccnlc.eu>
Date: Wed, 2 Oct 2024 01:39:24 +0200
Subject: [PATCH] feat: move wifi and bluetooth settings to options

---
 assets/favicon-paperless.png            | Bin 0 -> 768 bytes
 home/default.nix                        |   2 +-
 hosts/brontes/configuration.nix         |  13 ++++---
 hosts/marr/configuration.nix            |  19 ++++++-----
 hosts/raptus/configuration.nix          |   5 ---
 modules/default.nix                     |   1 -
 modules/networking.nix                  |  43 ------------------------
 options/default.nix                     |   2 +-
 options/system.nix                      |  41 ----------------------
 options/system/default.nix              |  37 ++++++++++++++++++++
 options/system/networking/bluetooth.nix |  19 +++++++++++
 options/system/networking/default.nix   |   6 ++++
 options/system/networking/wifi.nix      |  14 ++++++++
 13 files changed, 97 insertions(+), 105 deletions(-)
 create mode 100644 assets/favicon-paperless.png
 delete mode 100644 modules/networking.nix
 delete mode 100644 options/system.nix
 create mode 100644 options/system/default.nix
 create mode 100644 options/system/networking/bluetooth.nix
 create mode 100644 options/system/networking/default.nix
 create mode 100644 options/system/networking/wifi.nix

diff --git a/assets/favicon-paperless.png b/assets/favicon-paperless.png
new file mode 100644
index 0000000000000000000000000000000000000000..10013865d592c990882889b722908a0eadcd7dbd
GIT binary patch
literal 768
zcmV+b1ONPqP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!qDe$SRCwCdSvzjRKoB)1MGB-iRmzYy
zl{o?C21H69I00~iK$!|sr8M-Ba83|70ZxO`0cAQ<ASGR9rLnX^YwyRq{yfRTn8my|
zGdmwsw<?00$J=h>-uXRkj}d*{wyJ|E9L@8Kc15f|MDkwc1ORy#t<QvAa`Fzmd{UR%
zl@UOZchc6`B@UYn94>FIT|)96TD~c=-YyyWu}Ij^xF`v6Vr`$5CQI)D%<&r)@`ZXp
z(dtntJdnZaUxj)gORN{}fvmBP2y^#<2CJtEunm*%YOs2Y{m=U$zYqfQq=Q__6eSK;
zxuj8S!U*}E=3B3g3!pkk*ML(4sY;9;p)8D%XT^V_0LCC8VtwBbd4dnwUWml6gIPp0
z+w=^PkHGqKSpiS@IuML|-(WU=mFh;Z@Wi3u33y?sF;%i!hnZ|UeO`2Yw6ewVmI+Lf
zHgB4M^HI*hf|NA=H4Tvuf&5HmplP$bf|Zr$Eu9$Yp2&tEq9-6$SLm!vjFeNw0w>k;
z0Qs@WnRv<B)LGl*2a`j6h@1A=5cv)->xc+gr>u9dtsQC(B_;An0>YH_E+uflSu4}$
zE0JdkfExv@;hDk}eoivdAtU)2{GKxTv^@}Tybxp^57FwQtnNz^FiH82M_E2ZGBUjl
zxpzx6&npRlo9{UyXhNdim?QCVmXJ9|jngV8J)<Y2Js@(8-RmwTR2CTPk!1k9nYfcM
zCU&Vdx62?+1TKJdXc<OLaZo4Lyu<Sy)`t<!u6rv-a4RvozJoCwqmS2pBu|LX@+L3j
z0mkgR1fsS09KF#hf;>T8X7Ooz{BGPk<S+j}c>4y&B^)nU{0f1}gRK=c#P4NV-$M2P
y19bb)w+e=efOrZEbXC*51w<G|BdY}X7hnKlJLoW#!Xcsn0000<MNUMnLSTXtOI3dW

literal 0
HcmV?d00001

diff --git a/home/default.nix b/home/default.nix
index 0e297cb..3032d15 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -3,7 +3,7 @@
   imports = [
     ./graphical
     ./terminal
-
+    ./desktop
     ./hyprland
     ./hyprlock
     ./foot.nix
diff --git a/hosts/brontes/configuration.nix b/hosts/brontes/configuration.nix
index f65775a..d907040 100644
--- a/hosts/brontes/configuration.nix
+++ b/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 = {
diff --git a/hosts/marr/configuration.nix b/hosts/marr/configuration.nix
index 51a34bb..88d3872 100644
--- a/hosts/marr/configuration.nix
+++ b/hosts/marr/configuration.nix
@@ -14,21 +14,24 @@
     ./home.nix
   ];
 
-  device.type = {
-    graphical.enable = true;
-    workstation.enable = true;
-    gaming.enable = true;
+  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
diff --git a/hosts/raptus/configuration.nix b/hosts/raptus/configuration.nix
index 9a31422..87e33d9 100644
--- a/hosts/raptus/configuration.nix
+++ b/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;
diff --git a/modules/default.nix b/modules/default.nix
index 5469633..c8d308d 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -3,7 +3,6 @@
   imports = [
     ./sddm.nix
     ./locale.nix
-    ./networking.nix
     ./fonts.nix
     ./portals.nix
     ./env.nix
diff --git a/modules/networking.nix b/modules/networking.nix
deleted file mode 100644
index 484e77c..0000000
--- a/modules/networking.nix
+++ /dev/null
@@ -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
-        '';
-      };
-  };
-}
diff --git a/options/default.nix b/options/default.nix
index 7e2254a..797d1be 100644
--- a/options/default.nix
+++ b/options/default.nix
@@ -1,7 +1,7 @@
 {
   imports = [
     ./media.nix
-    ./system.nix
+    ./system
     ./container
     ./server
   ];
diff --git a/options/system.nix b/options/system.nix
deleted file mode 100644
index a1b6447..0000000
--- a/options/system.nix
+++ /dev/null
@@ -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;
-        };
-      };
-    };
-  };
-}
diff --git a/options/system/default.nix b/options/system/default.nix
new file mode 100644
index 0000000..161c0e5
--- /dev/null
+++ b/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;
+      };
+    };
+  };
+}
diff --git a/options/system/networking/bluetooth.nix b/options/system/networking/bluetooth.nix
new file mode 100644
index 0000000..155e086
--- /dev/null
+++ b/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;
+  };
+}
diff --git a/options/system/networking/default.nix b/options/system/networking/default.nix
new file mode 100644
index 0000000..6e100d3
--- /dev/null
+++ b/options/system/networking/default.nix
@@ -0,0 +1,6 @@
+{
+  imports = [
+    ./wifi.nix
+    ./bluetooth.nix
+  ];
+}
diff --git a/options/system/networking/wifi.nix b/options/system/networking/wifi.nix
new file mode 100644
index 0000000..c34df0a
--- /dev/null
+++ b/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;
+  };
+}