dotfiles

Unnamed repository; edit this file 'description' to name the repository.
Log | Files | Refs | README

commit de4343e672ba63e21df5253bc6a43303a952a2ee
parent d6b70d310cf3f82026fc74acc6a09e911d56f488
Author: mrgrouse <mrgrouse@mrgrouse.com>
Date:   Fri, 30 Aug 2024 21:54:39 -0400

config.fish: reorganize environment variables in config.fish, update NNN configs to work with preview

Diffstat:
Mfish/config.fish | 62++++++++++++++++++++++++++++++++++++++++++++++++--------------
1 file changed, 48 insertions(+), 14 deletions(-)

diff --git a/fish/config.fish b/fish/config.fish @@ -4,17 +4,19 @@ set -x EDITOR nvim set -x TERMINAL kitty # Exporting XDG Dirs +set -x XDG_CURRENT_DESKTOP "XFCE" set -x XDG_DATA_HOME "$HOME/.local/share" set -x XDG_CONFIG_HOME "$HOME/.config" set -x XDG_STATE_HOME "$HOME/.local/state" set -x XDG_CACHE_HOME "$HOME/.cache" set -x XDG_PICTURES "$HOME/Pictures" +set -x XDG_DOWNLOAD_DIR "$HOME/Downloads" # $HOME clean up: set -x WGETRC "$XDG_CONFIG_HOME/wget/wgetrc" set -x GNUPGHOME "$XDG_CONFIG_HOME/gnupg" set -x WINEPREFIX "$XDG_CONFIG_HOME/wineprefixes/default" -set -x XAUTHORITY "$XDG_RUNTIME_DIR/Xauthority" +set -x XAUTHORITY "$XDG_RUNTIME_DIR/Xauthority" # sketchy set -x LESSHISTFILE - set -x HISTFILE "$XDG_CONFIG_HOME/bash/history" set -x GOPATH "$XDG_CONFIG_HOME/go" @@ -22,26 +24,46 @@ set -x GOMODCACHE "$XDG_CONFIG_HOME/go/mod" set -x TERMINFO "$XDG_CONFIG_HOME/terminfo" set -x CUDA_CACHE_PATH "$XDG_CONFIG_HOME/nv" set -x XINITRC "$XDG_CONFIG_HOME/X11/xinitrc" - -set -x JAVA_OPTIONS "-Djava.util.prefs.userRoot $XDG_CONFIG_HOME/java" # i have no idea what i'm doing but xdg-ninja told me this so i guess it won't hurt (?) - -# further cleaning up $HOME +set -x PYTHONSTARTUP "$XDG_CONFIG_HOME/python/pythonrc" set -x RUSTUP_HOME "$XDG_DATA_HOME/rustup" # rustup set -x CARGO_HOME "$XDG_DATA_HOME/cargo" # cargo set -x ZDOTDIR "$XDG_CONFIG_HOME/zsh" # zsh configs set -x NPM_CONFIG_USERCONFIG "$XDG_CONFIG_HOME/npm/npmrc" #npmrc set -x GRIM_DEFAULT_DIR "$XDG_PICTURES/screenshots" # grim output +set -x JAVA_OPTIONS "-Djava.util.prefs.userRoot $XDG_CONFIG_HOME/java" # i have no idea what i'm doing but xdg-ninja told me this so i guess it won't hurt (?) # android set -x ANDROID_USER_HOME "$XDG_DATA_HOME/android" + + # nnn variables set -x NNN_FIFO "/tmp/nnn.fifo" -## 'H' enables hidden directories -## 'd' enables details +set BLK "04" +set CHR "04" +set DIR "04" +set EXE "00" +set REG "00" +set HARDLINK "00" +set SYMLINK "06" +set MISSING "00" +set ORPHAN "01" +set FIFO "0F" +set SOCK "0F" +set OTHER "02" +set -x NNN_FCOLORS "$BLK$CHR$DIR$EXE$REG$HARDLINK$SYMLINK$MISSING$ORPHAN$FIFO$SOCK$OTHER" +## 'H' enables hidden directories, 'd' enables details set -x NNN_OPTS "Hd" -set -x NNN_PLUG 'f:fzcd;p:preview-tabbed' +#set -x NNN_PLUG 'f:fzcd;p:preview-tabbed' +set -x NNN_PLUG 'p:preview-tui' +set -x NNN_OPENER '/home/mrgrouse/.config/nnn/plugins/nuke' + + +# ibus variables +set -x GTK_IM_MODULE ibus +set -x QT_IM_MODULE ibus + # aliases ssh to 'kitten ssh' if the terminal is kitty [ $TERM = xterm-kitty ] && alias ssh "kitten ssh" || functions --erase ssh @@ -49,14 +71,26 @@ set -x NNN_PLUG 'f:fzcd;p:preview-tabbed' # grab pywal colors #[ -z $(status is-interactive) ] && cat $HOME/.cache/wal/sequences -#dawg I absolutely HATE feh's background options it is SO DUMB. +#bruh i ABSOLUTELY HATE FEH'S BACKGROUND OPTION ITS SO DUMB test -e $HOME/.fehbg && rm $HOME/.fehbg - -# remove goofy greeting :clown_face: +# dumb greeting :clown_face: +set --erase fish_greeting set -g fish_greeting - # if pki dir exists, move files to XDG_DATA_HOME -test -e $HOME/.pki && mv $HOME/.pki $XDG_DATA_HOME/pki +#test -e $HOME/.pki && mv $HOME/.pki $XDG_DATA_HOME/pki +#test -e $XDG_DATA_HOME/pki/.pki && mv $XDG_DATA_HOME/pki/.pki/* $XDG_DATA_HOME/pki/ && rm -rf $XDG_DATA_HOME/pki/.pki # removes dbus folder from HOME and exports the contents as env variables -export $(dbus-launch) && rm -rf $HOME/.dbus +#[] +#export $(dbus-launch) && rm -rf $HOME/.dbus + +# might be universal idk, not using for now bc of fishism one from archwiki +#[ -z "$DISPLAY" ] && [ "$XDG_VTNR" = 1 ] && chvt 2 && startx /usr/local/bin/birdwm + +# fish-local: +# Start X at login +#if status is-login +# if test -z "$DISPLAY" -a "$XDG_VTNR" = 1 +# exec startx /usr/local/bin/birdwm -keeptty +# end +#end