clean up fish config

dot_config/fish/executable_config.fish

@@ -1,11 +1,11 @@
 # Convenience function for only setting PATH if the specified directory exists
 function setpath
-  test -e $argv[1]; and set PATH $argv[1] $PATH 
+  test -e $argv[1]; and fish_add_path $argv[1]
 end
 
 # Custom greeting
 function fish_greeting
-
+  echo "Welcome to $(hostname -s)!"
 end
 
 if test -z "$XDG_RUNTIME_DIR"
@@ -16,15 +16,12 @@ if test -z "$XDG_RUNTIME_DIR"
   end
 end
 
-if test -e /nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh
-  fenv source /nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh
-end
-
 # PATH adjustment
 setpath /opt/local/bin
 setpath /opt/homebrew/bin
 setpath ~/.rbenv/shims
 setpath ~/.rbenv/bin
+setpath ~/.pyenv/shims
 setpath ~/.cargo/bin
 setpath ~/.nimble/bin
 setpath ~/.local/bin
@@ -35,9 +32,6 @@ setpath ~/.npm-packages/bin
 setpath ~/.n/bin
 setpath /snap/bin
 setpath ~/.emacs.d/bin
-setpath ~/Library/Python/3.7/bin
-setpath ~/.radicle/bin
-setpath ~/.edgedb/bin
 setpath ~/.fly/bin
 setpath ~/.nimble/bin
 setpath ~/Projects/go/bin
@@ -53,7 +47,6 @@ set -x EDITOR "vim"
 set -x USER "lu"
 set -x SHELL (which fish)
 set -x TERM xterm-256color
-set -x N_PREFIX ~/n
 set -x GTK_IM_MODULE ibus
 set -x XMODIFIERS @im=ibus
 set -x QT_IM_MODULE ibus
@@ -64,31 +57,24 @@ set -x LC_CTYPE en_US.UTF-8
 set -x LANGUAGE en_US.UTF-8
 set -x RUST_SRC_PATH (rustc --print sysroot)/lib/rustlib/src/rust/src
 set -x XDG_CURRENT_DESKTOP Unity
-set -x PYTHONPATH '/Users/lu/.local/pipx/venvs/pdm/lib/python3.9/site-packages/pdm/pep582' $PYTHONPATH
 set -x LANG "en_US.UTF-8"
 set -x TZ_LIST "Europe/Berlin;Berlin,America/New_York;US East,America/Los_Angeles;US West,Europe/London;London"
 
 # General Aliases
 alias editconfig "chezmoi edit ~/.config/fish/config.fish; and chezmoi apply; and source ~/.config/fish/config.fish"
-alias getsshkey "cat ~/.ssh/id_ed25519.pub -p --color never"
+alias printsshkey "cat ~/.ssh/id_ed25519.pub -p --color never"
 alias doco "docker-compose"
 alias j "z"
-alias cat "bat"
 alias c "cargo"
 alias cr "cargo run"
 alias cb "cargo build"
 alias cwr "cargo watch -x run"
-alias emacsd "emacs --daemon"
 alias be "bundle exec"
-alias doc "docker-compose"
 alias rp "rustup"
 alias mkt "cd (mktemp -d)"
 alias y "sudo zypper"
 alias czm "chezmoi"
 alias r "ranger"
-alias zcc "zig cc"
-alias nxs "nix-shell"
-alias zj "zellij"
 # Git Aliases
 alias g "git"
 alias gs "g status --short"
@@ -113,10 +99,6 @@ alias hp "hg push"
 alias hpl "hg pull"
 alias hs "hg status"
 alias hl "hg log"
-# XBPS Aliases
-alias xi "sudo xbps-install"
-alias xq "xbps-query"
-alias xr "sudo xbps-remove"
 
 # Aliases that overwrite other, existing commands
 if command --search hub > /dev/null do
@@ -132,13 +114,3 @@ if command --search nvim > /dev/null do
   set -x EDITOR "nvim"
 end
 
-# Some neat GPG shorthands
-function secret
-  set output ~/$argv[1].(date +%s).enc
-  gpg --encrypt --armor --output $output $argv[1]; and echo "$argv[1] -> $output"
-end
-
-function reveal
-  set output (echo $argv[1] | rev | cut -c16- | rev)
-  gpg --decrypt --output $output $argv[1]; and echo "$argv[1] -> $output"
-end

dot_config/fish/fish_plugins

@@ -2,3 +2,4 @@ jorgebucaran/fisher
 franciscolourenco/done
 laughedelic/pisces
 oh-my-fish/plugin-foreign-env
+jorgebucaran/nvm.fish

dot_doom.d/init.el

@@ -32,7 +32,7 @@
        doom              ; what makes DOOM look the way it does
        doom-dashboard    ; a nifty splash screen for Emacs
        ;;doom-quit         ; DOOM quit-message prompts when you quit Emacs
-       (emoji +unicode +github)  ; 🙂
+       ;;emoji  ; 🙂
        hl-todo           ; highlight TODO/FIXME/NOTE/DEPRECATED/HACK/REVIEW
        ;;hydra
        indent-guides     ; highlighted indent columns