More opt

modules/nixos/gui/xserver/default.nix

@@ -1,7 +1,5 @@
-{ lib, config, pkgs, ... }:
-let cfg = config.syscfg.make.gui;
-in {
-  config = lib.mkIf cfg {
+{ lib, config, pkgs, ... }: {
+  config = lib.mkIf (config.syscfg.make.gui) {
     services.xserver = {
       enable = true;
       videoDrivers = [ "amd" ];

modules/nixos/system/network/bluetooth/default.nix

@@ -1,5 +1,7 @@
 { pkgs, ... }: {
+  config = lib.mkIf (config.syscfg.net.ble.enable) {
     hardware.bluetooth.enable = true;
     services.blueman.enable = true;
     environment.systemPackages = with pkgs; [ bluez bluez-tools ];
+  };
 }

modules/nixos/system/xdg/default.nix

@@ -1,5 +1,5 @@
 { config, lib, pkgs, ... }: {
-
+  config = lib.mkIf (config.syscfg.make.gui) {
     xdg.portal = {
       enable = true;
       # wlr.enable = true;
@@ -57,4 +57,5 @@
       XDG_TEMPLATES_DIR="$HOME/media/templates"
       XDG_VIDEOS_DIR="$HOME/media/video"
     '';
+  };
 }

modules/server/default.nix

@@ -1,4 +1,4 @@
 { ... }:
 {
-
+virtualisation.arion.projects.
 }

modules/shared/syscfg/default.nix

@@ -13,6 +13,12 @@ let
     };
   };
   netOpt = with lib; {
+    ble = {
+      enable = mkOption {
+        type = types.bool;
+        default = false;
+      };
+    };
     wlp = {
       enable = mkOption {
         type = types.bool;
@@ -69,11 +75,23 @@ let
     mailDomain = mkOption { type = types.str; };
     mailServer = mkOption { type = types.str; };
 
-    dbHost = mkOption {type = types.str; default = "localhost";};
-    dbPort = mkOption {type = types.str; default = "3306";};
+    dbHost = mkOption {
+      type = types.str;
+      default = "localhost";
+    };
+    dbPort = mkOption {
+      type = types.str;
+      default = "3306";
+    };
 
-    configPath = mkOption {type=types.str; default= "/media/config";};
-    dataPath = mkOption {type=types.str; default= "/media/data";};
+    configPath = mkOption {
+      type = types.str;
+      default = "/media/config";
+    };
+    dataPath = mkOption {
+      type = types.str;
+      default = "/media/data";
+    };
 
   };
 in with lib; {