diff --git a/home-manager/cli-tools.nix b/home-manager/cli-tools.nix
index 9933e0f..6725458 100644
--- a/home-manager/cli-tools.nix
+++ b/home-manager/cli-tools.nix
@@ -96,82 +96,5 @@
       };
     };
 
-    starship = {
-      settings = {
-      add_newline = true;
-      format = lib.concatStrings [
-      	"$time"
-      	"$directory"
-      	"$git_branch"
-      	"$git_status"
-      	"$hostname"
-      	"$golang"
-      	"direnv"
-      	"$status"
-      ];
-
-      right_format = lib.concatStrings [
-      	"$cmd_duration"
-      ];
-
-      cmd_duration = {
-      	disabled = false;
-      	show_notifications = false;
-      	min_time = 2000;
-      	format = "[$duration](bold yellow)";
-      };
-
-      directory = {
-        style = "cyan";
-      	format = ''\[[$path]($style)\] '';
-      };
-
-      direnv = {
-      	disabled = false;
-      };
-
-      git_branch = {
-      	style = "bold cyan";
-      	format = ''\[[$symbol$branch(:$remote_branch)]($style)\] '';
-      };
-	
-      git_status = {
-      	format = "[($all_status$ahead_behind )]($style)";
-      	conflicted = "🏳";
-      	ahead = "⇡\${count}";
-      	diverged = "⇕⇡\${ahead_count}⇣\${behind_count}";
-      	behind = "⇣\${count}";
-      	up_to_date = "✓";
-      	untracked = "🤷";
-      	stashed = "📦";
-      	modified = "📝";
-        staged = ''[++\($count\)](green)'';
-      	renamed = "👅";
-      	deleted = "🗑";
-      };
-
-      golang = {
-      	format = ''\[[$symbol($version)]($style)\]'';
-      };
-
-      hostname = {
-      	format = "[$ssh_symbol$hostname]($style) ";
-      };
-
-      status = {
-      	disabled = false;
-      	success_symbol = "[❱](bold red)[❱](bold yellow)[❱](bold green) ";
-      	symbol = "[❱❱❱](bold red) ";
-      	format = "$symbol";
-      };
-
-      time = {
-        disabled = false;
-      	style = "cyan";
-      	format = ''\[[$time]($style)\] '';
-      };
-
-     };
-    };
   };
 }
diff --git a/home-manager/home.nix b/home-manager/home.nix
index d245bee..f31fa55 100644
--- a/home-manager/home.nix
+++ b/home-manager/home.nix
@@ -7,6 +7,7 @@
       ./fastfetch/fastfetch.nix
       ./ghostty.nix
       ./nixvim/nixvim.nix
+      ./starship.nix
       inputs.nixvim.homeManagerModules.nixvim
  ];
   
diff --git a/home-manager/nixvim/nixvim.nix b/home-manager/nixvim/nixvim.nix
index 94d2cc3..a7aeab8 100644
--- a/home-manager/nixvim/nixvim.nix
+++ b/home-manager/nixvim/nixvim.nix
@@ -8,13 +8,13 @@
 
       #colorschemes.onedark.enable = true;
 
-      #colorschemes.everforest = {
-      #  enable = true;
-      #  settings = {
-      #    background = "hard";
-      #    transparent_background = 1;  
-      #  };
-      #};
+      colorschemes.everforest = {
+        enable = true;
+        settings = {
+          background = "hard";
+          transparent_background = 1;  
+        };
+      };
 
       opts = {
         number = true;
diff --git a/home-manager/starship.nix b/home-manager/starship.nix
new file mode 100644
index 0000000..eaed324
--- /dev/null
+++ b/home-manager/starship.nix
@@ -0,0 +1,84 @@
+{ lib, ... }:
+
+{
+  programs = {
+    starship = {
+      settings = {
+      add_newline = true;
+      format = lib.concatStrings [
+      	"$time"
+      	"$directory"
+      	"$git_branch"
+      	"$git_status"
+      	"$hostname"
+      	"$golang"
+      	"direnv"
+      	"$status"
+      ];
+
+      right_format = lib.concatStrings [
+      	"$cmd_duration"
+      ];
+
+      cmd_duration = {
+      	disabled = false;
+      	show_notifications = false;
+      	min_time = 2000;
+      	format = "[$duration](bold yellow)";
+      };
+
+      directory = {
+        style = "cyan";
+      	format = ''\[[$path]($style)\] '';
+      };
+
+      direnv = {
+      	disabled = false;
+      };
+
+      git_branch = {
+      	style = "bold cyan";
+      	format = ''\[[$symbol$branch(:$remote_branch)]($style)\] '';
+      };
+	
+      git_status = {
+      	format = "[($all_status$ahead_behind )]($style)";
+      	conflicted = "🏳";
+      	ahead = "⇡\${count}";
+      	diverged = "⇕⇡\${ahead_count}⇣\${behind_count}";
+      	behind = "⇣\${count}";
+      	up_to_date = "✓";
+      	untracked = "🤷";
+      	stashed = "📦";
+      	modified = "📝";
+        staged = ''[++\($count\)](green)'';
+      	renamed = "👅";
+      	deleted = "🗑";
+      };
+
+      golang = {
+      	format = ''\[[$symbol($version)]($style)\]'';
+      };
+
+      hostname = {
+      	format = "[$ssh_symbol$hostname]($style) ";
+      };
+
+      status = {
+      	disabled = false;
+      	success_symbol = "[❱](bold red)[❱](bold yellow)[❱](bold green) ";
+      	symbol = "[❱❱❱](bold red) ";
+      	format = "$symbol";
+      };
+
+      time = {
+        disabled = false;
+      	style = "cyan";
+      	format = ''\[[$time]($style)\] '';
+      };
+
+     };
+    };
+  };
+}
+