moar

flake.nix

@@ -88,7 +88,6 @@
           ### User specific ###
           ./users/kopatz
           ./modules
-          ./modules/cli-tools.nix
           ./modules/ecryptfs.nix
           ./modules/graphical/audio.nix
           ./modules/graphical/code.nix
@@ -125,7 +124,6 @@
         modules = [
           #"${nixpkgs}/nixos/modules/profiles/minimal.nix"
           ./users/anon
-          ./modules/cli-tools.nix
           ./modules/nix/settings.nix
           ./systems/wsl/configuration.nix
           ({ config, outputs, ... }: { nixpkgs.overlays = with outputs.overlays; [additions modifications unstable-packages]; })

modules/cli-tools.nix

@@ -1,33 +1,44 @@
-{ config, pkgs, inputs, ... }:
+{lib,  config, pkgs, inputs, ... }:
+with lib;
+let
+  cfg = config.kop.cli-tools;
+in
 {
-  environment.systemPackages = with pkgs; [
+  options.kop.cli-tools = {
-    wget
+    enable = mkEnableOption "Enables cli-tools";
-    pciutils
+  };
-    nixos-option
+  
-    btop
+  config = mkIf cfg.enable {
-    git
+    environment.systemPackages = with pkgs; [
-    killall
+      wget
-    xclip
+      pciutils
-    usbutils
+      nixos-option
-    inputs.agenix.packages."x86_64-linux".default
+      btop
-    fastfetch
+      git
-    pdfgrep
+      killall
-    ncdu
+      xclip
-    glxinfo
+      usbutils
-    vulkan-tools
+      inputs.agenix.packages."x86_64-linux".default
-    ffmpeg
+      fastfetch
-    nethogs
+      pdfgrep
-    dig
+      ncdu
-    smartmontools
+      glxinfo
-    bc
+      vulkan-tools
-    xxd
+      ffmpeg
-    tldr
+      nethogs
-    file
+      dig
-    unzip
+      smartmontools
-    lsof
+      bc
-    screen
+      xxd
-    tmux
+      tldr
-    fatrace # monitor filesystem events
+      file
-    ripgrep
+      unzip
-  ];
+      lsof
+      screen
+      tmux
+      fatrace # monitor filesystem events
+      ripgrep
+    ];
+  };
 }
+

modules/collections/desktop.nix

@@ -1,7 +1,6 @@
 {pkgs, config, ...}:
 {
   imports = [
-    ../cli-tools.nix
     ../docker.nix
     #../fh/scanning.nix
     ../flatpak.nix
@@ -30,10 +29,11 @@
   ];
 
   kop = {
-    wooting.enable = true;
+    hardware.wooting.enable = true;
     tmpfs.enable = true;
     wireshark.enable = true;
     virt-manager.enable = true;
     nftables.enable = true;
+    cli-tools.enable = true;
   };
 }

modules/collections/laptop.nix

@@ -0,0 +1,9 @@
+{pkgs, config, ...}:
+{
+  kop = {
+    cli-tools.enable = true;
+    tmpfs.enable = true;
+    wireshark.enable = true;
+    virt-manager.enable = true;
+  };
+}

modules/collections/server.nix

@@ -20,7 +20,6 @@
     ### Other Modules ###
     #../games/palworld.nix
     ../backup.nix
-    ../cli-tools.nix
     ../cron.nix
     ../docker.nix
     ../fail2ban.nix
@@ -35,5 +34,8 @@
     ../hardware/ssd.nix
   ];
 
-  kop.tmpfs.enabled = true;
+  kop = {
+    cli-tools.enable = true;
+    tmpfs.enable = true;
+  };
 }

modules/default.nix

@@ -11,5 +11,6 @@
         ./wireshark.nix
         ./virt-manager.nix
         ./nftables.nix
+        ./cli-tools.nix
     ];
 }

modules/hardware/wooting.nix

@@ -1,10 +1,10 @@
 { config, pkgs, lib, ...}:
 with lib;
 let 
-  cfg = config.kop.wooting;
+  cfg = config.kop.hardware.wooting;
 in
 { 
-  options.kop.wooting = {
+  options.kop.hardware.wooting = {
     enable = mkEnableOption "Enable wooting hardware support";
   };
 

systems/laptop/main.nix

@@ -14,12 +14,6 @@
 	#<home-manager/nixos>
     ];
 
-  kop = {
-    tmpfs.enable = true;
-    wireshark.enable = true;
-    virt-manager.enable = true;
-  }
-
   # Bootloader.
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;