modularize config

nix/base/base_packages.nix

@@ -1,5 +1,10 @@
-{ pkgs, ... }:
+{ pkgs, config, ... }:
 {
+  imports = [
+    # is wrapped in if statement to enable when needed
+    ../programs/gaming/default.nix
+  ];
+
   environment.systemPackages = with pkgs; [
     openssl
     dbus
@@ -23,6 +28,9 @@
     kdePackages.breeze-icons
     seahorse
     upower
+    (lib.mkIf config.conf.streamdeck.enable (callPackage
+      ../override/streamdeck.nix
+      { }))
   ];
 
   gtk.iconCache.enable = false;
@@ -32,19 +40,9 @@
   ];
 
   nix.settings.experimental-features = "nix-command flakes";
-  programs.fish.enable = true;
-  programs.fish.promptInit = ''
-    ${pkgs.any-nix-shell}/bin/any-nix-shell fish --info-right | source
-  '';
 
-  programs.nix-ld.enable = true;
-  programs.nix-ld.libraries = with pkgs; [
-    jdk
-    zlib
-  ];
   virtualisation.docker.enable = true;
 
-  programs.dconf.enable = true;
   services.upower.enable = true;
   services.printing.enable = true;
   services.dbus.enable = true;
@@ -56,13 +54,17 @@
     nssmdns4 = true;
     openFirewall = true;
   };
-  # services.xserver.desktopManager.gnome.extraGSettingsOverrides = ''
-  #   [org.gnome.desktop.interface]
-  #   gtk-theme='adw-gtk3'
-  #   cursor-theme='Bibata-Modern-Classsic'
-  #   cursor-size=24
-  # '';
 
+  programs.fish.enable = true;
+  programs.fish.promptInit = ''
+    ${pkgs.any-nix-shell}/bin/any-nix-shell fish --info-right | source
+  '';
+  programs.nix-ld.enable = true;
+  programs.nix-ld.libraries = with pkgs; [
+    jdk
+    zlib
+  ];
+  programs.dconf.enable = true;
   programs.direnv = {
     package = pkgs.direnv;
     silent = false;

nix/base/big_g.nix

@@ -7,7 +7,6 @@
     ];
 
     gnome.gnome-keyring.enable = true;
-
     gvfs.enable = true;
   };
 }

nix/base/common_hardware.nix

@@ -1,4 +1,7 @@
-{ pkgs, config, username, ... }:
+{ pkgs, config, ... }:
+let
+  username = config.conf.username;
+in
 {
   # Bootloader.
   boot.loader.systemd-boot.enable = true;
@@ -54,6 +57,14 @@
     username
   ];
 
+  boot.kernelPackages = config.conf.kernel;
+  boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
+  boot.kernelParams = [
+    "resume=\"PARTLABEL=SWAP\""
+  ] ++ config.conf.boot_params;
+
+  networking.hostName = config.conf.hostname;
+
   # allows user change later on
   users.mutableUsers = true;
   users.users.${username} = {
@@ -70,7 +81,6 @@
   };
 
   system.stateVersion = "unstable";
-  boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
 
   fileSystems."/" =
     {
@@ -103,8 +113,4 @@
 
   swapDevices =
     [{ device = "/dev/disk/by-label/SWAP"; }];
-
-  boot.kernelParams = [
-    "resume=\"PARTLABEL=SWAP\""
-  ] ++ config.programs.boot.boot_params;
 }

nix/base/env.nix

@@ -1,5 +1,5 @@
 { pkgs
-, username
+, config
 , ...
 }: {
   environment.variables = {
@@ -13,7 +13,7 @@
   environment.sessionVariables = {
     NIXOS_OZONE_WL = "1";
     GOPATH = "$HOME/.go";
-    FLAKE = "home/${username}/gits/dotFiles/nix";
+    FLAKE = "home/${config.conf.username}/gits/dotFiles/nix";
     # don't ask... marksman somehow requires this
     DOTNET_SYSTEM_GLOBALIZATION_INVARIANT = 1;
   };

nix/base/login_manager.nix

@@ -1,10 +1,10 @@
 { lib
 , config
 , pkgs
-, username
 , ...
 }:
 let
+  username = config.conf.username;
   session = {
     command = "${lib.getExe pkgs.hyprland} --config /etc/greetd/hyprgreet.conf";
     user = username;
@@ -38,7 +38,7 @@ in
   environment.etc."greetd/hyprgreet.conf".text = ''
     exec-once=gsettings set org.gnome.desktop.interface color-scheme 'prefer-dark'
 
-    monitor=${config.programs.ironbar.monitor},3440x1440@180,0x0,${config.programs.ironbar.scale}
+    monitor=${config.conf.monitor},3440x1440@180,0x0,${config.conf.scale}
     monitor=_,disable
 
     input {

nix/base/xkb_layout.nix

@@ -1,6 +1,6 @@
 { pkgs, ... }:
 let
-  dashie = pkgs.writeText "dashie" ''
+  layout = pkgs.writeText "dashie" ''
     xkb_symbols "dashie"
     {
       include "us(basic)"
@@ -16,7 +16,7 @@ in
   services.xserver.xkb.extraLayouts.dashie = {
     description = "US layout with 'umlaut'";
     languages = [ "eng" ];
-    symbolsFile = "${dashie}";
+    symbolsFile = "${layout}";
   };
 }