Add a lot of changesHEADmaster

2 files changed, 33 insertions, 46 deletions

diff --git a/home/.config/sh/aliases b/home/.config/sh/aliases
index dcff035..3c50636 100644
--- a/home/.config/sh/aliases
+++ b/home/.config/sh/aliases
@@ -9,7 +9,7 @@ whichkey() {
 }
 
 alias sudo='doas'
-alias sudoedit='doas nvim'
+alias sudoedit='doasedit'
 
 alias grep='grep --color=auto'
 alias fgrep='fgrep --color=auto'
@@ -26,8 +26,6 @@ alias g='git'
 alias sys='systemctl'
 alias ssys='doas systemctl'
 alias sysu='systemctl --user'
-alias sst='systemctl status'
-alias syse='doas systemctl edit'
 
 alias gimme='doas chown $USER:$(id -gn $USER)'
 alias free='free -h'
@@ -70,3 +68,4 @@ alias astcc='clang -Xclang -ast-dump -fsyntax-only'
 alias astfc='flang-new -fc1 -fdebug-dump-parse-tree'
 
 alias gdb='gdb -ex start --args'
+alias j='just'
diff --git a/home/.config/sh/envrc b/home/.config/sh/envrc
index d06a12f..ec75d82 100644
--- a/home/.config/sh/envrc
+++ b/home/.config/sh/envrc
@@ -1,7 +1,8 @@
 #! /bin/sh
 
 if [ -z "$ENV_SOURCED" ]; then
-    export ENV_SOURCED="$0"
+  export PATH="$HOME"/.local/bin:"$PATH"
+  export ENV_SOURCED="$0"
 fi
 
 safesource() {
@@ -17,8 +18,6 @@ ifexists() {
     exists "$1" && "$@"
 }
 
-export PATH="$HOME"/.local/bin:"$PATH"
-
 case $TERM in
     *256color|*truecolor)
         export COLORTERM=24bit
@@ -96,11 +95,11 @@ export LESS="-F -X $LESS"
 
 export LANG=en_US.UTF-8
 export OPENER='xdg-open'
-export FZF_DEFAULT_COMMAND="fd --type file --follow --hidden --exclude .git"
+export FZF_DEFAULT_COMMAND="fd --type file --follow --hidden --exclude .git --color=always"
 export FZF_CTRL_T_COMMAND="$FZF_DEFAULT_COMMAND"
-export FZF_DIRS_COMMAND="fd --type d --follow --hidden --exclude .git"
-export FZF_DEFAULT_OPTS="--layout=reverse --inline-info --cycle --color=dark --color=fg:-1,bg:-1,hl:#5fff87,fg+:-1,bg+:-1,hl+:#ffaf5f --color=info:#af87ff,prompt:#5fff87,pointer:#ff87d7,marker:#ff87d7,spinner:#ff87d7"
-export FZF_CTRL_T_OPTS="--preview '(highlight -O ansi -l {} 2> /dev/null || cat {} || tree -C {}) 2> /dev/null | head -200' --select-1 --exit-0"
+export FZF_DIRS_COMMAND="fd --type d --follow --hidden --exclude .git --color=always"
+export FZF_DEFAULT_OPTS="--ansi --layout=reverse --inline-info --cycle --color=dark --color=fg:-1,bg:-1,hl:#5fff87,fg+:-1,bg+:-1,hl+:#ffaf5f --color=info:#af87ff,prompt:#5fff87,pointer:#ff87d7,marker:#ff87d7,spinner:#ff87d7"
+export FZF_CTRL_T_OPTS="--preview 'bat --color=always --style=numbers --line-range=:500 {}' 2> /dev/null | head -200' --select-1 --exit-0"
 export FZF_CTRL_R_OPTS="--preview 'echo {}' --preview-window down:3:hidden:wrap --bind '?:toggle-preview' --sort --exact"
 export FZF_ALT_C_OPTS="--preview 'tree -C {} | head -200'"
 
@@ -151,55 +150,44 @@ export GIT_PS1_HIDE_IF_PWD_IGNORED=1
 
 export DOCKER_HOST="unix://$XDG_RUNTIME_DIR/podman/podman.sock"
 
-if [ "$(uname -n)" = "hercules" ]; then
-    export OCL_ICD_VENDORS=nvidia
-    # shellcheck source=/dev/null
-    [ -r  ~/.config/sh/envrc ] && . ~/.config/sh/work-envrc
-fi
-
 # https://github.com/sparrowwallet/sparrow/issues/170#issuecomment-896866817
 export GDK_DISPLAY=1
 
 # cleanup ~
-export GTK_RC_FILES="$XDG_CONFIG_HOME/gtk-1.0/gtkrc"
+# https://wiki.archlinux.org/title/XDG_Base_Directory#Partial
+export ALTUSERXSESSION="$XDG_CACHE_HOME/x11/Xsession"
+export CARGO_HOME="$XDG_DATA_HOME/cargo"
+export CUDA_CACHE_PATH="$XDG_CACHE_HOME/nv"
+export ERRFILE="$XDG_CACHE_HOME/x11/xsession-errors"
+export GNUPGHOME="$XDG_DATA_HOME/gnupg"
+export GOPATH="$XDG_DATA_HOME/go"
+export GRADLE_USER_HOME="$XDG_DATA_HOME/gradle"
 export GTK2_RC_FILES="$XDG_CONFIG_HOME/gtk-2.0/gtkrc-2.0"
-export WGETRC="$XDG_CONFIG_HOME/wget/wgetrc"
+export GTK_RC_FILES="$XDG_CONFIG_HOME/gtk-1.0/gtkrc"
 export INPUTRC="$XDG_CONFIG_HOME/sh/inputrc"
-export ZDOTDIR="$XDG_CONFIG_HOME/zsh"
+export NODE_REPL_HISTORY="$XDG_DATA_HOME/node_repl_history"
 export PASSWORD_STORE_DIR="$XDG_DATA_HOME/password-store"
-export GNUPGHOME="$XDG_DATA_HOME/gnupg"
-export LESSHISTFILE="-"
-export BASH_COMPLETION_USER_FILE="$XDG_CONFIG_HOME/bash-completion/bash_completion"
-export CARGO_HOME="$XDG_DATA_HOME/cargo"
-export CUDA_CACHE_PATH="$XDG_CACHE_HOME/nv"
-export LESSKEY="$XDG_CONFIG_HOME/less/lesskey"
-export TERMINFO_DIRS="$XDG_DATA_HOME/terminfo":/usr/share/terminfo
-export IPYTHONDIR="$XDG_CONFIG_HOME/ipython"
-export NPM_CONFIG_USERCONFIG="$XDG_CONFIG_HOME/npm/npmrc"
 export PYTHON_EGG_CACHE="$XDG_CACHE_HOME/python-eggs"
+export RUFF_CACHE_DIR=$XDG_CACHE_HOME/ruff
 export RUSTUP_HOME="$XDG_DATA_HOME/rustup"
-export TMUX_TMPDIR="$XDG_RUNTIME_DIR"
-export WINEPREFIX="$XDG_DATA_HOME/wineprefixes/default"
-export XINITRC="$XDG_CONFIG_HOME/X11/xinitrc"
-export XSERVERRC="$XDG_CONFIG_HOME/X11/xserverrc"
-export CCACHE_CONFIGPATH="$XDG_CONFIG_HOME/ccache.config"
-export CCACHE_DIR="$XDG_CACHE_HOME/ccache"
 export RUSTUP_HOME="$XDG_DATA_HOME/rustup"
-export RIPGREP_CONFIG_PATH="$XDG_CONFIG_HOME/ripgrep/ripgreprc"
-export DOCKER_CONFIG="$XDG_CONFIG_HOME/docker"
-export MACHINE_STORAGE_PATH="$XDG_DATA_HOME/docker-machine"
-export GOPATH="$XDG_DATA_HOME/go"
-export GRADLE_USER_HOME="$XDG_DATA_HOME/gradle"
-export XCOMPOSEFILE="$XDG_CONFIG_HOME/X11/xcompose"
-export XCOMPOSECACHE="$XDG_CACHE_HOME/X11/xcompose"
-export NODE_REPL_HISTORY="$XDG_DATA_HOME/node_repl_history"
-export NVM_DIR="$XDG_DATA_HOME/nvm"
-export WORKON_HOME="$XDG_DATA_HOME/virtualenvs"
 export USERXSESSION="$XDG_CACHE_HOME/x11/xsession"
 export USERXSESSIONRC="$XDG_CACHE_HOME/x11/xsessionrc"
-export ALTUSERXSESSION="$XDG_CACHE_HOME/x11/Xsession"
-export ERRFILE="$XDG_CACHE_HOME/x11/xsession-errors"
+export WGETRC="$XDG_CONFIG_HOME/wget/wgetrc"
+export WINEPREFIX="$XDG_DATA_HOME/wineprefixes/default"
+export WORKON_HOME="$XDG_DATA_HOME/virtualenvs"
+export XCOMPOSECACHE="$XDG_CACHE_HOME/X11/xcompose"
+export XCOMPOSEFILE="$XDG_CONFIG_HOME/X11/xcompose"
+export XINITRC="$XDG_CONFIG_HOME/X11/xinitrc"
+export XSERVERRC="$XDG_CONFIG_HOME/X11/xserverrc"
+export ZDOTDIR="$XDG_CONFIG_HOME/zsh"
 
 unset SSH_AGENT_PID
 SSH_AUTH_SOCK="$(gpgconf --list-dirs agent-ssh-socket)"
 export SSH_AUTH_SOCK
+
+if [ "$(uname -n)" = "hercules" ]; then
+    export OCL_ICD_VENDORS=nvidia
+    # shellcheck source=/dev/null
+    [ -r  ~/.config/sh/envrc ] && . ~/.config/sh/work-envrc
+fi