diff --git a/dot_config/fish/executable_config.fish b/dot_config/fish/executable_config.fish index d5537d2..a78b26b 100644 --- a/dot_config/fish/executable_config.fish +++ b/dot_config/fish/executable_config.fish @@ -31,7 +31,6 @@ setpath ~/.n/bin setpath /snap/bin setpath ~/.emacs.d/bin setpath ~/Library/Python/3.7/bin -setpath /opt/texlive/2019/bin/x86_64-linux setpath ~/.radicle/bin # Source private stuff @@ -40,7 +39,7 @@ source ~/.config/fish/private.fish # Environment variables set -x EDITOR "vim" set -x USER "lu" -set -x SHELL /usr/bin/fish +set -x SHELL /opt/homebrew/bin/fish set -x TERM xterm-256color set -x N_PREFIX ~/n set -x GTK_IM_MODULE ibus @@ -52,17 +51,21 @@ set -x LC_ALL 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" # General Aliases alias editconfig "chezmoi edit ~/.config/fish/config.fish; and chezmoi apply; and source ~/.config/fish/config.fish" alias j "z" alias c "cargo" +alias cr "cargo run" +alias cb "cargo build" +alias cwr "cargo watch -x run" alias emacsd "emacs --daemon" alias jo "zo" alias be "bundle exec" alias doc "docker-compose" alias rp "rustup" -alias ca "cargo" alias mkt "cd (mktemp -d)" alias y "sudo zypper" alias czm "chezmoi" @@ -91,6 +94,9 @@ alias hpl "hg pull" alias hs "hg status" alias hl "hg log" +# asdf support +echo -e "\nsource "(brew --prefix asdf)"/asdf.fish" >> ~/.config/fish/config.fish + # Aliases that overwrite other, existing commands if command --search hub > /dev/null do alias git "hub"