From 90bbd37e14ccd75da5e27825ff8c980b87cfdfe7 Mon Sep 17 00:00:00 2001 From: omri Date: Sat, 30 Aug 2025 16:35:38 +0300 Subject: [PATCH] fish: clean up xdg + remove old aliases --- .config/fish/conf.d/xdg.fish | 31 ++++++++++++++++ .config/fish/config.fish | 30 +++------------ .config/fish/fish_variables | 65 +++++++++++++++++++++++++++++++++ .config/fish/functions/pm.fish | 4 -- .config/fish/functions/py.fish | 4 -- .config/fish/functions/xdg.fish | 3 ++ 6 files changed, 104 insertions(+), 33 deletions(-) create mode 100644 .config/fish/conf.d/xdg.fish create mode 100644 .config/fish/fish_variables delete mode 100644 .config/fish/functions/pm.fish delete mode 100644 .config/fish/functions/py.fish create mode 100644 .config/fish/functions/xdg.fish diff --git a/.config/fish/conf.d/xdg.fish b/.config/fish/conf.d/xdg.fish new file mode 100644 index 0000000..1d4d351 --- /dev/null +++ b/.config/fish/conf.d/xdg.fish @@ -0,0 +1,31 @@ +# cleanup +set -Ux ANDROID_HOME "$XDG_DATA_HOME"/android +set -Ux CARGO_HOME "$XDG_DATA_HOME"/cargo +set -Ux CUDA_CACHE_PATH "$XDG_CACHE_HOME"/nv +set -Ux GDBHISTFILE "$XDG_DATA_HOME"/gdb/history +set -Ux GNUPGHOME "$XDG_DATA_HOME"/gnupg +set -Ux GOPATH "$XDG_DATA_HOME"/go +set -Ux ICEAUTHORITY "$XDG_CACHE_HOME"/ICEauthority +set -Ux IPYTHONDIR "$XDG_CONFIG_HOME"/ipython +set -Ux LESSHISTFILE - +set -Ux MYPY_CACHE_DIR "$XDG_CACHE_HOME"/mypy +set -Ux NPM_CONFIG_USERCONFIG "$XDG_CONFIG_HOME"/npm/npmrc +set -Ux PASSWORD_STORE_DIR "$XDG_DATA_HOME"/pass +set -Ux RUSTUP_HOME "$XDG_DATA_HOME"/rustup +set -Ux SQLITE_HISTORY "$XDG_CACHE_HOME"/sqlite_history +set -Ux UNCRUSTIFY_CONFIG "$XDG_CONFIG_HOME"/uncrustify/uncrustify.cfg +set -Ux XAUTHORITY "$XDG_RUNTIME_DIR"/Xauthority +set -Ux _JAVA_OPTIONS -Djava.util.prefs.userRoot="$XDG_CONFIG_HOME"/java +set -Ux ERRFILE "$XDG_CACHE_HOME/X11/xsession-errors" +set -Ux XAUTHORITY "$XDG_RUNTIME_DIR"/Xauthority +set -Ux RUSTUP_HOME "$XDG_DATA_HOME"/rustup +set -Ux CARGO_HOME "$XDG_DATA_HOME"/cargo +set -Ux XINITRC "$XDG_CONFIG_HOME"/X11/xinitrc +set -Ux ANDROID_USER_HOME "$XDG_DATA_HOME"/android +set -Ux DOCKER_CONFIG "$XDG_CONFIG_HOME"/docker +set -Ux GNUPGHOME "$XDG_DATA_HOME"/gnupg +set -Ux GTK2_RC_FILES "$XDG_CONFIG_HOME"/gtk-2.0/gtkrc +set -Ux MINIKUBE_HOME "$XDG_DATA_HOME"/minikube +set -Ux _JAVA_OPTIONS '-Djava.util.prefs.userRoot="$XDG_CONFIG_HOME"/java' +set -Ux PYENV_ROOT "$XDG_DATA_HOME"/pyenv +set -Ux PYTHONSTARTUP "$XDG_CONFIG_HOME"/python/pythonrc diff --git a/.config/fish/config.fish b/.config/fish/config.fish index d4edc5d..bd2c0cb 100644 --- a/.config/fish/config.fish +++ b/.config/fish/config.fish @@ -16,34 +16,11 @@ set -Ux XDG_CONFIG_HOME "$HOME/.config" set -Ux XDG_DATA_HOME "$HOME/.local/share" set -Ux XDG_CACHE_HOME "$HOME/.cache" -# cleanup -set -Ux ANDROID_HOME "$XDG_DATA_HOME"/android -set -Ux CARGO_HOME "$XDG_DATA_HOME"/cargo -set -Ux CUDA_CACHE_PATH "$XDG_CACHE_HOME"/nv -set -Ux GDBHISTFILE "$XDG_DATA_HOME"/gdb/history -set -Ux GNUPGHOME "$XDG_DATA_HOME"/gnupg -set -Ux GOPATH "$XDG_DATA_HOME"/go -set -Ux ICEAUTHORITY "$XDG_CACHE_HOME"/ICEauthority -set -Ux IPYTHONDIR "$XDG_CONFIG_HOME"/ipython -set -Ux LESSHISTFILE - -set -Ux MYPY_CACHE_DIR "$XDG_CACHE_HOME"/mypy -set -Ux NPM_CONFIG_USERCONFIG "$XDG_CONFIG_HOME"/npm/npmrc -set -Ux PASSWORD_STORE_DIR "$XDG_DATA_HOME"/pass -set -Ux RUSTUP_HOME "$XDG_DATA_HOME"/rustup -set -Ux SQLITE_HISTORY "$XDG_CACHE_HOME"/sqlite_history -set -Ux UNCRUSTIFY_CONFIG "$XDG_CONFIG_HOME"/uncrustify/uncrustify.cfg -set -Ux XAUTHORITY "$XDG_RUNTIME_DIR"/Xauthority -set -Ux _JAVA_OPTIONS -Djava.util.prefs.userRoot="$XDG_CONFIG_HOME"/java -set -Ux ERRFILE "$XDG_CACHE_HOME/X11/xsession-errors" -set -Ux XAUTHORITY "$XDG_RUNTIME_DIR"/Xauthority -set -Ux RUSTUP_HOME "$XDG_DATA_HOME"/rustup -set -Ux CARGO_HOME "$XDG_DATA_HOME"/cargo - # wine prefix -set -Ux WINEPREFIX "$XDG_DATA_HOME/wine/" +# set -Ux WINEPREFIX "$XDG_DATA_HOME/wine/" # kvantum -set -Ux QT_STYLE_OVERRIDE kvantum +set -Ux QT_QPA_PLATFORMTHEME qt5ct # use nvim for stuff set -Ux EDITOR nvim @@ -52,4 +29,7 @@ set -Ux MANPAGER nvimpager # zoxide set -Ux _ZO_MAXAGE 100000 +# kubectl +set -Ux KUBECONFIG ~/.kube/config + starship init fish | source diff --git a/.config/fish/fish_variables b/.config/fish/fish_variables new file mode 100644 index 0000000..ec732bf --- /dev/null +++ b/.config/fish/fish_variables @@ -0,0 +1,65 @@ +# This file contains fish universal variable definitions. +# VERSION: 3.0 +SETUVAR --export ANDROID_HOME:/home/trt/\x2elocal/share/android +SETUVAR --export ANDROID_USER_HOME:/home/trt/\x2elocal/share/android +SETUVAR --export CARGO_HOME:/home/trt/\x2elocal/share/cargo +SETUVAR --export --path CUDA_CACHE_PATH:/home/trt/\x2ecache/nv +SETUVAR --export DOCKER_CONFIG:/home/trt/\x2econfig/docker +SETUVAR --export EDITOR:nvim +SETUVAR --export ERRFILE:/home/trt/\x2ecache/X11/xsession\x2derrors +SETUVAR --export GDBHISTFILE:/home/trt/\x2elocal/share/gdb/history +SETUVAR --export GNUPGHOME:/home/trt/\x2elocal/share/gnupg +SETUVAR --export --path GOPATH:/home/trt/\x2elocal/share/go +SETUVAR --export GTK2_RC_FILES:/home/trt/\x2econfig/gtk\x2d2\x2e0/gtkrc +SETUVAR --export ICEAUTHORITY:/home/trt/\x2ecache/ICEauthority +SETUVAR --export IPYTHONDIR:/home/trt/\x2econfig/ipython +SETUVAR --export KUBECONFIG:/home/trt/\x2ekube/config +SETUVAR --export LESSHISTFILE:\x2d +SETUVAR --export MANPAGER:nvimpager +SETUVAR --export MINIKUBE_HOME:/home/trt/\x2elocal/share/minikube +SETUVAR --export MYPY_CACHE_DIR:/home/trt/\x2ecache/mypy +SETUVAR --export NPM_CONFIG_USERCONFIG:/home/trt/\x2econfig/npm/npmrc +SETUVAR --export PASSWORD_STORE_DIR:/home/trt/\x2elocal/share/pass +SETUVAR --export PYENV_ROOT:/home/trt/\x2elocal/share/pyenv +SETUVAR --export PYTHONSTARTUP:/home/trt/\x2econfig/python/pythonrc +SETUVAR --export QT_QPA_PLATFORMTHEME:qt5ct +SETUVAR --export RUSTUP_HOME:/home/trt/\x2elocal/share/rustup +SETUVAR --export SQLITE_HISTORY:/home/trt/\x2ecache/sqlite_history +SETUVAR --export UNCRUSTIFY_CONFIG:/home/trt/\x2econfig/uncrustify/uncrustify\x2ecfg +SETUVAR --export XAUTHORITY:/run/user/1000/Xauthority +SETUVAR --export XDG_CACHE_HOME:/home/trt/\x2ecache +SETUVAR --export XDG_CONFIG_HOME:/home/trt/\x2econfig +SETUVAR --export XDG_DATA_HOME:/home/trt/\x2elocal/share +SETUVAR --export XINITRC:/home/trt/\x2econfig/X11/xinitrc +SETUVAR --export _JAVA_OPTIONS:\x2dDjava\x2eutil\x2eprefs\x2euserRoot\x3d\x22\x24XDG_CONFIG_HOME\x22/java +SETUVAR --export _ZO_MAXAGE:100000 +SETUVAR __fish_initialized:3800 +SETUVAR fish_color_autosuggestion:brblack +SETUVAR fish_color_cancel:\x2dr +SETUVAR fish_color_command:normal +SETUVAR fish_color_comment:red +SETUVAR fish_color_cwd:green +SETUVAR fish_color_cwd_root:red +SETUVAR fish_color_end:green +SETUVAR fish_color_error:brred +SETUVAR fish_color_escape:brcyan +SETUVAR fish_color_history_current:\x2d\x2dbold +SETUVAR fish_color_host:normal +SETUVAR fish_color_host_remote:yellow +SETUVAR fish_color_normal:normal +SETUVAR fish_color_operator:brcyan +SETUVAR fish_color_param:cyan +SETUVAR fish_color_quote:yellow +SETUVAR fish_color_redirection:cyan\x1e\x2d\x2dbold +SETUVAR fish_color_search_match:white\x1e\x2d\x2dbackground\x3dbrblack +SETUVAR fish_color_selection:white\x1e\x2d\x2dbold\x1e\x2d\x2dbackground\x3dbrblack +SETUVAR fish_color_status:red +SETUVAR fish_color_user:brgreen +SETUVAR fish_color_valid_path:\x2d\x2dunderline +SETUVAR fish_key_bindings:fish_vi_key_bindings +SETUVAR fish_pager_color_completion:normal +SETUVAR fish_pager_color_description:yellow\x1e\x2di +SETUVAR fish_pager_color_prefix:normal\x1e\x2d\x2dbold\x1e\x2d\x2dunderline +SETUVAR fish_pager_color_progress:brwhite\x1e\x2d\x2dbackground\x3dcyan +SETUVAR fish_pager_color_selected_background:\x2dr +SETUVAR fish_user_paths:/home/trt/\x2econfig/scripts/util\x1e/home/trt/\x2econfig/scripts/applications\x1e/home/trt/\x2elocal/share/go/bin\x1e/home/trt/\x2elocal/bin diff --git a/.config/fish/functions/pm.fish b/.config/fish/functions/pm.fish deleted file mode 100644 index 3244ed1..0000000 --- a/.config/fish/functions/pm.fish +++ /dev/null @@ -1,4 +0,0 @@ -function pm --wraps=pulsemixer --description 'alias pm=pulsemixer' - pulsemixer $argv - -end diff --git a/.config/fish/functions/py.fish b/.config/fish/functions/py.fish deleted file mode 100644 index 6963e9f..0000000 --- a/.config/fish/functions/py.fish +++ /dev/null @@ -1,4 +0,0 @@ -function py --wraps=python --description 'alias py=python' - python $argv - -end diff --git a/.config/fish/functions/xdg.fish b/.config/fish/functions/xdg.fish new file mode 100644 index 0000000..b7c0bea --- /dev/null +++ b/.config/fish/functions/xdg.fish @@ -0,0 +1,3 @@ +function adb + env HOME="$XDG_DATA_HOME/android" adb $argv +end