From 46f7fa27c85c9fb446391f9bb0580afc3f06ea28 Mon Sep 17 00:00:00 2001 From: pagedmov Date: Fri, 8 Nov 2024 01:43:53 -0500 Subject: [PATCH] added categories for system configuration options as well --- hosts/desktop/config.nix | 30 ++++++++++++--------- modules/sys/environment/issue.nix | 4 +-- modules/sys/environment/nix.nix | 4 +-- modules/sys/environment/sddm.nix | 4 +-- modules/sys/environment/stylix.nix | 4 +-- modules/sys/hardware/bootloader.nix | 4 +-- modules/sys/hardware/network.nix | 4 +-- modules/sys/hardware/powerprofiles.nix | 4 +-- modules/sys/software/gaming/gaming_pkgs.nix | 4 +-- modules/sys/software/gaming/steam.nix | 4 +-- modules/sys/software/packages.nix | 4 +-- modules/sys/software/programs.nix | 4 +-- modules/sys/software/services.nix | 4 +-- modules/sys/software/virtualization.nix | 4 +-- 14 files changed, 44 insertions(+), 38 deletions(-) diff --git a/hosts/desktop/config.nix b/hosts/desktop/config.nix index ebdd54f..d2593a4 100755 --- a/hosts/desktop/config.nix +++ b/hosts/desktop/config.nix @@ -5,18 +5,24 @@ # My module options movOpts = { - networkModule.enable = true; - nixSettings.enable = true; - bootLoader.enable = true; - issue.enable = true; - sddmConfig.enable = true; - stylixConfig.enable = true; - gamingPkgs.enable = true; - steamConfig.enable = true; - sysPkgs.enable = true; - sysProgs.enable = true; - sysServices.enable = true; - virtConfig.enable = true; + sysEnv = { + issue.enable = true; + sddmConfig.enable = true; + stylixConfig.enable = true; + nixSettings.enable = true; + }; + hardwareCfg = { + networkModule.enable = true; + bootLoader.enable = true; + }; + softwareCfg = { + gamingPkgs.enable = true; + steamConfig.enable = true; + sysPkgs.enable = true; + sysProgs.enable = true; + sysServices.enable = true; + virtConfig.enable = true; + }; }; nix = { diff --git a/modules/sys/environment/issue.nix b/modules/sys/environment/issue.nix index a209a03..d0551b0 100755 --- a/modules/sys/environment/issue.nix +++ b/modules/sys/environment/issue.nix @@ -1,8 +1,8 @@ {lib, config, ...}: { options = { - movOpts.issue.enable = lib.mkEnableOption "enables custom /etc/issue splash screen for the tty"; + movOpts.sysEnv.issue.enable = lib.mkEnableOption "enables custom /etc/issue splash screen for the tty"; }; - config = lib.mkIf config.movOpts.issue.enable { + config = lib.mkIf config.movOpts.sysEnv.issue.enable { environment.etc."issue".text = '' \e[38;5;27m▓▓▓▓ \e[38;5;81m▒▒▒▒ ▒▒▒▒ diff --git a/modules/sys/environment/nix.nix b/modules/sys/environment/nix.nix index 1a137b5..e48ec5f 100755 --- a/modules/sys/environment/nix.nix +++ b/modules/sys/environment/nix.nix @@ -1,8 +1,8 @@ {lib, config, ... }: { options = { - movOpts.nixSettings.enable = lib.mkEnableOption "enables my nixos settings"; + movOpts.sysEnv.nixSettings.enable = lib.mkEnableOption "enables my nixos settings"; }; - config = lib.mkIf config.movOpts.nixSettings.enable { + config = lib.mkIf config.movOpts.sysEnv.nixSettings.enable { system.stateVersion = "24.05"; nixpkgs.config.allowUnfree = true; nix = { diff --git a/modules/sys/environment/sddm.nix b/modules/sys/environment/sddm.nix index 86ec82d..5273dd9 100755 --- a/modules/sys/environment/sddm.nix +++ b/modules/sys/environment/sddm.nix @@ -6,9 +6,9 @@ ... }: { options = { - movOpts.sddmConfig.enable = lib.mkEnableOption "enables custom sddm configuration"; + movOpts.sysEnv.sddmConfig.enable = lib.mkEnableOption "enables custom sddm configuration"; }; - config = lib.mkIf config.movOpts.sddmConfig.enable { + config = lib.mkIf config.movOpts.sysEnv.sddmConfig.enable { environment.systemPackages = [ ( pkgs.catppuccin-sddm.override { diff --git a/modules/sys/environment/stylix.nix b/modules/sys/environment/stylix.nix index 80b5686..c4010fa 100755 --- a/modules/sys/environment/stylix.nix +++ b/modules/sys/environment/stylix.nix @@ -12,9 +12,9 @@ let in { options = { - movOpts.stylixConfig.enable = lib.mkEnableOption "enables custom stylix options"; + movOpts.sysEnv.stylixConfig.enable = lib.mkEnableOption "enables custom stylix options"; }; - config = lib.mkIf config.movOpts.stylixConfig.enable { + config = lib.mkIf config.movOpts.sysEnv.stylixConfig.enable { stylix = { enable = true; base16Scheme = "${pkgs.base16-schemes}/share/themes/${scheme}.yaml"; diff --git a/modules/sys/hardware/bootloader.nix b/modules/sys/hardware/bootloader.nix index 5ac378e..fcbd656 100755 --- a/modules/sys/hardware/bootloader.nix +++ b/modules/sys/hardware/bootloader.nix @@ -1,8 +1,8 @@ {pkgs, lib, config, ...}: { options = { - movOpts.bootLoader.enable = lib.mkEnableOption "enables bootloader config"; + movOpts.hardwareCfg.bootLoader.enable = lib.mkEnableOption "enables bootloader config"; }; - config = lib.mkIf config.movOpts.bootLoader.enable { + config = lib.mkIf config.movOpts.hardwareCfg.bootLoader.enable { boot = { loader.systemd-boot.enable = true; loader.efi.canTouchEfiVariables = true; diff --git a/modules/sys/hardware/network.nix b/modules/sys/hardware/network.nix index 01fd956..ac554b4 100755 --- a/modules/sys/hardware/network.nix +++ b/modules/sys/hardware/network.nix @@ -1,9 +1,9 @@ {host, lib, config, ...}: { options = { - movOpts.networkModule.enable = lib.mkEnableOption "enables network configuration"; + movOpts.hardwareCfg.networkModule.enable = lib.mkEnableOption "enables network configuration"; }; - config = lib.mkIf config.movOpts.networkModule.enable { + config = lib.mkIf config.movOpts.hardwareCfg.networkModule.enable { networking = { networkmanager.enable = true; hostName = "${host}"; diff --git a/modules/sys/hardware/powerprofiles.nix b/modules/sys/hardware/powerprofiles.nix index e3ffe5c..00920dc 100755 --- a/modules/sys/hardware/powerprofiles.nix +++ b/modules/sys/hardware/powerprofiles.nix @@ -1,8 +1,8 @@ {lib, config, ... }: { options = { - movOpts.powerProfiles.enable = lib.mkEnableOption "enables power profiles"; + movOpts.hardwareCfg.powerProfiles.enable = lib.mkEnableOption "enables power profiles"; }; - config = lib.mkIf config.movOpts.powerProfiles.enable { + config = lib.mkIf config.movOpts.hardwareCfg.powerProfiles.enable { services = { power-profiles-daemon.enable = true; diff --git a/modules/sys/software/gaming/gaming_pkgs.nix b/modules/sys/software/gaming/gaming_pkgs.nix index 7608606..78ecfb1 100755 --- a/modules/sys/software/gaming/gaming_pkgs.nix +++ b/modules/sys/software/gaming/gaming_pkgs.nix @@ -12,9 +12,9 @@ let in { options = { - movOpts.gamingPkgs.enable = lib.mkEnableOption "enables gaming packages"; + movOpts.softwareCfg.gamingPkgs.enable = lib.mkEnableOption "enables gaming packages"; }; - config = lib.mkIf config.movOpts.gamingPkgs.enable { + config = lib.mkIf config.movOpts.softwareCfg.gamingPkgs.enable { environment.systemPackages = with pkgs; [ snes9x-gtk cust-openrct2 diff --git a/modules/sys/software/gaming/steam.nix b/modules/sys/software/gaming/steam.nix index a0de7b9..74a7583 100755 --- a/modules/sys/software/gaming/steam.nix +++ b/modules/sys/software/gaming/steam.nix @@ -1,8 +1,8 @@ {lib, config, ...}: { options = { - movOpts.steamConfig.enable = lib.mkEnableOption "enables steam configuration"; + movOpts.softwareCfg.steamConfig.enable = lib.mkEnableOption "enables steam configuration"; }; - config = lib.mkIf config.movOpts.steamConfig.enable { + config = lib.mkIf config.movOpts.softwareCfg.steamConfig.enable { programs.steam = { enable = true; remotePlay.openFirewall = true; diff --git a/modules/sys/software/packages.nix b/modules/sys/software/packages.nix index 930f93f..9579c69 100755 --- a/modules/sys/software/packages.nix +++ b/modules/sys/software/packages.nix @@ -1,8 +1,8 @@ {lib, config, pkgs, inputs, ... }: { options = { - movOpts.sysPkgs.enable = lib.mkEnableOption "enables default system packages"; + movOpts.softwareCfg.sysPkgs.enable = lib.mkEnableOption "enables default system packages"; }; - config = lib.mkIf config.movOpts.sysPkgs.enable { + config = lib.mkIf config.movOpts.softwareCfg.sysPkgs.enable { environment.systemPackages = with pkgs; [ alsa-lib alsa-utils diff --git a/modules/sys/software/programs.nix b/modules/sys/software/programs.nix index e8a3555..12893b8 100755 --- a/modules/sys/software/programs.nix +++ b/modules/sys/software/programs.nix @@ -1,8 +1,8 @@ {lib, config, pkgs, ...}: { options = { - movOpts.sysProgs.enable = lib.mkEnableOption "enables default system programs"; + movOpts.softwareCfg.sysProgs.enable = lib.mkEnableOption "enables default system programs"; }; - config = lib.mkIf config.movOpts.sysProgs.enable { + config = lib.mkIf config.movOpts.softwareCfg.sysProgs.enable { programs = { hyprland.enable = lib.mkDefault true; zsh.enable = lib.mkDefault true; diff --git a/modules/sys/software/services.nix b/modules/sys/software/services.nix index 47adfae..d3aef9a 100755 --- a/modules/sys/software/services.nix +++ b/modules/sys/software/services.nix @@ -1,8 +1,8 @@ {lib, config, ...}: { options = { - movOpts.sysServices.enable = lib.mkEnableOption "enables default system services"; + movOpts.softwareCfg.sysServices.enable = lib.mkEnableOption "enables default system services"; }; - config = lib.mkIf config.movOpts.sysServices.enable { + config = lib.mkIf config.movOpts.softwareCfg.sysServices.enable { services = { keyd = { enable = true; diff --git a/modules/sys/software/virtualization.nix b/modules/sys/software/virtualization.nix index 67a4e55..7925e63 100755 --- a/modules/sys/software/virtualization.nix +++ b/modules/sys/software/virtualization.nix @@ -1,8 +1,8 @@ {lib, config, username, ...}: { options = { - movOpts.virtConfig.enable = lib.mkEnableOption "enables virtualization"; + movOpts.softwareCfg.virtConfig.enable = lib.mkEnableOption "enables virtualization"; }; - config = lib.mkIf config.movOpts.virtConfig.enable { + config = lib.mkIf config.movOpts.softwareCfg.virtConfig.enable { virtualisation.libvirtd.enable = true; programs.virt-manager.enable = true; };