diff --git a/pkgs/fastfetch/default.nix b/pkgs/fastfetch/default.nix
index 7cf13c3..0e09cb7 100644
--- a/pkgs/fastfetch/default.nix
+++ b/pkgs/fastfetch/default.nix
@@ -1,50 +1,131 @@
-{...}: {
+{
   programs.fastfetch = {
     enable = true;
+
     settings = {
+      logo = {
+        padding = {
+          top = 2;
+          left = 1;
+          right = 2;
+        };
+      };
 
-  logo = {
-    type = "small";
-    padding = {
-      right = 5;
+      display = {
+        separator = "  ";
+      };
+
+      modules = [
+        # Title
+        {
+          type = "title";
+          format = "{#1}╭───────────── {#}{user-name-colored}";
+        }
+
+        # System Information Header
+        {
+          type = "custom";
+          format = "{#1}│ {#}System Information";
+        }
+        {
+          type = "os";
+          key = "│  {#keys}󰍹 OS";
+        }
+        {
+          type = "kernel";
+          key = "│  {#keys}󰒋 Kernel";
+        }
+        {
+          type = "uptime";
+          key = "│  {#keys}󰅐 Uptime";
+        }
+        {
+          type = "packages";
+          key = "│  {#keys}󰏖 Packages";
+          format = "{all}";
+        }
+
+        {
+          type = "custom";
+          format = "{#1}│";
+        }
+
+        # Desktop Environment
+        {
+          type = "custom";
+          format = "{#1}│ {#}Desktop Environment";
+        }
+        {
+          type = "de";
+          key = "│  {#keys}󰧨 DE";
+        }
+        {
+          type = "wm";
+          key = "│  {#keys}󱂬 WM";
+        }
+        {
+          type = "wmtheme";
+          key = "│  {#keys}󰉼 Theme";
+        }
+        {
+          type = "display";
+          key = "│  {#keys}󰹑 Resolution";
+        }
+        {
+          type = "shell";
+          key = "│  {#keys}󰞷 Shell";
+        }
+        {
+          type = "terminalfont";
+          key = "│  {#keys}󰛖 Font";
+        }
+
+        {
+          type = "custom";
+          format = "{#1}│";
+        }
+
+        # Hardware Information
+        {
+          type = "custom";
+          format = "{#1}│ {#}Hardware Information";
+        }
+        {
+          type = "cpu";
+          key = "│  {#keys}󰻠 CPU";
+        }
+        {
+          type = "gpu";
+          key = "│  {#keys}󰢮 GPU";
+        }
+        {
+          type = "memory";
+          key = "│  {#keys}󰍛 Memory";
+        }
+        {
+          type = "disk";
+          key = "│  {#keys}󰋊 Disk (/)";
+          folders = "/";
+        }
+
+        {
+          type = "custom";
+          format = "{#1}│";
+        }
+
+        # Colors
+        {
+          type = "colors";
+          key = "│";
+          symbol = "circle";
+        }
+
+        # Footer
+        {
+          type = "custom";
+          format = "{#1}╰───────────────────────────────╯";
+        }
+      ];
     };
   };
-
-  modules = [
-    {
-      key = "{#31}██ Distro";
-      type = "os";
-    }
-    {
-      key = "{#32}██ Kernel";
-      type = "kernel";
-    }
-    {
-      key = "{#33}██ Uptime";
-      type = "uptime";
-    }
-    {
-      key = "{#35}██ Shell";
-      type = "shell";
-    }
-    {
-      key = "{#36}██ Local IP";
-      type = "localip";
-    }
-    {
-      key = "{#37}██ Memory";
-      type = "memory";
-    }
-    {
-      key = "{#38}██ Home";
-      type = "disk";
-      folders = "/";
-    }
-  ];
-    };
-
-  };
-  # home.file.".config/fastfetch/config.jsonc" = {
-  #   source = builtins.toPath ./small.jsonc;
-  # };
 }