Working on modularizing stuff, again

modules/programs/communication.nix

@@ -1,19 +1,16 @@
 { pkgs, config, ... }:
-{ 
+let
+  inherit (lib.modules) mkIf;
+in
+{
+  options.modules.programs.communication = let
+    inherit (lib.options) mkEnableOption;
+  in {
+    enable = mkEnableOption "Discord and Teamspeak";
+  };
+
   environment.systemPackages = with pkgs; [
-    discord
     webcord
     teamspeak_client
   ];
-
-#  config.xdg.desktopEntries.discord = {
-#    name = "Discord";
-#    genericName = "All-in-one cross-platform voice and text chat for gamers";
-#    exec = "Discord --in-process-gpu --use-gl=desktop";
-#    icon = "Discord";
-#    categories = [ "Network" "InstantMessaging" ];
-#    settings = {
-#      version = "1.4";
-#    };
-#  };
 }

modules/programs/default.nix

@@ -0,0 +1,15 @@
+{ pkgs, config, ... }:
+let
+  inherit (lib.modules) mkIf;
+in
+{
+  options.modules.programs = let
+    inherit (lib.options) mkEnableOption;
+  in {
+    enable = mkEnableOption "Rust developmnt";
+  };
+
+  config = mkIf conf.modules.programs.enable {
+
+  };
+}

modules/programs/gaming.nix

@@ -1,50 +1,5 @@
 { config, pkgs, ... }:
 {
-  hardware.opengl = {
-    enable = true;
-    driSupport = true;
-    driSupport32Bit = true;
-  };
-
-  # Nvidia
-  services.xserver.videoDrivers = [ "nvidia" ];
-  hardware.nvidia = {
-    modesetting.enable = true;
-    open = false;
-    nvidiaSettings = true;
-
-    powerManagement = {
-      enable = true;
-      finegrained = false;
-    };
-
-    package = let
-      rcu_patch = pkgs.fetchpatch {
-        url = "https://github.com/gentoo/gentoo/raw/c64caf53/x11-drivers/nvidia-drivers/files/nvidia-drivers-470.223.02-gpl-pfn_valid.patch";
-        hash = "sha256-eZiQQp2S/asE7MfGvfe6dA/kdCvek9SYa/FFGp24dVg=";
-      };
-    in config.boot.kernelPackages.nvidiaPackages.mkDriver {
-      version = "535.154.05";
-      sha256_64bit = "sha256-fpUGXKprgt6SYRDxSCemGXLrEsIA6GOinp+0eGbqqJg=";
-      sha256_aarch64 = "sha256-G0/GiObf/BZMkzzET8HQjdIcvCSqB1uhsinro2HLK9k=";
-      openSha256 = "sha256-wvRdHguGLxS0mR06P5Qi++pDJBCF8pJ8hr4T8O6TJIo=";
-      settingsSha256 = "sha256-9wqoDEWY4I7weWW05F4igj1Gj9wjHsREFMztfEmqm10=";
-      persistencedSha256 = "sha256-d0Q3Lk80JqkS1B54Mahu2yY/WocOqFFbZVBh+ToGhaE=";
-
-      patches = [ rcu_patch ];
-    };
-
-    #prime = {
-    #  sync.enable = true;
-
-      # Integrated
-      # interBusId = "PCI:0:0:0";
-
-      # Dedicated
-    #  nvidiaBusId = "PCI:2:0:0";
-    #};
-  };
-
   # Steam
   programs.steam = {
     enable = true;

modules/programs/media.nix

@@ -21,15 +21,11 @@ in
   ];
 
   users = {
-    groups = {
-      ${group} = {};
-    };
-    users = {
-      ${user} = {
-        isSystemUser = true;
-        group = group;
-      }
+    users."${user}" = {
+      isSystemUser = true;
+      group = group;
     };
+    groups."${group}" = {};
   };
 
   system.activationScripts.var = mkForce ''