4 files changed, 109 insertions, 43 deletions
diff --git a/.config/fish/conf.d/fish_frozen_key_bindings.fish b/.config/fish/conf.d/fish_frozen_key_bindings.fish
new file mode 100644
index 0000000..495aee9
--- /dev/null
+++ b/.config/fish/conf.d/fish_frozen_key_bindings.fish
@@ -0,0 +1,14 @@
+# This file was created by fish when upgrading to version 4.3, to migrate
+# the 'fish_key_bindings' variable from its old default scope (universal)
+# to its new default scope (global).  We recommend you delete this file
+# and configure key bindings in ~/.config/fish/config.fish if needed.
+
+# set --global fish_key_bindings fish_default_key_bindings
+
+# Prior to version 4.3, fish shipped an event handler that runs
+# `set --universal fish_key_bindings fish_default_key_bindings`
+# whenever the fish_key_bindings variable is erased.
+# This means that as long as any fish < 4.3 is still running on this system,
+# we cannot complete the migration.
+# As a workaround, erase the universal variable at every shell startup.
+set --erase --universal fish_key_bindings
diff --git a/.config/fish/conf.d/fish_frozen_theme.fish b/.config/fish/conf.d/fish_frozen_theme.fish
new file mode 100644
index 0000000..64255bf
--- /dev/null
+++ b/.config/fish/conf.d/fish_frozen_theme.fish
@@ -0,0 +1,48 @@
+# This file was created by fish when upgrading to version 4.3, to migrate
+# theme variables from universal to global scope.
+# Don't edit this file, as it will be written by the web-config tool (`fish_config`).
+# To customize your theme, delete this file and see
+#     help interactive#syntax-highlighting
+# or
+#     man fish-interactive | less +/^SYNTAX.HIGHLIGHTING
+# for appropriate commands to add to ~/.config/fish/config.fish instead.
+# See also the release notes for fish 4.3.0 (run `help relnotes`).
+
+set --global fish_color_autosuggestion 4c566a
+set --global fish_color_cancel --reverse
+set --global fish_color_command 88c0d0
+set --global fish_color_comment 4c566a --italics
+set --global fish_color_cwd 5e81ac
+set --global fish_color_cwd_root bf616a
+set --global fish_color_end 81a1c1
+set --global fish_color_error bf616a
+set --global fish_color_escape ebcb8b
+set --global fish_color_history_current e5e9f0 --bold
+set --global fish_color_host a3be8c
+set --global fish_color_host_remote ebcb8b
+set --global fish_color_keyword 81a1c1
+set --global fish_color_match --background=brblue
+set --global fish_color_normal normal
+set --global fish_color_operator 81a1c1
+set --global fish_color_option 8fbcbb
+set --global fish_color_param d8dee9
+set --global fish_color_quote a3be8c
+set --global fish_color_redirection b48ead --bold
+set --global fish_color_search_match --bold --background=434c5e
+set --global fish_color_selection d8dee9 --bold --background=434c5e
+set --global fish_color_status bf616a
+set --global fish_color_user a3be8c
+set --global fish_color_valid_path --underline
+set --global fish_pager_color_background
+set --global fish_pager_color_completion e5e9f0
+set --global fish_pager_color_description ebcb8b --italics
+set --global fish_pager_color_prefix normal --bold --underline
+set --global fish_pager_color_progress 3b4252 --background=d08770
+set --global fish_pager_color_secondary_background
+set --global fish_pager_color_secondary_completion
+set --global fish_pager_color_secondary_description
+set --global fish_pager_color_secondary_prefix
+set --global fish_pager_color_selected_background --background=434c5e
+set --global fish_pager_color_selected_completion
+set --global fish_pager_color_selected_description
+set --global fish_pager_color_selected_prefix
diff --git a/.config/fish/config.fish b/.config/fish/config.fish
index 9c5de4a..357db65 100644
--- a/.config/fish/config.fish
+++ b/.config/fish/config.fish
@@ -4,6 +4,25 @@ end
 
 function fish_greeting; end
 
+function spf
+    set os $(uname -s)
+
+    if test "$os" = "Linux"
+        set spf_last_dir "$HOME/.local/state/superfile/lastdir"
+    end
+
+    if test "$os" = "Darwin"
+        set spf_last_dir "$HOME/Library/Application Support/superfile/lastdir"
+    end
+
+    command spf $argv
+
+    if test -f "$spf_last_dir"
+        source "$spf_last_dir"
+        rm -f -- "$spf_last_dir" >> /dev/null
+    end
+end
+
 function f
 	set tmp (mktemp -t "yazi-cwd.XXXXXX")
 	yazi $argv --cwd-file="$tmp"
@@ -48,12 +67,16 @@ alias cc="clear & cd"
 alias l="eza --color=always --long --git --no-filesize --icons=always --no-time --no-user --no-permissions --group-directories-first"
 alias ll="eza --color=always --long --git --icons=always --no-user --group-directories-first"
 alias la="eza -a --color=always --long --git --no-filesize --icons=always --no-time --no-user --no-permissions --group-directories-first"
-alias ff="fastfetch"
+alias fa="fastfetch"
+alias ff="yazi"
 alias p=pgcli
 alias t="tmux attach"
-alias d="deactivate"
+# alias d="deactivate"
+alias d="zi"
 alias venv="python3 -m venv venv"
 alias cd="z"
+# alias timewr="rm -rf ~/.local/share/timewarrior/data/"
+alias s="ssh pi@tom.tinysun.net"
 alias gi="git init && aig"
 alias gs="git status"
 alias aig="cp ~/.config/.gitignore-template ./.gitignore"
@@ -79,3 +102,20 @@ export EDITOR="nvim"
 fish_add_path "/Users/tomiko/.local/bin"
 
 starship init fish | source
+alias conda="/opt/homebrew/anaconda3/bin/conda"
+
+# >>> conda initialize >>>
+# !! Contents within this block are managed by 'conda init' !!
+# if test -f /opt/homebrew/anaconda3/bin/conda
+#     eval /opt/homebrew/anaconda3/bin/conda "shell.fish" "hook" $argv | source
+# else
+#     if test -f "/opt/homebrew/anaconda3/etc/fish/conf.d/conda.fish"
+#         . "/opt/homebrew/anaconda3/etc/fish/conf.d/conda.fish"
+#     else
+#         set -x PATH "/opt/homebrew/anaconda3/bin" $PATH
+#     end
+# end
+# <<< conda initialize <<<
+
+set -Ux CARAPACE_BRIDGES 'zsh,fish,bash,inshellisense' # optional
+carapace _carapace | source
diff --git a/.config/fish/fish_variables b/.config/fish/fish_variables
index eb2b27e..b59d7d6 100644
--- a/.config/fish/fish_variables
+++ b/.config/fish/fish_variables
@@ -1,43 +1,7 @@
 # This file contains fish universal variable definitions.
 # VERSION: 3.0
-SETUVAR __fish_initialized:3800
-SETUVAR fish_color_autosuggestion:4c566a
-SETUVAR fish_color_cancel:\x2d\x2dreverse
-SETUVAR fish_color_command:88c0d0
-SETUVAR fish_color_comment:4c566a\x1e\x2d\x2ditalics
-SETUVAR fish_color_cwd:5e81ac
-SETUVAR fish_color_cwd_root:bf616a
-SETUVAR fish_color_end:81a1c1
-SETUVAR fish_color_error:bf616a
-SETUVAR fish_color_escape:ebcb8b
-SETUVAR fish_color_history_current:e5e9f0\x1e\x2d\x2dbold
-SETUVAR fish_color_host:a3be8c
-SETUVAR fish_color_host_remote:ebcb8b
-SETUVAR fish_color_keyword:81a1c1
-SETUVAR fish_color_match:\x2d\x2dbackground\x3dbrblue
-SETUVAR fish_color_normal:normal
-SETUVAR fish_color_operator:81a1c1
-SETUVAR fish_color_option:8fbcbb
-SETUVAR fish_color_param:d8dee9
-SETUVAR fish_color_quote:a3be8c
-SETUVAR fish_color_redirection:b48ead\x1e\x2d\x2dbold
-SETUVAR fish_color_search_match:\x2d\x2dbold\x1e\x2d\x2dbackground\x3d434c5e
-SETUVAR fish_color_selection:d8dee9\x1e\x2d\x2dbold\x1e\x2d\x2dbackground\x3d434c5e
-SETUVAR fish_color_status:bf616a
-SETUVAR fish_color_user:a3be8c
-SETUVAR fish_color_valid_path:\x2d\x2dunderline
-SETUVAR fish_key_bindings:fish_default_key_bindings
-SETUVAR fish_pager_color_background:\x1d
-SETUVAR fish_pager_color_completion:e5e9f0
-SETUVAR fish_pager_color_description:ebcb8b\x1e\x2d\x2ditalics
-SETUVAR fish_pager_color_prefix:normal\x1e\x2d\x2dbold\x1e\x2d\x2dunderline
-SETUVAR fish_pager_color_progress:3b4252\x1e\x2d\x2dbackground\x3dd08770
-SETUVAR fish_pager_color_secondary_background:\x1d
-SETUVAR fish_pager_color_secondary_completion:\x1d
-SETUVAR fish_pager_color_secondary_description:\x1d
-SETUVAR fish_pager_color_secondary_prefix:\x1d
-SETUVAR fish_pager_color_selected_background:\x2d\x2dbackground\x3d434c5e
-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:/Users/tomiko/\x2elocal/bin
+SETUVAR --export CARAPACE_BRIDGES:zsh\x2cfish\x2cbash\x2cinshellisense
+SETUVAR --export JAVA_HOME:/opt/homebrew/opt/openjdk\x4017/libexec/openjdk\x2ejdk/Contents/Home
+SETUVAR --export --path PATH:/opt/homebrew/opt/openjdk\x4017/libexec/openjdk\x2ejdk/Contents/Home/bin\x1e/opt/homebrew/bin\x1e/opt/homebrew/sbin\x1e/Users/tomiko/\x2ecargo/bin\x1e/Users/tomiko/\x2elocal/bin\x1e/Applications/Ghostty\x2eapp/Contents/MacOS\x1e/usr/local/bin\x1e/System/Cryptexes/App/usr/bin\x1e/usr/bin\x1e/bin\x1e/usr/sbin\x1e/sbin\x1e/var/run/com\x2eapple\x2esecurity\x2ecryptexd/codex\x2esystem/bootstrap/usr/local/bin\x1e/var/run/com\x2eapple\x2esecurity\x2ecryptexd/codex\x2esystem/bootstrap/usr/bin\x1e/var/run/com\x2eapple\x2esecurity\x2ecryptexd/codex\x2esystem/bootstrap/usr/appleinternal/bin\x1e/Library/Apple/usr/bin\x1e/Applications/VMware\x20Fusion\x2eapp/Contents/Public\x1e/usr/local/share/dotnet\x1e\x7e/\x2edotnet/tools\x1e/Library/TeX/texbin\x1e/Applications/Wireshark\x2eapp/Contents/MacOS\x1e/Users/tom/\x2elocal/bin
+SETUVAR __fish_initialized:4300
+SETUVAR fish_user_paths:/Users/tomiko/\x2elocal/bin\x1e/Applications/Ghostty\x2eapp/Contents/MacOS