Modularized GUI for potentially new environments in the future

homeConfig/modules/bash/config/alias.nix

@@ -1,5 +1,3 @@
 {
   nixup = "sudo nixos-rebuild switch --flake /etc/nixos/.#desktop";
-  chat = "weechat";
-  open = "xdg-open";
 }

homeConfig/modules/gui/default.nix

@@ -1,4 +1,4 @@
-{ pkgs, lib, config, ... }:
+{ lib, config, ... }:
 
 with lib;
 let
@@ -6,39 +6,10 @@ let
 
 in
 { options.modules.gui = { enable = mkEnableOption "gui"; };
-  imports = [ ./modules ];
+  imports = [ ./desktopEnvironments ];
   config = mkIf cfg.enable {
-    wayland.windowManager.sway = import ./config/sway.nix { inherit pkgs config lib; };
-    programs.rofi = import ./config/rofi.nix { inherit pkgs config lib; };
-    programs.bash.profileExtra = import ./config/shellHook.nix;
-
     modules = {
-      alacritty.enable = true;
+      sway.enable = true;
-      browsers.enable = true;
-      corn.enable = true;
-      fun.enable = true;
-      guiUtils.enable = true;
-      neovim.enable = true;
     };
-
-    gtk = {
-      enable = true;
-      theme.package = pkgs.juno-theme;
-      theme.name = "Juno-ocean";
-      iconTheme.package = pkgs.qogir-icon-theme;
-      iconTheme.name = "Qogir";
-    };
-
-    qt = {
-      enable = true;
-      style.package = pkgs.juno-theme;
-      platformTheme = "gtk";
-    };
-
-    programs = {
-      imv.enable = true;
-    };
-
-    fonts.fontconfig.enable = true;
   };
 }

homeConfig/modules/gui/desktopEnvironments/default.nix

@@ -0,0 +1,5 @@
+{
+  imports = [
+    ./sway
+  ];
+}

homeConfig/modules/gui/desktopEnvironments/modules/alacritty/default.nix

@@ -14,9 +14,9 @@ in
 
     home.packages = with pkgs; [
       terminus-nerdfont
-      monocraft
+      noto-fonts
-      ranger
+      noto-fonts-cjk
-      highlight
+      noto-fonts-emoji
     ];
   };
 }

homeConfig/modules/gui/desktopEnvironments/modules/default.nix

@@ -2,10 +2,8 @@
   imports = [
     ./alacritty
     ./browsers
-
     ./corn
     ./fun
-
     ./guiUtils
     ./neovim
   ];

homeConfig/modules/gui/desktopEnvironments/modules/guiUtils/default.nix

@@ -10,7 +10,9 @@ in
     programs.btop.enable = true;
     home.packages = with pkgs; [
       gimp
+      okular
       pdftk
+
       teams-for-linux
       zoom-us
       exercism

homeConfig/modules/gui/desktopEnvironments/sway/default.nix

@@ -0,0 +1,61 @@
+{ pkgs, lib, config, ... }:
+
+with lib;
+let
+  cfg = config.modules.sway;
+
+in
+{ options.modules.sway = { enable = mkEnableOption "sway"; };
+  imports = [ ../modules ];
+  config = mkIf cfg.enable {
+    wayland.windowManager.sway = import ./config/sway.nix { inherit pkgs config lib; };
+    programs.rofi = import ./config/rofi.nix { inherit pkgs config lib; };
+
+    programs.bash = {
+      profileExtra = import ./config/shellHook.nix;
+      shellAliases = {
+        open = "xdg-open";
+      };
+    };
+
+    gtk = {
+      enable = true;
+      theme.package = pkgs.juno-theme;
+      theme.name = "Juno-ocean";
+      iconTheme.package = pkgs.qogir-icon-theme;
+      iconTheme.name = "Qogir";
+    };
+
+    qt = {
+      enable = true;
+      style.package = pkgs.juno-theme;
+      platformTheme = "gtk";
+    };
+
+    programs = {
+      imv.enable = true;
+    };
+
+    home.packages = with pkgs; [
+      xdg-utils
+      grim
+      slurp
+      wl-clipboard
+      autotiling
+
+      ranger
+      highlight
+    ];
+
+    fonts.fontconfig.enable = true;
+
+    modules = {
+      alacritty.enable = true;
+      browsers.enable = true;
+      corn.enable = true;
+      fun.enable = true;
+      guiUtils.enable = true;
+      neovim.enable = true;
+    };
+  };
+}

homeConfig/modules/utils/modules/irc/default.nix

@@ -10,5 +10,8 @@ in
     home.packages = with pkgs; [
       weechat
     ];
+    programs.bash.shellAliases = {
+      chat = "weechat";
+    };
   };
 }