From 8c262bb069e5a4ca7cba1cf13ddda7dca9622814 Mon Sep 17 00:00:00 2001
From: Hydroxycarbamide <siklos@tuta.io>
Date: Tue, 24 Sep 2024 10:35:49 +0200
Subject: [PATCH] fish: update configs and functions

---
 dot_config/private_fish/config.fish           | 53 ++++++++++++-------
 dot_config/private_fish/fish_variables        |  2 +-
 .../private_fish/functions/fish_greeting.fish |  3 ++
 dot_config/private_fish/functions/n.fish      |  2 +-
 dot_config/private_fish/functions/y.fish      |  8 +++
 5 files changed, 47 insertions(+), 21 deletions(-)
 create mode 100644 dot_config/private_fish/functions/fish_greeting.fish
 create mode 100644 dot_config/private_fish/functions/y.fish

diff --git a/dot_config/private_fish/config.fish b/dot_config/private_fish/config.fish
index 6305928..dc518f2 100644
--- a/dot_config/private_fish/config.fish
+++ b/dot_config/private_fish/config.fish
@@ -71,16 +71,31 @@ if status is-interactive
     # unset
     alias unset 'set --erase'
 
+    # yazi
+    # alias y='yazi'
+    alias yz='yazi'
+
 
     function nnn_cd
         if test -n "$NNN_PIPE"
-            printf "%s\0" "0c$PWD" > "$NNN_PIPE" !&
+            printf "%s\0" "0c$PWD" >"$NNN_PIPE" ! &
         end
     end
-    
+
     trap nnn_cd EXIT
+
+    # Change Yazi's CWD to PWD on subshell exit
+    if [ -n "$YAZI_ID" ]
+    	trap 'ya pub dds-cd --str "$PWD"' EXIT
+    end
 end
 
+# tmux
+#if status is-interactive
+#and not set -q TMUX
+#    exec tmux
+#end
+
 # pnpm
 set -gx PNPM_HOME "/home/eric/.local/share/pnpm"
 if not string match -q -- $PNPM_HOME $PATH
@@ -90,28 +105,28 @@ end
 
 # nnn
 alias N="sudo -E nnn"
-set -gx LC_COLLATE "C"
-set -gx NNN_PAGER "cat"
-set -gx NNN_OPTS "eaA"
+set -gx LC_COLLATE C
+set -gx NNN_PAGER cat
+set -gx NNN_OPTS eaA
 set -gx NNN_OPENER '/home/eric/.config/nnn/plugins/nuke'
 set -gx NNN_PLUG 'd:dragdrop;f:finder;i:!fish -i*;m:mtpmount;o:fzopen;p:preview-tui;r:rsynccp;s:suedit;t:nmount;v:imgview;z:autojump'
-set -gx SPLIT 'v' # to split Kitty vertically
+set -gx SPLIT v # to split Kitty vertically
 
-set BLK "03"
-set CHR "03"
-set DIR "04"
-set EXE "02"
-set REG "07"
-set HARDLINK "05"
-set SYMLINK "05"
-set MISSING "08"
-set ORPHAN "01"
-set FIFO "06"
-set SOCK "03"
-set UNKNOWN "01"
+set BLK 03
+set CHR 03
+set DIR 04
+set EXE 02
+set REG 07
+set HARDLINK 05
+set SYMLINK 05
+set MISSING 08
+set ORPHAN 01
+set FIFO 06
+set SOCK 03
+set UNKNOWN 01
 set -gx NNN_FCOLORS "$BLK$CHR$DIR$EXE$REG$HARDLINK$SYMLINK$MISSING$ORPHAN$FIFO$SOCK$UNKNOWN"
 set -gx NNN_COLORS "#04020301;4231"
-set -gx NNN_TERMINAL "foot"
+set -gx NNN_TERMINAL foot
 
 # source  /opt/miniconda3/etc/fish/conf.d/conda.fish
 
diff --git a/dot_config/private_fish/fish_variables b/dot_config/private_fish/fish_variables
index a15465f..94b7647 100644
--- a/dot_config/private_fish/fish_variables
+++ b/dot_config/private_fish/fish_variables
@@ -63,4 +63,4 @@ SETUVAR fish_pager_color_selected_background:\x1d
 SETUVAR fish_pager_color_selected_completion:\x1d
 SETUVAR fish_pager_color_selected_description:\x1d
 SETUVAR fish_pager_color_selected_prefix:\x1d
-SETUVAR fish_user_paths:/home/eric/\x2enix\x2dprofile/bin\x1e/home/eric/\x2eemacs\x2ed/bin\x1e/home/eric/\x2elocal/bin\x1e/home/eric/\x2elocal/share/pnpm\x1e/home/eric/\x2espicetify\x1e/opt/rocm/bin\x1e/home/eric/\x2ebun/bin\x1e/usr/bin\x1e/usr/sbin\x1e/usr/local/bin\x1e/usr/local/sbin
+SETUVAR fish_user_paths:/home/eric/\x2elocal/share/cargo/bin\x1e/home/eric/\x2elocal/share/dotnet/\x2edotnet/tools\x1e/home/eric/\x2econfig/emacs/bin\x1e/home/eric/\x2enix\x2dprofile/bin\x1e/home/eric/\x2eemacs\x2ed/bin\x1e/home/eric/\x2elocal/bin\x1e/home/eric/\x2elocal/share/pnpm\x1e/home/eric/\x2espicetify\x1e/opt/rocm/bin\x1e/home/eric/\x2ebun/bin\x1e/usr/bin\x1e/usr/sbin\x1e/usr/local/bin\x1e/usr/local/sbin
diff --git a/dot_config/private_fish/functions/fish_greeting.fish b/dot_config/private_fish/functions/fish_greeting.fish
new file mode 100644
index 0000000..275f4d9
--- /dev/null
+++ b/dot_config/private_fish/functions/fish_greeting.fish
@@ -0,0 +1,3 @@
+function fish_greeting
+  catnap
+end
diff --git a/dot_config/private_fish/functions/n.fish b/dot_config/private_fish/functions/n.fish
index a8c3dc4..f44fe16 100644
--- a/dot_config/private_fish/functions/n.fish
+++ b/dot_config/private_fish/functions/n.fish
@@ -27,7 +27,7 @@ function n --wraps nnn --description 'support nnn quit and change directory'
 
     # The command function allows one to alias this function to `nnn` without
     # making an infinitely recursive alias
-    command nnn $argv
+    command nnn -P p $argv
 
     if test -e $NNN_TMPFILE
         source $NNN_TMPFILE
diff --git a/dot_config/private_fish/functions/y.fish b/dot_config/private_fish/functions/y.fish
new file mode 100644
index 0000000..3e2af95
--- /dev/null
+++ b/dot_config/private_fish/functions/y.fish
@@ -0,0 +1,8 @@
+function y
+	set tmp (mktemp -t "yazi-cwd.XXXXXX")
+	yazi $argv --cwd-file="$tmp"
+	if set cwd (command cat -- "$tmp"); and [ -n "$cwd" ]; and [ "$cwd" != "$PWD" ]
+		builtin cd -- "$cwd"
+	end
+	rm -f -- "$tmp"
+end