zsh fixed and added starship

home-manager/cli-tools.nix

@@ -1,12 +1,5 @@
 { config, pkgs, lib, ... }:
 
-let 
-nixpkgs = fetchTarball { # nixos-24.11 branch from server_setup 
-    sha256 = "";
-    url = "https://github.com/Rogue-King/ohmyzsh-theme-passion/archive/a4aad67bd377f6515baddcb1db03a19ec8166bbe.tar.gz";
-  };
-in
-
 { 
   home.packages = with pkgs; [  
     curl
@@ -18,19 +11,6 @@ in
 #    oh-my-zsh-rogueking
   ];
 
-#  _: let
-#    onePassPath = "~/.1password/agent.sock";
-#
-#  in {
-#    programs.ssh ={
-#      enable = true;
-#      extraConfig = ''
-#        Host *
-#            IdentityAgent ${onePassPath}
-#       '';
-#     }; 
-#  }
-
   programs = {
     fastfetch.enable = true;  
     neovim.enable = true;
@@ -39,11 +19,8 @@ in
     btop.enable = true;
     kitty.enable = true;
     yazi.enable = true;
-    starship = {  
-      enable = true;
-      settings = { };
-    };
-    
+    starship.enable = true;
+
     git = {  
       enable = true;
       userName = "rogueking";
@@ -68,7 +45,7 @@ in
       enable = true;
       enableCompletion = true;
       autosuggestion.enable = true;
-      #syntaxHighlighting.enable = true;
+      syntaxHighlighting.enable = true;
       historySubstringSearch.enable = true;
 
       shellAliases = {
@@ -90,12 +67,68 @@ in
         path = "${config.xdg.dataHome}/zsh/history";
       };
 
-      oh-my-zsh = {
-        enable = true;
-	custom = "$HOME/.ohmyzsh/custom";
-	plugins = ["fast-syntax-highlighting"];
-	theme = "passion";
+      oh-my-zsh.enable = true; 
+    };
+
+    starship = {
+      settings = {
+      add_newline = true;
+      format = lib.concatStrings [
+	"$time"
+	"$directory"
+	"$git_branch"
+	"$git_status"
+	"$hostname"
+	"$status"
+      ];
+
+      directory = {
+        style = "cyan";
+	format = ''\[[$path]($style)\] '';
       };
+
+      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)\] '';
+      };
+
+     };
     };
   };
 }

home-manager/fastfetch.nix

@@ -0,0 +1,96 @@
+{
+  programs = {
+    fastfetch = {
+      enable = true;
+      settings = {
+        logo = {
+          source = "/etc/nixos/home-manager/commands/fastfetch/assets/image.png";
+          type = "kitty";
+          height = 20;
+          padding = {
+            top = 2;
+            left= 3;
+          };
+        };
+        display = {
+          separator = "";
+	  key = {
+	    width = 15; 
+	  };
+        };
+        modules = [
+	{
+	    "key": "╭───────────╮",
+	    "type": "custom"
+	},
+	{
+	    // draw borders first to make colors of left and right border consistant
+	    "key": "│           │\u001b[11D\u001b[31m user",
+	    "type": "title",
+	    "format": "{1}"
+	},
+	{
+	    "key": "│           │\u001b[11D\u001b[32m󰇅 hname",
+	    "type": "title",
+	    "format": "{2}"
+	},
+	{
+	    "key": "│           │\u001b[11D\u001b[33m󰅐 uptime",
+	    "type": "uptime"
+	},
+	{
+	    "key": "│           │\u001b[11D\u001b[34m󰟾 distro",
+	    "type": "os"
+	},
+	{
+	    "key": "│           │\u001b[11D\u001b[35m kernel",
+	    "type": "kernel"
+	},
+	{
+	    "key": "│           │\u001b[11D\u001b[36m󰇄 desktop",
+	    "type": "de"
+	},
+	{
+	    "key": "│           │\u001b[11D\u001b[31m term",
+	    "type": "terminal"
+	},
+	{
+	    "key": "│           │\u001b[11D\u001b[32m shell",
+	    "type": "shell"
+	},
+	{
+	    "key": "│           │\u001b[11D\u001b[33m󰍛 battery",
+	    "type": "battery"
+	},
+	{
+	    "key": "│           │\u001b[11D\u001b[34m󰉉 disk",
+	    "type": "disk",
+	    "folders": "/"
+	},
+	{
+	    "key": "│           │\u001b[11D\u001b[35m memory",
+	    "type": "memory"
+	},
+	{
+	   "key": "│           │\u001b[11D\u001b[36m󰩟 network",
+	   "type": "localip",
+	  "format": "{1} ({4})"
+	},
+	{
+	    "key": "├───────────┤",
+	    "type": "custom"
+	},
+	{
+	    "key": "│           │\u001b[11D\u001b[m colors",
+	    "type": "colors",
+	    "symbol": "circle"
+	},
+	{
+	"key": "╰───────────╯",
+   	"type": "custom"
+	}
+	];
+      };
+    };
+  };
+}

home-manager/home.nix

@@ -3,6 +3,7 @@
 {
   imports = [
       ./cli-tools.nix
+      ./fastfetch.nix
     ];
   
   # Home Manager needs a bit of information about you and the paths it should