fix all the shits

flake.nix

@@ -12,7 +12,7 @@
         specialArgs = {inherit self inputs;};
         modules = [
           ./hosts/laptop #individual config
-          ./modules/nixos #share configs
+          ./modules/desktop #share configs
         ];
       };
     };

hosts/laptop/configuration.nix

@@ -131,4 +131,7 @@
   # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
   system.stateVersion = "25.05"; # Did you read the comment?
 
+  #enable configs
+  core.gaming.enable = true;
+  core.desktop.enable = true;
 }

modules/coreAll/README.md

@@ -1 +0,0 @@
-This config is for all core utilities needed for any system, wget, git, etc.

modules/coreAll/default.nix

@@ -1,23 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}: let
-  inherit (lib.modules) mkIf;
-  inherit (lib.options) mkEnableOption;
-
-  cfg = config.coreAll;
-in {
-  options.coreAll = {
-    enable = mkEnableOption "Base system utils";
-  };
-
-  config = mkIf cfg.enable {
-    environment.systemPackages = with pkgs; [
-      btop
-      git
-      wget
-    ];
-  };
-}

modules/coreDesktop/README.md

@@ -1 +0,0 @@
-This config is used for systems running a desktop (plasma), contains tools such a Brave browser, vscodium, etc.

modules/coreGaming/README.md

@@ -1 +0,0 @@
-This config is used for gaming systems, contains steam, discord, etc.

modules/desktop/core/default.nix

@@ -0,0 +1,24 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}: let
+
+  cfg = config.core;
+in {
+  imports = [./gaming.nix ./desktop.nix];
+
+  config = {
+    environment.systemPackages = with pkgs; [
+      btop
+      git
+      wget
+    ];
+    programs.nh = {
+      enable = true;
+      flake = "/home/brandon/.nixos-conf";
+    };
+  };
+  
+}

modules/desktop/core/desktop.nix

@@ -7,9 +7,9 @@
   inherit (lib.modules) mkIf;
   inherit (lib.options) mkEnableOption;
 
-  cfg = config.coreDesktop;
+  cfg = config.core.desktop;
 in {
-  options.coreDesktop = {
+  options.core.desktop = {
     enable = mkEnableOption "Config and Utils for Desktop";
   };
 

modules/desktop/core/gaming.nix

@@ -0,0 +1,39 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}: let
+  inherit (lib.modules) mkIf;
+  inherit (lib.options) mkEnableOption;
+
+  cfg = config.core.gaming;
+in {
+
+  options.core.gaming = {
+    enable = mkEnableOption "Config and Utils for gaming";
+  };
+  config = mkIf cfg.enable {
+    environment = {
+      systemPackages = with pkgs; [
+        scanmem
+        protonup-qt
+        wine
+        winetricks
+        discord
+      ];
+    };
+
+    programs = {
+      steam = {
+        enable=true;
+        remotePlay.openFirewall = lib.mkDefault true;
+        localNetworkGameTransfers.openFirewall = lib.mkDefault true;
+        extest.enable = lib.mkDefault true;
+        protontricks.enable = lib.mkDefault true;
+      };
+
+      gamemode.enable = true;
+    };
+  };
+}

modules/desktop/default.nix

@@ -1,5 +1,6 @@
 {
   imports = [
     ./system
+    ./core
   ];
 }