feat: added user2 and refactored to accommodate

home/modules/gui/apps/browsers/braveNix/default.nix

@@ -0,0 +1,11 @@
+{
+  pkgs,
+  ...
+}:
+{
+  home.packages = builtins.attrValues {
+    inherit (pkgs)
+      brave
+      ;
+  };
+}

home/modules/gui/apps/browsers/firefox/default.nix

@@ -12,21 +12,9 @@ in
   programs.firefox =
     let
       configPath = ./config;
-      bookmarksPath = import (configPath + /bookmarks) {
-        inherit
-          flake
-          ;
-      };
-      extensionsPath = import (configPath + /extensions) {
-        inherit
-          pkgs
-          ;
-      };
-      searchPath = import (configPath + /search) {
-        inherit
-          flake
-          ;
-      };
+      bookmarksPath = import (configPath + /bookmarks) { inherit flake; };
+      extensionsPath = import (configPath + /extensions) { inherit pkgs; };
+      searchPath = import (configPath + /search) { inherit flake; };
       settingsPath = import (configPath + /settings);
       themesPath = import (configPath + /themes);
     in

home/modules/gui/apps/browsers/firefoxNix/default.nix

@@ -0,0 +1,11 @@
+{
+  pkgs,
+  ...
+}:
+{
+  home.packages = builtins.attrValues {
+    inherit (pkgs)
+      firefox
+      ;
+  };
+}

home/modules/gui/apps/code/vsCode/config/userSettings.nix

@@ -6,7 +6,7 @@
 }:
 let
   inherit (flake.config.aesthetics.themes)
-    font
+    fonts
     ;
 in
 {
@@ -26,9 +26,9 @@ in
   "elmLS.disableElmLSDiagnostics" = true;
   "elmLS.elmReviewDiagnostics" = "warning";
   "editor.wordWrap" = "on";
-  "editor.fontSize" = font.size.applications;
-  "editor.fontFamily" = "'${font.name}', 'monospace', monospace";
-  "terminal.integrated.fontSize" = font.size.applications;
-  "terminal.integrated.fontFamily" = "'${font.name}', 'monospace', monospace";
+  "editor.fontSize" = fonts.sizes.applications.size0;
+  "editor.fontFamily" = "'${fonts.names.name0}', 'monospace', monospace";
+  "terminal.integrated.fontSize" = fonts.sizes.applications.size0;
+  "terminal.integrated.fontFamily" = "'${fonts.names.name0}', 'monospace', monospace";
   "editor.fontLigatures" = true;
 }

home/modules/gui/apps/code/zed/config/userSettings/config/interface/default.nix

@@ -1,17 +1,17 @@
 { flake, ... }:
 let
   inherit (flake.config.aesthetics.themes)
-    font
+    fonts
     ;
 in
 {
-  ui_font_family = font.name;
-  buffer_font_family = font.name;
+  ui_font_family = fonts.names.name0;
+  buffer_font_family = fonts.names.name0;
   hour_format = "hour12";
   vim_mode = false;
   show_whitespaces = "none";
-  ui_font_size = font.size.applications;
-  buffer_font_size = font.size.applications;
+  ui_font_size = fonts.sizes.applications.size0;
+  buffer_font_size = fonts.sizes.applications.size0;
   tab_size = 2;
   cursor_blink = true;
   theme = "Catppuccin Macchiato";

home/modules/gui/apps/code/zed/config/userSettings/config/terminal/default.nix

@@ -1,7 +1,7 @@
 { flake, ... }:
 let
   inherit (flake.config.aesthetics.themes)
-    font
+    fonts
     ;
 in
 {
@@ -25,9 +25,9 @@ in
     TERM = "ghostty";
   };
 
-  font_family = font.name;
+  font_family = fonts.names.name0;
   font_features = null;
-  font_size = font.size.terminal;
+  font_size = fonts.sizes.terminal.size0;
   line_height = "comfortable";
   option_as_meta = false;
   button = false;

home/modules/gui/apps/code/zed/config/userSettings/config/theme/default.nix

@@ -1,11 +1,11 @@
 { flake, ... }:
 let
   inherit (flake.config.aesthetics.themes)
-    currentTheme
+    currentThemes
     palettes
     ;
 
-  el = palettes.${currentTheme}.colours;
+  el = palettes.${currentThemes.theme0}.colours;
 in
 {
   accents = [

home/modules/gui/apps/code/zed/config/userSettings/default.nix

@@ -6,37 +6,14 @@
 }:
 let
   configPath = ./config;
-  assistantPath = import (configPath + /assistant) {
-    inherit
-      flake
-      ;
-  };
-
-  interfacePath = import (configPath + /interface) {
-    inherit
-      flake
-      ;
-  };
+  assistantPath = import (configPath + /assistant) { inherit flake; };
+  interfacePath = import (configPath + /interface) { inherit flake; };
   languagesPath = import (configPath + /languages);
   lspPath = import (configPath + /lsp);
-  terminalPath = import (configPath + /terminal) {
-    inherit
-      flake
-      ;
-  };
-
-  experimentalPath = import (configPath + /theme) {
-    inherit
-      flake
-      ;
-  };
+  terminalPath = import (configPath + /terminal) { inherit flake; };
+  experimentalPath = import (configPath + /theme) { inherit flake; };
   gitPath = import (configPath + /git);
-  miscPath = import (configPath + /misc) {
-    inherit
-      lib
-      pkgs
-      ;
-  };
+  miscPath = import (configPath + /misc) { inherit lib pkgs; };
 in
 {
   git = gitPath;

home/modules/gui/apps/code/zed/default.nix

@@ -8,18 +8,8 @@ let
   configPath = ./config;
   extensionsPath = import (configPath + /extensions);
   userKeymapsPath = import (configPath + /userKeymaps);
-  userSettingsPath = import (configPath + /userSettings) {
-    inherit
-      flake
-      lib
-      pkgs
-      ;
-  };
-  extraPackagesPath = import (configPath + /extraPackages) {
-    inherit
-      pkgs
-      ;
-  };
+  userSettingsPath = import (configPath + /userSettings) { inherit flake lib pkgs; };
+  extraPackagesPath = import (configPath + /extraPackages) { inherit pkgs; };
   packagePath = flake.inputs.zed-editor.packages.${pkgs.system}.default;
 in
 {

home/modules/gui/apps/emulators/ghostty/config/settings.nix

@@ -5,14 +5,14 @@
 }:
 let
   inherit (flake.config.aesthetics.themes)
-    font
+    fonts
     ;
 in
 {
   confirm-close-surface = false;
   window-decoration = false;
-  font-size = font.size.terminal;
-  font-family = font.name;
+  font-size = fonts.sizes.terminal.size0;
+  font-family = fonts.names.name0;
   window-padding-x = 10;
   window-padding-y = 10;
   copy-on-select = true;

home/modules/gui/apps/emulators/ghostty/config/themes.nix

@@ -1,11 +1,11 @@
 { flake, ... }:
 let
   inherit (flake.config.aesthetics.themes)
-    currentTheme
+    currentThemes
     palettes
     ;
 
-  el = palettes.${currentTheme}.colours;
+  el = palettes.${currentThemes.theme0}.colours;
 in
 {
   theme = {

home/modules/gui/apps/emulators/kitty/default.nix

@@ -4,15 +4,15 @@
 }:
 let
   inherit (flake.config.aesthetics.themes)
-    font
+    fonts
     ;
 in
 {
   programs.kitty = {
     enable = true;
     font = {
-      name = font.name;
-      size = font.size.terminal;
+      name = fonts.names.name0;
+      size = fonts.sizes.terminal.size0;
     };
     themeFile = "Catppuccin-Macchiato";
   };

home/modules/gui/apps/emulators/wezterm/config/extraConfig.nix

@@ -1,14 +1,14 @@
 { flake, ... }:
 let
   inherit (flake.config.aesthetics.themes)
-    font
+    fonts
     ;
 in
 ''
   return {
     color_scheme = "Catppuccin Macchiato",
-    font_size = ${builtins.toString font.size.terminal},
-    font = wezterm.font('${font.name}'),
+    font_size = ${builtins.toString fonts.sizes.terminal.size0},
+    font = wezterm.font('${fonts.names.name0}'),
     enable_tab_bar = false,
     window_close_confirmation = 'NeverPrompt',
     term = 'wezterm',

home/modules/gui/apps/media/audio/audioEditing/audioMetadata/beets/default.nix

@@ -0,0 +1,11 @@
+{
+  pkgs,
+  ...
+}:
+{
+  home.packages = builtins.attrValues {
+    inherit (pkgs)
+      beets
+      ;
+  };
+}

home/modules/gui/apps/media/images/imageEditing/blender/default.nix

@@ -0,0 +1,11 @@
+{
+  pkgs,
+  ...
+}:
+{
+  home.packages = builtins.attrValues {
+    inherit (pkgs)
+      blender
+      ;
+  };
+}

home/modules/gui/apps/media/images/imageEditing/darktable/default.nix

@@ -0,0 +1,11 @@
+{
+  pkgs,
+  ...
+}:
+{
+  home.packages = builtins.attrValues {
+    inherit (pkgs)
+      darktable
+      ;
+  };
+}

home/modules/gui/apps/media/images/imageEditing/gimp/default.nix

@@ -0,0 +1,11 @@
+{
+  pkgs,
+  ...
+}:
+{
+  home.packages = builtins.attrValues {
+    inherit (pkgs)
+      gimp
+      ;
+  };
+}

home/modules/gui/apps/media/modeling/blender/default.nix

@@ -0,0 +1,11 @@
+{
+  pkgs,
+  ...
+}:
+{
+  home.packages = builtins.attrValues {
+    inherit (pkgs)
+      blender
+      ;
+  };
+}

home/modules/gui/apps/media/modeling/default.nix

@@ -0,0 +1,10 @@
+let
+  content = builtins.readDir ./.;
+
+  dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
+
+  importList = map (name: ./. + "/${name}") dirContent;
+in
+{
+  imports = importList;
+}

home/modules/gui/apps/media/modeling/sweetHome/default.nix

@@ -0,0 +1,11 @@
+{
+  pkgs,
+  ...
+}:
+{
+  home.packages = builtins.attrValues {
+    inherit (pkgs.sweethome3d)
+      application
+      ;
+  };
+}

home/modules/gui/apps/media/video/videoEditing/kdenlive/default.nix

@@ -7,5 +7,8 @@
     inherit (pkgs.kdePackages)
       kdenlive
       ;
+    inherit (pkgs)
+      glaxnimate
+      ;
   };
 }

home/modules/gui/apps/messaging/tdesktop/default.nix

@@ -0,0 +1,11 @@
+{
+  pkgs,
+  ...
+}:
+{
+  home.packages = builtins.attrValues {
+    inherit (pkgs)
+      tdesktop
+      ;
+  };
+}

home/modules/gui/apps/messaging/whatsApp/default.nix

@@ -0,0 +1,11 @@
+{
+  pkgs,
+  ...
+}:
+{
+  home.packages = builtins.attrValues {
+    inherit (pkgs)
+      whatsapp-for-linux
+      ;
+  };
+}

home/modules/gui/apps/messaging/zoom/default.nix

@@ -0,0 +1,11 @@
+{
+  pkgs,
+  ...
+}:
+{
+  home.packages = builtins.attrValues {
+    inherit (pkgs)
+      zoom-us
+      ;
+  };
+}

home/modules/gui/apps/tools/celeste/default.nix

@@ -0,0 +1,11 @@
+{
+  pkgs,
+  ...
+}:
+{
+  home.packages = builtins.attrValues {
+    inherit (pkgs)
+      celeste
+      ;
+  };
+}

home/modules/gui/apps/tools/droidCam/default.nix

@@ -0,0 +1,8 @@
+{ pkgs, ... }:
+{
+  home.packages = builtins.attrValues {
+    inherit (pkgs)
+      droidcam
+      ;
+  };
+}

home/modules/gui/apps/tools/openRgb/default.nix

@@ -0,0 +1,12 @@
+{
+  pkgs,
+  ...
+}:
+{
+  home.packages = builtins.attrValues {
+    inherit (pkgs)
+      openrgb
+      ;
+
+  };
+}

home/modules/gui/apps/tools/openTablet/default.nix

@@ -0,0 +1,12 @@
+{
+  pkgs,
+  ...
+}:
+{
+  home.packages = builtins.attrValues {
+    inherit (pkgs)
+      opentabletdriver
+      ;
+
+  };
+}

home/modules/gui/apps/tools/synologyDrive/default.nix

@@ -0,0 +1,11 @@
+{
+  pkgs,
+  ...
+}:
+{
+  home.packages = builtins.attrValues {
+    inherit (pkgs)
+      synology-drive-client
+      ;
+  };
+}

home/modules/gui/apps/tools/virtManager/default.nix

@@ -0,0 +1,11 @@
+{
+  pkgs,
+  ...
+}:
+{
+  home.packages = builtins.attrValues {
+    inherit (pkgs)
+      virt-manager
+      ;
+  };
+}