Re-organize Nix Modules

- Move all programs into system folder
- Create `default.nix` for each folder to reduce number of imports
  in configuration.nix
- Rename some modules to be more generic and less package
  specific to allow for easy swapping of programs in the future
- Update flake.lock

flake.lock

@@ -223,11 +223,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1711133180,
-        "narHash": "sha256-WJOahf+6115+GMl3wUfURu8fszuNeJLv9qAWFQl3Vmo=",
+        "lastModified": 1711554349,
+        "narHash": "sha256-RypwcWEIFePBI0Hubfj4chanbM/G2yzJzC6wgz+dmS4=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "1c2c5e4cabba4c43504ef0f8cc3f3dfa284e2dbb",
+        "rev": "179f6acaf7c068c7870542cdae72afec9427a5b0",
         "type": "github"
       },
       "original": {
@@ -276,11 +276,11 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1711124224,
-        "narHash": "sha256-l0zlN/3CiodvWDtfBOVxeTwYSRz93muVbXWSpaMjXxM=",
+        "lastModified": 1711460390,
+        "narHash": "sha256-akSgjDZL6pVHEfSE6sz1DNSXuYX6hq+P/1Z5IoYWs7E=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "56528ee42526794d413d6f244648aaee4a7b56c0",
+        "rev": "44733514b72e732bd49f5511bd0203dea9b9a434",
         "type": "github"
       },
       "original": {

flake.nix

@@ -25,7 +25,6 @@
         timezone = "America/New_York";         # Time Zone
         locale = "en_US.UTF-8";                # Locale
         diskoConfig = "luks-btrfs-subvolumes"; # Select the disko config that was used to partition drive
-        desktopEnvironment = "gnome";          # Window Manager / Desktop Environment to use
         hardwareConfiguration = "qemu-vm";     # Select the hardware config from hardware directory
       };
 
@@ -36,8 +35,8 @@
         email = "balajsra@umich.edu"; # Email (used for certain configurations)
         dotfilesDir = "~/.dotfiles";  # Absolute path of the local repo
         theme = "dracula";            # Selected theme from themes directory
-        wm = "dwm";                   # Selected window manager or desktop environment
-        wmType = "x11";               # x11 or wayland
+        desktop = "gnome";            # Selected window manager or desktop environment
+        desktopType = "x11";          # x11 or wayland
         browser = "vivaldi";          # Default browser
         term = "kitty";               # Default terminal command
         editor = "vim";               # Default editor

profiles/personal/configuration.nix

@@ -6,18 +6,19 @@
 
 {
   imports = [
-    (../../hardware + "/${systemSettings.hardwareConfiguration}.nix")
-    ../../system/hardware/kernel.nix
-    ../../system/hardware/bluetooth.nix
-    ../../system/hardware/opengl.nix
-    ../../system/hardware/openrgb.nix
-    ../../system/hardware/printing.nix
-    ../../system/hardware/automount.nix
-    ../../system/security/firewall.nix
-    ../../system/app/gaming/steam.nix
-    ../../system/app/gaming/gamemode.nix
-    ../../system/hardware/audio.nix
-    (../../system/gui + "/${systemSettings.desktopEnvironment}.nix")
+    (../../hosts + "/${systemSettings.hardwareConfiguration}.nix")
+    (../../system/gui + "/${userSettings.desktop}.nix")
+    ../../system/hardware/default.nix
+    (../../system/programs/browser + "/${userSettings.browser}.nix")
+    ../../system/programs/development/default.nix
+    ../../system/programs/gaming/default.nix
+    ../../system/programs/launcher/default.nix
+    ../../system/programs/media/default.nix
+    ../../system/programs/productivity/default.nix
+    (../../system/programs/terminal + "/${userSettings.term}.nix")
+    ../../system/programs/utilities/default.nix
+    ../../system/security/default.nix
+    ../../system/util/default.nix
   ];
 
   nix = {

profiles/personal/home.nix

@@ -10,63 +10,8 @@
   home.stateVersion = "23.11";
 
   home.packages = (with pkgs; [
-    # Terminal
-    kitty
-
-    # Browser
-    vivaldi
-
-    # Launcher
-    dmenu
-    rofi
-
-    # Development
-    vscode
-
-    # Utilities
-    syncthing
-    bitwarden
-    ventoy
-    via
-    prusa-slicer
-
-    # Office
-    xournalpp
-    gimp
-    gnucash
-
-    # Gaming
-    wine
-    bottles
-    lutris
-    protonup-qt
-
-    # Media
-    gimp
-    mpv
-    blender
-    obs-studio
-    ffmpeg
-    trackma-gtk
-
-    # Messaging
-    beeper
-    discord
-    signal-desktop
-    zoom-us
-
-    # Productivity
-    anytype
-    logseq
-
-    # Music / Podcasts
-    pocket-casts
-    spotify
-    spicetify-cli
   ]);
 
-  services.syncthing.enable = true;
-
   xdg.enable = true;
   xdg.userDirs = {
     enable = true;

system/app/gaming/gamemode.nix

@@ -1,5 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-{
-  programs.gamemode.enable = true;
-}

system/gui/default.nix

@@ -0,0 +1,8 @@
+{ config, lib, pkgs, ... }:
+
+{
+  imports = [
+    ./x11.nix
+    ./fonts.nix
+  ];
+}

system/gui/dwm.nix

@@ -2,11 +2,8 @@
 
 {
   imports = [
-    ./x11.nix
+    ./default.nix
     ./lightdm.nix
-    ../app/terminal/kitty.nix
-    ../app/launcher/dmenu.nix
-    ../app/launcher/rofi.nix
   ];
 
   services.xserver.windowManager.dwm.enable = true;

system/gui/fonts.nix

@@ -2,6 +2,7 @@
 
 {
   fonts.packages = with pkgs; [
+    corefonts
     powerline
     font-awesome
     ubuntu_font_family

system/gui/gnome.nix

@@ -2,7 +2,7 @@
 
 {
   imports = [
-    ./x11.nix
+    ./default.nix
   ];
 
   services.xserver.displayManager.gdm.enable = true;

system/gui/x11.nix

@@ -1,12 +1,6 @@
 { config, lib, pkgs, ... }:
 
 {
-  imports = [
-    ../util/dbus.nix
-    ../util/gnome-keyring.nix
-    ./fonts.nix
-  ];
-
   services.xserver = {
     enable = true;
     xkb = {

system/hardware/default.nix

@@ -0,0 +1,13 @@
+{ config, lib, pkgs, ... }:
+
+{
+  imports = [
+    ./audio.nix
+    ./automount.nix
+    ./bluetooth.nix
+    ./kernel.nix
+    ./opengl.nix
+    ./openrgb.nix
+    ./printing.nix
+  ];
+}

system/programs/browser/vivaldi.nix

@@ -0,0 +1,7 @@
+{ config, lib, pkgs, ... }:
+
+{
+  environment.systemPackages = with pkgs; [
+    vivaldi
+  ];
+}

system/programs/development/default.nix

@@ -0,0 +1,7 @@
+{ config, lib, pkgs, ... }:
+
+{
+  imports = [
+    ./vscode.nix
+  ];
+}

system/programs/development/vscode.nix

@@ -0,0 +1,7 @@
+{ config, lib, pkgs, ... }:
+
+{
+  environment.systemPackages = with pkgs; [
+    vscode
+  ];
+}

system/programs/gaming/compatibility.nix

@@ -0,0 +1,8 @@
+{ config, lib, pkgs, ... }:
+
+{
+  environment.systemPackages = with pkgs; [
+    wine
+    protonup-qt
+  ];
+}

system/programs/gaming/default.nix

@@ -0,0 +1,9 @@
+{ config, lib, pkgs, ... }:
+
+{
+  imports = [
+    ./utilities.nix
+    ./launchers.nix
+    ./compatibility.nix
+  ];
+}

system/programs/gaming/launchers.nix

@@ -6,4 +6,11 @@
     remotePlay.openFirewall = true;
     gamescopeSession.enable = true;
   };
+
+  environment.systemPackages = with pkgs; [
+    bottles
+    lutris
+    heroic
+    prismlauncher
+  ];
 }

system/programs/gaming/utilities.nix

@@ -0,0 +1,15 @@
+{ config, lib, pkgs, ... }:
+
+{
+  programs.gamemode = {
+    enable = true;
+    # settings = {};
+    # enableRenice = true;
+  };
+
+  environment.systemPackages = with pkgs; [
+    mangohud
+    goverlay
+    vkbasalt
+  ];
+}

system/programs/launcher/default.nix

@@ -0,0 +1,8 @@
+{ config, lib, pkgs, ... }:
+
+{
+  imports = [
+    ./dmenu.nix
+    ./rofi.nix
+  ];
+}

system/programs/launcher/dmenu.nix

@@ -0,0 +1,7 @@
+{ config, lib, pkgs, ... }:
+
+{
+  environment.systemPackages = with pkgs; [
+    dmenu
+  ];
+}

system/programs/launcher/rofi.nix

@@ -0,0 +1,7 @@
+{ config, lib, pkgs, ... }:
+
+{
+  environment.systemPackages = with pkgs; [
+    rofi
+  ];
+}

system/programs/media/creation.nix

@@ -0,0 +1,8 @@
+{ config, lib, pkgs, ... }:
+
+{
+  environment.systemPackages = with pkgs; [
+    blender
+    obs-studio
+  ];
+}

system/programs/media/default.nix

@@ -0,0 +1,9 @@
+{ config, lib, pkgs, ... }:
+
+{
+  imports = [
+    ./players.nix
+    ./editors.nix
+    ./creation.nix
+  ];
+}

system/programs/media/editors.nix

@@ -0,0 +1,9 @@
+{ config, lib, pkgs, ... }:
+
+{
+  environment.systemPackages = with pkgs; [
+    gimp
+    libsForQt5.kdenlive
+    ffmpeg
+  ];
+}

system/programs/media/players.nix

@@ -0,0 +1,12 @@
+{ config, lib, pkgs, ... }:
+
+{
+  environment.systemPackages = with pkgs; [
+    gnome.eog
+    mpv
+    trackma-gtk
+    pocket-casts
+    spotify
+    spicetify-cli
+  ];
+}

system/programs/productivity/communication.nix

@@ -0,0 +1,10 @@
+{ config, lib, pkgs, ... }:
+
+{
+  environment.systemPackages = with pkgs; [
+    beeper
+    discord
+    signal-desktop
+    zoom-us
+  ];
+}

system/programs/productivity/default.nix

@@ -0,0 +1,10 @@
+{ config, lib, pkgs, ... }:
+
+{
+  imports = [
+    ./office.nix
+    ./finance.nix
+    ./notes.nix
+    ./communication.nix
+  ];
+}

system/programs/productivity/finance.nix

@@ -0,0 +1,7 @@
+{ config, lib, pkgs, ... }:
+
+{
+  environment.systemPackages = with pkgs; [
+    gnucash
+  ];
+}

system/programs/productivity/notes.nix

@@ -0,0 +1,8 @@
+{ config, lib, pkgs, ... }:
+
+{
+  environment.systemPackages = with pkgs; [
+    anytype
+    logseq
+  ];
+}

system/programs/productivity/office.nix

@@ -0,0 +1,10 @@
+{ config, lib, pkgs, ... }:
+
+{
+  environment.systemPackages = with pkgs; [
+    onlyoffice-bin
+    xournalpp
+    zathura
+    libsForQt5.okular
+  ];
+}

system/programs/terminal/kitty.nix

@@ -0,0 +1,7 @@
+{ config, lib, pkgs, ... }:
+
+{
+  environment.systemPackages = with pkgs; [
+    kitty
+  ];
+}

system/programs/utilities/3d-printing.nix

@@ -0,0 +1,7 @@
+{ config, lib, pkgs, ... }:
+
+{
+  environment.systemPackages = with pkgs; [
+    prusa-slicer
+  ];
+}

system/programs/utilities/bootable-media.nix

@@ -0,0 +1,7 @@
+{ config, lib, pkgs, ... }:
+
+{
+  environment.systemPackages = with pkgs; [
+    ventoy
+  ];
+}

system/programs/utilities/default.nix

@@ -0,0 +1,11 @@
+{ config, lib, pkgs, ... }:
+
+{
+  imports = [
+    ./3d-printing.nix
+    ./bootable-media.nix
+    ./file-syncing.nix
+    ./keyboard-configuration.nix
+    ./passwords.nix
+  ];
+}

system/programs/utilities/file-syncing.nix

@@ -0,0 +1,5 @@
+{ config, lib, pkgs, ... }:
+
+{
+  services.syncthing.enable = true;
+}

system/programs/utilities/keyboard-configuration.nix

@@ -0,0 +1,7 @@
+{ config, lib, pkgs, ... }:
+
+{
+  environment.systemPackages = with pkgs; [
+    via
+  ];
+}

system/programs/utilities/passwords.nix

@@ -0,0 +1,7 @@
+{ config, lib, pkgs, ... }:
+
+{
+  environment.systemPackages = with pkgs; [
+    bitwarden
+  ];
+}

system/security/default.nix

@@ -0,0 +1,8 @@
+{ config, lib, pkgs, ... }:
+
+{
+  imports = [
+    ./firewall.nix
+    ./gpg.nix
+  ];
+}

system/util/default.nix

@@ -0,0 +1,8 @@
+{ config, lib, pkgs, ... }:
+
+{
+  imports = [
+    ./dbus.nix
+    ./gnome-keyring.nix
+  ];
+}