diff --git a/home.nix b/home.nix
index d00d82f..e2e3951 100644
--- a/home.nix
+++ b/home.nix
@@ -27,22 +27,23 @@
     # general packages list
     ./modules/packages.nix
     # cli tools
-    ./modules/fish.nix
-    ./modules/nixvim.nix
-    ./modules/yazi.nix
-    ./modules/btop.nix
-    ./modules/atuin.nix
-    ./modules/zoxide.nix
-    ./modules/mako.nix
-    ./modules/ssh.nix
-    ./modules/bat.nix
-    ./modules/git.nix
+    ./modules/cli/fish.nix
+    ./modules/cli/nixvim.nix
+    ./modules/cli/yazi.nix
+    ./modules/cli/btop.nix
+    ./modules/cli/atuin.nix
+    ./modules/cli/zoxide.nix
+    ./modules/cli/ssh.nix
+    ./modules/cli/bat.nix
+    ./modules/cli/git.nix
+    ./modules/cli/fastfetch.nix
     # gui tools
-    ./modules/kitty.nix
-    ./modules/satty.nix
+    ./modules/gui/kitty.nix
+    ./modules/gui/satty.nix
+    ./modules/gui/mako.nix
     # status bars
-    ./modules/ashell.nix
-    ./modules/waybar.nix
+    ./modules/bars/ashell.nix
+    ./modules/bars/waybar.nix
     # hypr
     ./modules/hypr/hyprland.nix
     ./modules/hypr/hyprlauncher.nix
@@ -56,12 +57,9 @@
 
   # === DOTFILES IMPORT ===
   home.file = {
-    ".config/fastfetch".source = ./dotfiles/fastfetch;
     ".config/MangoHud".source = ./dotfiles/mangohud;
-    # ".config/nvim".source = ./dotfiles/nvim;
     ".config/gtk-3.0/settings.ini".source = ./dotfiles/gtk-3.0/settings.ini;
     ".config/gtk-4.0".source = ./dotfiles/gtk-4.0;
-    # ".config/hypr".source = ./dotfiles/hypr;
     ".config/mimeapps.list".source = ./dotfiles/mimeapps.list;
     ".local/bin".source = ./scripts;
   };
diff --git a/modules/ashell.nix b/modules/bars/ashell.nix
similarity index 100%
rename from modules/ashell.nix
rename to modules/bars/ashell.nix
diff --git a/modules/waybar.nix b/modules/bars/waybar.nix
similarity index 100%
rename from modules/waybar.nix
rename to modules/bars/waybar.nix
diff --git a/modules/atuin.nix b/modules/cli/atuin.nix
similarity index 100%
rename from modules/atuin.nix
rename to modules/cli/atuin.nix
diff --git a/modules/bat.nix b/modules/cli/bat.nix
similarity index 100%
rename from modules/bat.nix
rename to modules/cli/bat.nix
diff --git a/modules/btop.nix b/modules/cli/btop.nix
similarity index 100%
rename from modules/btop.nix
rename to modules/cli/btop.nix
diff --git a/modules/cli/fastfetch.nix b/modules/cli/fastfetch.nix
new file mode 100644
index 0000000..ea27e69
--- /dev/null
+++ b/modules/cli/fastfetch.nix
@@ -0,0 +1,62 @@
+{ config, pkgs, ... }:
+
+{
+  programs.fastfetch = {
+    enable = true;
+    settings = {
+      modules = [
+        "title"
+        "separator"
+        "os"
+        "host"
+        "kernel"
+        "packages"
+        "separator"
+        "wm"
+        "shell"
+        "terminal"
+        "theme"
+        "font"
+        "locale"
+        "separator"
+        "display"
+        "cpu"
+        "gpu"
+        "memory"
+        "disk"
+        "battery"
+        "separator"
+        "wifi"
+        "localip"
+        "break"
+        "colors"
+      ];
+    };
+  };
+
+  xdg.configFile."fastfetch/startup.jsonc".text = builtins.toJSON {
+    logo = {
+      source = "arch_small";
+      padding = {
+        bottom = 1;
+      };
+    };
+    display = {
+      separator = " ➜ ";
+    };
+    modules = [
+      "title"
+      "kernel"
+      "packages"
+      "shell"
+      "battery"
+      {
+        type = "separator";
+        string = " • ";
+      }
+      "break"
+      "break"
+      "break"
+    ];
+  };
+}
diff --git a/modules/fish.nix b/modules/cli/fish.nix
similarity index 100%
rename from modules/fish.nix
rename to modules/cli/fish.nix
diff --git a/modules/git.nix b/modules/cli/git.nix
similarity index 100%
rename from modules/git.nix
rename to modules/cli/git.nix
diff --git a/modules/nixvim.nix b/modules/cli/nixvim.nix
similarity index 100%
rename from modules/nixvim.nix
rename to modules/cli/nixvim.nix
diff --git a/modules/ssh.nix b/modules/cli/ssh.nix
similarity index 100%
rename from modules/ssh.nix
rename to modules/cli/ssh.nix
diff --git a/modules/yazi.nix b/modules/cli/yazi.nix
similarity index 100%
rename from modules/yazi.nix
rename to modules/cli/yazi.nix
diff --git a/modules/zoxide.nix b/modules/cli/zoxide.nix
similarity index 100%
rename from modules/zoxide.nix
rename to modules/cli/zoxide.nix
diff --git a/modules/kitty.nix b/modules/gui/kitty.nix
similarity index 100%
rename from modules/kitty.nix
rename to modules/gui/kitty.nix
diff --git a/modules/mako.nix b/modules/gui/mako.nix
similarity index 100%
rename from modules/mako.nix
rename to modules/gui/mako.nix
diff --git a/modules/satty.nix b/modules/gui/satty.nix
similarity index 100%
rename from modules/satty.nix
rename to modules/gui/satty.nix