From 16b8b699d1867b5a5649bd95096236872de5ee11 Mon Sep 17 00:00:00 2001
From: Roman Lubij <roman.lubij@gmail.com>
Date: Mon, 2 Mar 2026 18:06:29 +0100
Subject: [PATCH] Update zsh, starship config

---
 common/modules/home/starship.nix | 69 ++++++++++++++------------------
 common/modules/home/zsh.nix      | 17 +++-----
 flake.lock                       | 18 ++++-----
 3 files changed, 45 insertions(+), 59 deletions(-)

diff --git a/common/modules/home/starship.nix b/common/modules/home/starship.nix
index 8d09c8c..a703466 100644
--- a/common/modules/home/starship.nix
+++ b/common/modules/home/starship.nix
@@ -16,7 +16,6 @@
         "$rust"
         "$golang"
         "$php"
-        "\${custom.android}"
         "[](fg:#000000)"
         "[░▒▓](#FFFFFF)"
         "[ 🐺 ](bg:#FFFFFF fg:#1E91D6)"
@@ -33,22 +32,44 @@
 
       hostname = {
         ssh_only = true;
-        format = "[](fg:#1E91D6)[$hostname](bg:#1E91D6 fg:#FFFFFF)[](fg:#1E91D6) ";
+        format = "[](fg:#1E91D6)[󰒍 $hostname](bg:#1E91D6 fg:#FFFFFF)[](fg:#1E91D6) ";
       };
 
       custom.distrobox = {
         when = "printenv CONTAINER_ID";
         command = "echo $CONTAINER_ID";
-        format = "[](fg:#FF5F00)[󰏖 $output ](bg:#FF5F00 fg:#FFFFFF)[](fg:#FF5F00) ";
+        symbol = "󰙀";
+        format = "[](fg:#FF5F00)[$symbol $output](bg:#FF5F00 fg:#FFFFFF)[](fg:#FF5F00) ";
       };
 
       nix_shell = {
-        format = "[](fg:#7EBAE4)[ $state ](bg:#7EBAE4 fg:#061A40)[](fg:#7EBAE4) ";
+        symbol = "";
+        format = "[](fg:#7EBAE4)[$symbol $state](bg:#7EBAE4 fg:#061A40)[](fg:#7EBAE4) ";
       };
 
-      custom.android = {
-        when = "test -n \"$IN_ANDROID_ENV\"";
-        format = "[](fg:#3DDC84)[󰀲 Android ](bg:#3DDC84 fg:#061A40)[](fg:#3DDC84) ";
+      python = {
+        symbol = "󰌠";
+        format = "[](fg:#4B8BBE)[$symbol $version](bg:#4B8BBE fg:#FFFFFF)[](fg:#4B8BBE) ";
+      };
+
+      nodejs = {
+        symbol = "󰎙";
+        format = "[](fg:#68A063)[$symbol $version](bg:#68A063 fg:#FFFFFF)[](fg:#68A063) ";
+      };
+
+      rust = {
+        symbol = "";
+        format = "[](fg:#CE412B)[$symbol $version](bg:#CE412B fg:#FFFFFF)[](fg:#CE412B) ";
+      };
+
+      golang = {
+        symbol = "󰟓";
+        format = "[](fg:#00ADD8)[$symbol $version](bg:#00ADD8 fg:#FFFFFF)[](fg:#00ADD8) ";
+      };
+
+      php = {
+        symbol = "󰌟";
+        format = "[](fg:#8892BF)[$symbol $version](bg:#8892BF fg:#FFFFFF)[](fg:#8892BF) ";
       };
 
       directory = {
@@ -65,44 +86,16 @@
 
       git_branch = {
         symbol = "󰊢";
-        style = "bg:#E18335";
-        format = "[[ $symbol $branch ](fg:#0072BB bg:#E18335)]($style)";
+        format = "[ $symbol $branch ](fg:#0072BB bg:#E18335)";
       };
 
       git_status = {
-        style = "bg:#E18335";
-        format = "[[($all_status$ahead_behind )](fg:#0072BB bg:#E18335)]($style)";
-      };
-
-      python = {
-        symbol = "󰌠";
-        format = "[](fg:#4B8BBE)[$symbol $version](bg:#4B8BBE fg:#FFFFFF)[](fg:#4B8BBE) ";
-      };
-
-      nodejs = {
-        symbol = "󰎙";
-        format = "[](fg:#68A063)[$symbol $version](bg:#68A063 fg:#FFFFFF)[](fg:#68A063) ";
-      };
-
-      rust = {
-        symbol = "󱘗";
-        format = "[](fg:#CE412B)[$symbol $version](bg:#CE412B fg:#FFFFFF)[](fg:#CE412B) ";
-      };
-
-      golang = {
-        symbol = "󰟓";
-        format = "[](fg:#00ADD8)[$symbol $version](bg:#00ADD8 fg:#FFFFFF)[](fg:#00ADD8) ";
-      };
-
-      php = {
-        symbol = "󰌟";
-        format = "[](fg:#8892BF)[$symbol $version](bg:#8892BF fg:#FFFFFF)[](fg:#8892BF) ";
+        format = "[ $all_status$ahead_behind ](fg:#0072BB bg:#E18335)";
       };
 
       time = {
         disabled = false;
-        style = "bg:#061A40";
-        format = "[[ 󰥔 $time ](fg:#a0a9cb bg:#061A40)]($style)";
+        format = "[ 󰥔 $time ](fg:#a0a9cb bg:#061A40)";
       };
 
       character = {
diff --git a/common/modules/home/zsh.nix b/common/modules/home/zsh.nix
index 5bdc237..70cacbd 100644
--- a/common/modules/home/zsh.nix
+++ b/common/modules/home/zsh.nix
@@ -39,7 +39,11 @@
     };
 
     initContent = ''
-      # Completion Styling
+      zstyle ':completion:*' completer _complete _match _approximate
+      zstyle ':completion:*:approximate:*' max-errors 1 numeric
+
+      zstyle ':completion:*' menu select
+
       zstyle ':completion:*' list-colors "''${(s.:.)LS_COLORS}"
       zstyle ':completion:*:(scp|rsync):*' tag-order ' hosts:-ipaddr:ip\ address hosts:-host:host files'
       zstyle ':completion:*:(ssh|scp|rsync):*:hosts-host' ignored-patterns '*(.|:)*' loopback ip6-loopback localhost ip6-localhost broadcasthost
@@ -75,17 +79,6 @@
         echo "Found device at $IP:$PORT"
         adb pair "$IP:$PORT"
       }
-
-      if ! command -v starship >/dev/null 2>&1; then
-        if [[ -f "/home/jax/.cargo/bin/starship" ]]; then
-          eval "$(/home/jax/.cargo/bin/starship init zsh)"
-        fi
-      fi
-
-      # Your specific Android environment override
-      if [[ -n "$IN_ANDROID_ENV" ]]; then
-          eval "$(starship init zsh)"
-      fi
     '';
   };
 
diff --git a/flake.lock b/flake.lock
index ed0ac07..45e70ba 100644
--- a/flake.lock
+++ b/flake.lock
@@ -147,11 +147,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1772198003,
-        "narHash": "sha256-I45esRSssFtJ8p/gLHUZ1OUaaTaVLluNkABkk6arQwE=",
+        "lastModified": 1772433332,
+        "narHash": "sha256-izhTDFKsg6KeVBxJS9EblGeQ8y+O8eCa6RcW874vxEc=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "dd9b079222d43e1943b6ebd802f04fd959dc8e61",
+        "rev": "cf59864ef8aa2e178cccedbe2c178185b0365705",
         "type": "github"
       },
       "original": {
@@ -163,11 +163,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1772198003,
-        "narHash": "sha256-I45esRSssFtJ8p/gLHUZ1OUaaTaVLluNkABkk6arQwE=",
+        "lastModified": 1772433332,
+        "narHash": "sha256-izhTDFKsg6KeVBxJS9EblGeQ8y+O8eCa6RcW874vxEc=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "dd9b079222d43e1943b6ebd802f04fd959dc8e61",
+        "rev": "cf59864ef8aa2e178cccedbe2c178185b0365705",
         "type": "github"
       },
       "original": {
@@ -179,11 +179,11 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1772402963,
-        "narHash": "sha256-+MupheX+ghNTSAg1XNppNApDC+FvvgpUXyU6sJSIsJo=",
+        "lastModified": 1772446320,
+        "narHash": "sha256-yzE+v6+97EetHw0c3JI67OArmCb6pw6HOw4fwc7X6eQ=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "d41521c807dccb71b1b866ac3b7df5a59e726d9d",
+        "rev": "81e440a3cef88d985f957074fdac45727ff21858",
         "type": "github"
       },
       "original": {