diff --git a/home/modules/fastfetch/default.nix b/home/modules/fastfetch/default.nix
index 30d7176..07c6e92 100644
--- a/home/modules/fastfetch/default.nix
+++ b/home/modules/fastfetch/default.nix
@@ -1,11 +1,15 @@
+{ lib, pkgs, osConfig, ... }:
 {
-    programs.fastfetch = {
+    programs.fastfetch = let
+            # TODO: move home mnager out of standalone so i dont need so use --impure for this
+            hostname = builtins.getEnv "HOSTNAME";
+            logoFile = ./. + "/host/${hostname}.txt";
+        in {
         enable = true;
         settings = {
             logo = {
                 # Created with Chafa
-                # chafa -s 26x13 -w 9 --symbols vhalf --view-size 26x13 cloud.png > cloud.txt
-                source = builtins.readFile ./cloud.txt;
+                source = builtins.readFile logoFile;
                 type = "data";
                 position = "left";
                 padding = {
diff --git a/home/modules/fastfetch/host/caenus/oracle.txt b/home/modules/fastfetch/host/caenus.txt
similarity index 100%
rename from home/modules/fastfetch/host/caenus/oracle.txt
rename to home/modules/fastfetch/host/caenus.txt
diff --git a/home/modules/fastfetch/host/cloud/cloud.txt b/home/modules/fastfetch/host/cloud.txt
similarity index 100%
rename from home/modules/fastfetch/host/cloud/cloud.txt
rename to home/modules/fastfetch/host/cloud.txt
diff --git a/home/modules/fastfetch/host/dockge.txt b/home/modules/fastfetch/host/dockge.txt
new file mode 100644
index 0000000..e69de29
diff --git a/home/modules/fastfetch/host/caenus/oracle.png b/home/modules/fastfetch/host/images/caenus.png
similarity index 100%
rename from home/modules/fastfetch/host/caenus/oracle.png
rename to home/modules/fastfetch/host/images/caenus.png
diff --git a/home/modules/fastfetch/host/cloud/cloud.png b/home/modules/fastfetch/host/images/cloud.png
similarity index 100%
rename from home/modules/fastfetch/host/cloud/cloud.png
rename to home/modules/fastfetch/host/images/cloud.png
diff --git a/home/modules/fastfetch/host/nix/nixos.png b/home/modules/fastfetch/host/images/nix.png
similarity index 100%
rename from home/modules/fastfetch/host/nix/nixos.png
rename to home/modules/fastfetch/host/images/nix.png
diff --git a/home/modules/fastfetch/host/nix/nixos.txt b/home/modules/fastfetch/host/nix.txt
similarity index 100%
rename from home/modules/fastfetch/host/nix/nixos.txt
rename to home/modules/fastfetch/host/nix.txt
diff --git a/home/modules/fastfetch/host/nix/default.nix b/home/modules/fastfetch/host/nix/default.nix
deleted file mode 100644
index effb24a..0000000
--- a/home/modules/fastfetch/host/nix/default.nix
+++ /dev/null
@@ -1,84 +0,0 @@
-{
-    programs.fastfetch = {
-        enable = true;
-        settings = {
-            logo = {
-                # Created with Chafa
-                # chafa -s 26x13 -w 9 --symbols stipple+vhalf --view-size 26x13 nixos.png > nixos.txt
-                source = builtins.readFile ./nixos.txt;
-                type = "data";
-                position = "left";
-                padding = {
-                    top = 0;
-                };
-            };
-            display = {
-                separator = " ";
-            };
-            modules = [
-                {
-                    key = "╭───────────╮";
-                    type = "custom";
-                }
-                {
-                    key = "│ {#31} user    {#keys}│";
-                    type = "title";
-                    format = "{user-name}";
-                }
-                {
-                    key = "│ {#32}󰇅 host    {#keys}│";
-                    type = "title";
-                    format = "{host-name}";
-                }
-                {
-                    key = "│ {#33}󰅐 uptime  {#keys}│";
-                    type = "uptime";
-                }
-                {
-                    key = "│ {#34}{icon} distro  {#keys}│";
-                    type = "os";
-                }
-                {
-                    key = "│ {#36}󰇄 desktop {#keys}│";
-                    type = "de";
-                }
-                {
-                    key = "│ {#32} shell   {#keys}│";
-                    type = "shell";
-                }
-                {
-                    key = "│ {#33}󰍛 cpu     {#keys}│";
-                    type = "cpu";
-                    showPeCoreCount = true;
-                }
-                {
-                    key = "│ {#34}󰉉 disk    {#keys}│";
-                    type = "disk";
-                    folders = "/";
-                }
-                {
-                    key = "│ {#35} memory  {#keys}│";
-                    type = "memory";
-                }
-                {
-                    key = "│ {#36}󰩟 network {#keys}│";
-                    type = "localip";
-                    format = "{ipv4} ({ifname})";
-                }
-                {
-                    key = "├───────────┤";
-                    type = "custom";
-                }
-                {
-                    key = "│ {#39} colors  {#keys}│";
-                    type = "colors";
-                    symbol = "circle";
-                }
-                {
-                    key = "╰───────────╯";
-                    type = "custom";
-                }
-            ];
-        };
-    };  
-}
\ No newline at end of file
diff --git a/home/modules/fastfetch/host/proxy.txt b/home/modules/fastfetch/host/proxy.txt
new file mode 100644
index 0000000..e69de29
diff --git a/host/caenus/default.nix b/host/caenus/default.nix
index a4bee68..aa5e20b 100644
--- a/host/caenus/default.nix
+++ b/host/caenus/default.nix
@@ -47,8 +47,7 @@ in {
     };
   };
 
-  ## PACKAGES ##
-
+  ## ENVIORMENT & PACKAGES ##
   environment.systemPackages = with pkgs; [
     git
     micro
@@ -57,4 +56,8 @@ in {
     sshfs
     wget
   ];
+  
+  environment.variables = {
+    HOSTNAME = hostname;
+  };
 }
diff --git a/host/cloud/default.nix b/host/cloud/default.nix
index eaeff0c..793420a 100644
--- a/host/cloud/default.nix
+++ b/host/cloud/default.nix
@@ -55,7 +55,7 @@ in {
     };
   };
 
-  ## PACKAGES ##
+  ## ENVIORMENT & PACKAGES ##
   nixpkgs.overlays = [ (import ./overlays) ];
   environment.systemPackages = with pkgs; [
     git
@@ -68,4 +68,8 @@ in {
     snapraid-runner 
     wget 
   ];
+  
+  environment.variables = {
+    HOSTNAME = hostname;
+  };
 }
diff --git a/host/dockge/default.nix b/host/dockge/default.nix
index 84c43d0..5f08cbc 100644
--- a/host/dockge/default.nix
+++ b/host/dockge/default.nix
@@ -43,7 +43,7 @@ in {
     };
   };
 
-  ## PACKAGES ##
+  ## ENVIORMENT & PACKAGES ##
   environment.systemPackages = with pkgs; [
     git
     micro
@@ -52,4 +52,8 @@ in {
     sshfs
     wget
   ];
+
+  environment.variables = {
+    HOSTNAME = hostname;
+  };
 }
diff --git a/host/nix/default.nix b/host/nix/default.nix
index 06dc99c..e633344 100644
--- a/host/nix/default.nix
+++ b/host/nix/default.nix
@@ -39,7 +39,7 @@ in {
     };
   };
 
-  ## PACKAGES ##
+  ## ENVIORMENT & PACKAGES ##
   environment.systemPackages = with pkgs; [
     git
     micro
@@ -51,6 +51,10 @@ in {
     x2goserver
   ];
 
+  environment.variables = {
+    HOSTNAME = hostname;
+  };
+
   ## VS CODE ##
   programs.nix-ld = {
     enable = true;
diff --git a/host/proxy/default.nix b/host/proxy/default.nix
index acbfc66..9d9ced6 100644
--- a/host/proxy/default.nix
+++ b/host/proxy/default.nix
@@ -3,10 +3,6 @@
 let
 
   hostname = "proxy";
-  admin = "toph";
-  password = "[REDACTED]";
-  timeZone = "America/New_York";
-  defaultLocale = "en_US.UTF-8";
 
 in {
 
@@ -50,7 +46,7 @@ in {
     };
   };
 
-  ## PACKAGES ##
+  ## ENVIORMENT & PACKAGES ##
   environment.systemPackages = with pkgs; [
     git
     micro
@@ -58,4 +54,8 @@ in {
     ranger
     sshfs
   ];
+
+  environment.variables = {
+    HOSTNAME = hostname;
+  };
 }