From af6c916242f4898ca62df1aebc34ea0465d3d58d Mon Sep 17 00:00:00 2001
From: cnst <cnst@cana.st>
Date: Mon, 1 Jul 2024 17:26:20 +0200
Subject: [PATCH] zsh changes

---
 flake.lock                   | 36 ++++++++++++++++++------------------
 home/core/shell/cnst.nix     | 26 ++++++++++++++++----------
 home/extra/kitty/default.nix |  2 +-
 3 files changed, 35 insertions(+), 29 deletions(-)

diff --git a/flake.lock b/flake.lock
index c1d72e52..381e41fe 100644
--- a/flake.lock
+++ b/flake.lock
@@ -48,11 +48,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1719750385,
-        "narHash": "sha256-AEXF+QxsnGmrwqURcH4KqcTXFOTRnfblKr6gxcaWg4A=",
+        "lastModified": 1719836950,
+        "narHash": "sha256-dZaM7Xeogtf+zIT6tEP9UIxkO4VALLU6wQEdEINFl/s=",
         "owner": "nix-community",
         "repo": "flake-firefox-nightly",
-        "rev": "a6d3430728df1867fd50a10c832547b90e623f2e",
+        "rev": "81442b605dcbb9838b1a6c84b44b2643331c16b3",
         "type": "github"
       },
       "original": {
@@ -358,11 +358,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1719677234,
-        "narHash": "sha256-qO9WZsj/0E6zcK4Ht1y/iJ8XfwbBzq7xdqhBh44OP/M=",
+        "lastModified": 1719827439,
+        "narHash": "sha256-tneHOIv1lEavZ0vQ+rgz67LPNCgOZVByYki3OkSshFU=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "36317d4d38887f7629876b0e43c8d9593c5cc48d",
+        "rev": "59ce796b2563e19821361abbe2067c3bb4143a7d",
         "type": "github"
       },
       "original": {
@@ -443,11 +443,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1719733038,
-        "narHash": "sha256-kUG94JixUcSgkkJ0I1xo2rtXfSOmUJNbq+PKs9kDWWI=",
+        "lastModified": 1719764240,
+        "narHash": "sha256-bsZDPD08s8FKCGyy1OMMuM+cOjO1M8vPREkhgyqkRQM=",
         "owner": "nix-community",
         "repo": "neovim-nightly-overlay",
-        "rev": "dace98a9b5ee51971cab74f7a00955b8b8089536",
+        "rev": "643ec69ac0cfcc1cd26523c3816fb111e5bb3a41",
         "type": "github"
       },
       "original": {
@@ -459,11 +459,11 @@
     "neovim-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1719676676,
-        "narHash": "sha256-97hP/z7sH4GUBBVi2Z7QiJsgIOO6a+AFYf4MvTU2p0Y=",
+        "lastModified": 1719700831,
+        "narHash": "sha256-d89hDFBBtuQ7rwS/Q3lKYyfE0ekVCwubMN9q1qCZ3m0=",
         "owner": "neovim",
         "repo": "neovim",
-        "rev": "435d0182d293e70b14a5655c976c3c6daa6ea765",
+        "rev": "e7020306a19a5211c834966ec067fff3b981bdb9",
         "type": "github"
       },
       "original": {
@@ -521,11 +521,11 @@
     },
     "nixpkgs-stable_2": {
       "locked": {
-        "lastModified": 1719426051,
-        "narHash": "sha256-yJL9VYQhaRM7xs0M867ZFxwaONB9T2Q4LnGo1WovuR4=",
+        "lastModified": 1719707984,
+        "narHash": "sha256-RoxIr/fbndtuKqulGvNCcuzC6KdAib85Q8gXnjzA1dw=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "89c49874fb15f4124bf71ca5f42a04f2ee5825fd",
+        "rev": "7dca15289a1c2990efbe4680f0923ce14139b042",
         "type": "github"
       },
       "original": {
@@ -537,11 +537,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1719506693,
-        "narHash": "sha256-C8e9S7RzshSdHB7L+v9I51af1gDM5unhJ2xO1ywxNH8=",
+        "lastModified": 1719690277,
+        "narHash": "sha256-0xSej1g7eP2kaUF+JQp8jdyNmpmCJKRpO12mKl/36Kc=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "b2852eb9365c6de48ffb0dc2c9562591f652242a",
+        "rev": "2741b4b489b55df32afac57bc4bfd220e8bf617e",
         "type": "github"
       },
       "original": {
diff --git a/home/core/shell/cnst.nix b/home/core/shell/cnst.nix
index 20e4b451..86d44b39 100644
--- a/home/core/shell/cnst.nix
+++ b/home/core/shell/cnst.nix
@@ -24,23 +24,29 @@
       ];
       theme = "robbyrussell";
     };
+    profileExtra = ''
+      export PATH="$HOME/.local/bin:$PATH"
+    '';
+    initExtraFirst = ''
+      autoload -U colors && colors
+    '';
     initExtra = ''
-      ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg_bold[blue]%}(%{$fg[red]%}"
-      ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%} "
-      ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[blue]%}) %{$fg[yellow]%}%1{✗%}"
-      ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg[blue]%})"
+      ZSH_THEME_GIT_PROMPT_PREFIX="%F{178}(%F{167}"
+      ZSH_THEME_GIT_PROMPT_SUFFIX="%f "
+      ZSH_THEME_GIT_PROMPT_DIRTY="%F{178}) %F{148}%1{✗%}"
+      ZSH_THEME_GIT_PROMPT_CLEAN="%$F{178})"
 
-      ZSH_THEME_RUBY_PROMPT_PREFIX="%{$fg_bold[red]%}‹"
-      ZSH_THEME_RUBY_PROMPT_SUFFIX="›%{$reset_color%}"
+      ZSH_THEME_RUBY_PROMPT_PREFIX="%F{167}‹"
+      ZSH_THEME_RUBY_PROMPT_SUFFIX="›%f"
 
-      PROMPT='%{$fg_bold[green]%}%c%{$reset_color%} $(git_prompt_info)$(virtualenv_prompt_info)
-      ➜ '
+      PROMPT='%F{72}%c%f $(git_prompt_info)$(virtualenv_prompt_info)
+      %F{178}➜ '
 
       RPROMPT='$(ruby_prompt_info)'
 
       VIRTUAL_ENV_DISABLE_PROMPT=0
-      ZSH_THEME_VIRTUAL_ENV_PROMPT_PREFIX=" %{$fg[green]%}🐍 "
-      ZSH_THEME_VIRTUAL_ENV_PROMPT_SUFFIX="%{$reset_color%}"
+      ZSH_THEME_VIRTUAL_ENV_PROMPT_PREFIX=" %F{green}🐍 "
+      ZSH_THEME_VIRTUAL_ENV_PROMPT_SUFFIX="%f"
       ZSH_THEME_VIRTUALENV_PREFIX=$ZSH_THEME_VIRTUAL_ENV_PROMPT_PREFIX
       ZSH_THEME_VIRTUALENV_SUFFIX=$ZSH_THEME_VIRTUAL_ENV_PROMPT_SUFFIX
 
diff --git a/home/extra/kitty/default.nix b/home/extra/kitty/default.nix
index cd1c9b67..8b9977a1 100644
--- a/home/extra/kitty/default.nix
+++ b/home/extra/kitty/default.nix
@@ -17,7 +17,7 @@
       background_blur = "32";
       window_padding_width = 3;
       tab_bar_min_tabs = 1;
-      tab_bar_edge = "top";
+      tab_bar_edge = "bottom";
       tab_bar_style = "separator";
       tab_bar_margin_width = "0.0";
       tab_bar_margin_height = "0.0 0.0";