moar options

flake.nix

@@ -91,8 +91,6 @@
           ./modules/ecryptfs.nix
           ./modules/services/syncthing.nix
           ./modules/fh/scanning.nix
-          ./modules/nix/ld.nix
-          ./modules/nix/settings.nix
           ./modules/support/ntfs.nix
           ./modules/thunderbolt.nix
           ./modules/vmware-host.nix

modules/collections/desktop.nix

@@ -5,21 +5,7 @@
     #../fh/scanning.nix
     ../flatpak.nix
     ../gpg.nix
-    ../graphical/audio.nix
-    ../graphical/code.nix
-    ../graphical/emulators.nix
-    ../graphical/gamemode.nix
-    ../graphical/games.nix
-    ../graphical/ime.nix
-    ../graphical/obs.nix
-    ../graphical/openrgb.nix
-    ../graphical/plasma.nix
-    ../graphical/shared.nix
     ../kernel.nix # use latest kernel
-    ../nix/index.nix
-    ../nix/ld.nix
-    ../nix/settings.nix
-    ../noise-supression.nix
     ../services/syncthing.nix
     ../static-ip.nix
     ../support/ntfs.nix
@@ -31,6 +17,11 @@
     virt-manager.enable = true;
     nftables.enable = true;
     cli-tools.enable = true;
+    nix = {
+      index.enable = true;
+      ld.enable = true;
+      settings.enable = true;
+    };
     hardware = {
       nvidia.enable = true;
       firmware.enable = true;
@@ -44,6 +35,7 @@
       gamemode.enable = true;
       games.enable = true;
       ime.enable = true;
+      noise-supression.enable = true;
       obs.enable = true;
       openrgb.enable = true;
       plasma.enable = true;

modules/collections/laptop.nix

@@ -8,6 +8,10 @@
     tmpfs.enable = true;
     wireshark.enable = true;
     virt-manager.enable = true;
+    nix = {
+      ld.enable = true;
+      settings.enable = true;
+    };
     hardware = {
       firmware.enable = true;
       ssd.enable = true;

modules/collections/server.nix

@@ -28,13 +28,15 @@
     ../hdd-spindown.nix
     ../logging.nix
     ../motd.nix
-    ../nix/settings.nix
     ../static-ip.nix
   ];
 
   kop = {
     cli-tools.enable = true;
     tmpfs.enable = true;
+    nix = {
+      settings.enable = true;
+    };
     hardware = {
       firmware.enable = true;
       ssd.enable = true;

modules/graphical/default.nix

@@ -9,6 +9,7 @@
     ./gnome.nix
     ./ime.nix
     ./lxqt.nix
+    ./noise-supression.nix
     ./obs.nix
     ./openrgb.nix
     ./plasma.nix

modules/graphical/noise-supression.nix

@@ -0,0 +1,17 @@
+{config, lib, pkgs, ...}:
+with lib;
+let
+    cfg = config.kop.graphical.noise-supression;
+in
+{
+    options.kop.graphical.noise-supression = {
+        enable = mkEnableOption "Enables noise-supression";
+    };
+    
+    config = mkIf cfg.enable {
+        programs.noisetorch.enable = true;
+        environment.systemPackages = [
+            pkgs.easyeffects
+        ];
+    };
+}

modules/nix/default.nix

@@ -1,6 +1,8 @@
 { pkgs, config, ...}:
 {
   imports = [
-
+    ./index.nix
+    ./ld.nix
+    ./settings.nix
   ];
 }

modules/nix/index.nix

@@ -1,7 +1,19 @@
+{config, lib, ...}:
+with lib;
+let
+    cfg = config.kop.nix.index;
+in
 {
+    options.kop.nix.index = {
+        enable = mkEnableOption "Enables nix index";
+    };
+    
+    config = mkIf cfg.enable {
         programs.command-not-found.enable = false;
         programs.nix-index = {
             enable = true;
             enableZshIntegration=true;
         };
+    };
 }
+

modules/nix/ld.nix

@@ -1,5 +1,14 @@
-{ pkgs, ... }:
+{config, lib,  pkgs, ... }:
+with lib;
+let
+  cfg = config.kop.nix.ld;
+in
 {
+  options.kop.nix.ld = {
+    enable = mkEnableOption "Enables nix ld";
+  };
+  
+  config = mkIf cfg.enable {
     programs.nix-ld.enable = true;
     programs.nix-ld.libraries = with pkgs; [
       acl
@@ -64,4 +73,5 @@
       zlib
       zstd
     ];
+  };
 }

modules/nix/settings.nix

@@ -1,8 +1,18 @@
-{ inputs, config, pkgsVersion, ... }:
+{lib,  inputs, config, pkgsVersion, ... }:
+with lib;
+let
+  cfg = config.kop.nix.settings;
+in
 {
+  options.kop.nix.settings = {
+    enable = mkEnableOption "Enables various nix settings";
+  };
+  
+  config = mkIf cfg.enable {
     nix.optimise.automatic = true;
     nix.settings.experimental-features = [ "nix-command" "flakes" ];
     nix.registry.nixpkgs.flake = pkgsVersion;
     nix.nixPath = ["nixpkgs=flake:nixpkgs"];
     home-manager.users.${config.mainUser.name}.home.sessionVariables.NIX_PATH = "nixpkgs=flake:nixpkgs$\{NIX_PATH:+:$NIX_PATH}";
+  };
 }

modules/noise-supression.nix

@@ -1,7 +0,0 @@
-{pkgs, ...}:
-{
-    programs.noisetorch.enable = true;
-    environment.systemPackages = [
-        pkgs.easyeffects
-    ];
-}