From 5c2458a9053c4be3abe4185641199eeb99fbf70a Mon Sep 17 00:00:00 2001 From: wooki3 <94880382+wooki3@users.noreply.github.com> Date: Tue, 8 Jul 2025 00:39:39 -0400 Subject: [PATCH] fix all the shits --- flake.nix | 2 +- hosts/laptop/configuration.nix | 3 ++ modules/coreAll/README.md | 1 - modules/coreAll/default.nix | 23 ----------- modules/coreDesktop/README.md | 1 - modules/coreGaming/README.md | 1 - modules/coreGaming/default.nix | 0 modules/desktop/core/default.nix | 24 ++++++++++++ .../default.nix => desktop/core/desktop.nix} | 4 +- modules/desktop/core/gaming.nix | 39 +++++++++++++++++++ modules/{nixos => desktop}/default.nix | 1 + modules/{nixos => desktop}/system/default.nix | 0 12 files changed, 70 insertions(+), 29 deletions(-) delete mode 100644 modules/coreAll/README.md delete mode 100644 modules/coreAll/default.nix delete mode 100644 modules/coreDesktop/README.md delete mode 100644 modules/coreGaming/README.md delete mode 100644 modules/coreGaming/default.nix create mode 100644 modules/desktop/core/default.nix rename modules/{coreDesktop/default.nix => desktop/core/desktop.nix} (84%) create mode 100644 modules/desktop/core/gaming.nix rename modules/{nixos => desktop}/default.nix (76%) rename modules/{nixos => desktop}/system/default.nix (100%) diff --git a/flake.nix b/flake.nix index cbccbd1..f712581 100644 --- a/flake.nix +++ b/flake.nix @@ -12,7 +12,7 @@ specialArgs = {inherit self inputs;}; modules = [ ./hosts/laptop #individual config - ./modules/nixos #share configs + ./modules/desktop #share configs ]; }; }; diff --git a/hosts/laptop/configuration.nix b/hosts/laptop/configuration.nix index 8188db9..ea20c20 100644 --- a/hosts/laptop/configuration.nix +++ b/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; } diff --git a/modules/coreAll/README.md b/modules/coreAll/README.md deleted file mode 100644 index 8171c3d..0000000 --- a/modules/coreAll/README.md +++ /dev/null @@ -1 +0,0 @@ -This config is for all core utilities needed for any system, wget, git, etc. \ No newline at end of file diff --git a/modules/coreAll/default.nix b/modules/coreAll/default.nix deleted file mode 100644 index fd82c74..0000000 --- a/modules/coreAll/default.nix +++ /dev/null @@ -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 - ]; - }; -} \ No newline at end of file diff --git a/modules/coreDesktop/README.md b/modules/coreDesktop/README.md deleted file mode 100644 index ec0742d..0000000 --- a/modules/coreDesktop/README.md +++ /dev/null @@ -1 +0,0 @@ -This config is used for systems running a desktop (plasma), contains tools such a Brave browser, vscodium, etc. \ No newline at end of file diff --git a/modules/coreGaming/README.md b/modules/coreGaming/README.md deleted file mode 100644 index ca56eb2..0000000 --- a/modules/coreGaming/README.md +++ /dev/null @@ -1 +0,0 @@ -This config is used for gaming systems, contains steam, discord, etc. \ No newline at end of file diff --git a/modules/coreGaming/default.nix b/modules/coreGaming/default.nix deleted file mode 100644 index e69de29..0000000 diff --git a/modules/desktop/core/default.nix b/modules/desktop/core/default.nix new file mode 100644 index 0000000..f9203f3 --- /dev/null +++ b/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"; + }; + }; + +} \ No newline at end of file diff --git a/modules/coreDesktop/default.nix b/modules/desktop/core/desktop.nix similarity index 84% rename from modules/coreDesktop/default.nix rename to modules/desktop/core/desktop.nix index d946eed..17ece1a 100644 --- a/modules/coreDesktop/default.nix +++ b/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"; }; diff --git a/modules/desktop/core/gaming.nix b/modules/desktop/core/gaming.nix new file mode 100644 index 0000000..9829a86 --- /dev/null +++ b/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; + }; + }; +} \ No newline at end of file diff --git a/modules/nixos/default.nix b/modules/desktop/default.nix similarity index 76% rename from modules/nixos/default.nix rename to modules/desktop/default.nix index 1af905b..30f1b86 100644 --- a/modules/nixos/default.nix +++ b/modules/desktop/default.nix @@ -1,5 +1,6 @@ { imports = [ ./system + ./core ]; } \ No newline at end of file diff --git a/modules/nixos/system/default.nix b/modules/desktop/system/default.nix similarity index 100% rename from modules/nixos/system/default.nix rename to modules/desktop/system/default.nix