chore(zsh): minor improvements

home.nix

@@ -96,7 +96,7 @@ in {
     home-manager.enable = true;
     go = {
       enable = true;
-      goPath = ".local/share/go";
+      goPath = "${config.xdg.dataHome}/go";
     };
     man.enable = true;
     taskwarrior.enable = true;

modules/btop.nix

@@ -1,19 +0,0 @@
-{pkgs, ...}: {
-  programs.btop = {
-    enable = true;
-    settings = {
-      color_theme = "catppuccin_mocha";
-      theme_background = false;
-      vim_keys = true;
-    };
-  };
-
-  xdg.configFile."btop/themes" = {
-    source = pkgs.fetchFromGitHub {
-      owner = "catppuccin";
-      repo = "btop";
-      rev = "ecb8562bb6181bb9f2285c360bbafeb383249ec3";
-      sha256 = "sha256-ovVtupO5jWUw6cwA3xEzRe1juUB8ykfarMRVTglx3mk=";
-    };
-  };
-}

modules/starship/config.toml

@@ -1,9 +1,5 @@
-# Get editor completions based on the config schema
 "$schema" = "https://starship.rs/config-schema.json"
 
-### MAIN SHELL
-# directory | username@hostname | cmd duration | sudo | VCS | language versions | kubernetes
-# > input after line break
 format = """
 [ ](bg:red)\
 $directory\
@@ -17,8 +13,8 @@ $vcsh\
 $git_branch\
 $git_commit\
 $git_state\
-$git_metrics\
 $git_status\
+$git_metrics\
 [](fg:peach bg:yellow)\
 $cmd_duration\
 $status\
@@ -31,34 +27,21 @@ $nodejs\
 $php\
 $python\
 $rust\
-$vagrant\
 [](fg:green bg:blue)\
 $package\
+$nix_shell\
 [](fg:blue bg:purple)\
-$aws\
 $azure\
-$gcloud\
-$openstack\
 $docker_context\
 $kubernetes\
-$terraform\
 [](fg:purple)\
 $line_break\
 $shell\
 $character"""
+
 add_newline = true
 palette = "catppuccin_mocha"
 
-[custom.left]
-symbol = ""
-style = "fg:bright-purple"
-when = true
-
-[custom.right]
-symbol = ""
-style = "fg:bright-purple"
-when = true
-
 [directory]
 format = "[$path]($style)[$read_only]($read_only_style)"
 style = 'bg:red fg:#000000'
@@ -108,6 +91,12 @@ style = 'bg:peach fg:#000000'
 format = '[\($state( $progress_current/$progress_total)\)]($style)'
 style = 'bg:peach fg:#000000'
 
+[git_metrics]
+format = '([ +$added]($added_style)[/](bg:peach fg:#000000)[-$deleted]($deleted_style))'
+added_style = 'bg:peach fg:#000000'
+deleted_style = 'bg:peach fg:#000000'
+disabled = false
+
 [git_status]
 format = '([ $all_status$ahead_behind]($style))'
 ahead = "↑"
@@ -215,7 +204,8 @@ style = 'bg:green fg:#000000'
 
 [nix_shell]
 format = '[ $symbol$state( \($name\)) ]($style)'
-style = 'bg:green fg:#000000'
+symbol = ' '
+style = 'bg:blue fg:#000000'
 
 [nodejs]
 format = '[ $symbol($version) ]($style)'

modules/zsh.nix

@@ -14,6 +14,14 @@ in {
   home.sessionVariables = {LESSHISTFILE = "-";};
 
   programs = {
+    btop = {
+      enable = true;
+      settings = {
+        theme_background = false;
+        vim_keys = true;
+      };
+    };
+
     direnv.enable = true;
     direnv.nix-direnv.enable = true;
 
@@ -76,13 +84,8 @@ in {
         }
         {
           name = "zsh-nix-shell";
-          file = "nix-shell.plugin.zsh";
+          src = pkgs.zsh-nix-shell;
-          src = pkgs.fetchFromGitHub {
+          file = "share/zsh-nix-shell/nix-shell.plugin.zsh";
-            owner = "chisui";
-            repo = "zsh-nix-shell";
-            rev = "v0.5.0";
-            sha256 = "0za4aiwwrlawnia4f29msk822rj9bgcygw6a8a6iikiwzjjz0g91";
-          };
         }
       ];
       shellAliases = {