diff options
| author | Yann Herklotz <git@yannherklotz.com> | 2021-09-08 13:16:13 +0100 |
|---|---|---|
| committer | Yann Herklotz <git@yannherklotz.com> | 2021-09-08 13:16:13 +0100 |
| commit | cd395124ec91c49e58525b0fccf73aec28202d32 (patch) | |
| tree | 0ee356bfd239270d02b81ab2127dc141ab35a051 /zsh | |
| parent | 63ba750d5ab8ae9d20750d9461a95307c20c9bbf (diff) | |
| parent | a8fd139a791364b8484b9f82669bd31a0f55153e (diff) | |
| download | dotfiles-cd395124ec91c49e58525b0fccf73aec28202d32.tar.gz dotfiles-cd395124ec91c49e58525b0fccf73aec28202d32.zip | |
Merge branch 'master' of github.com:ymherklotz/dotfiles
Diffstat (limited to 'zsh')
| -rw-r--r-- | zsh/.zsh/export.zsh | 10 | ||||
| -rw-r--r-- | zsh/.zshrc | 6 |
2 files changed, 11 insertions, 5 deletions
diff --git a/zsh/.zsh/export.zsh b/zsh/.zsh/export.zsh index a978e4b..2de4b93 100644 --- a/zsh/.zsh/export.zsh +++ b/zsh/.zsh/export.zsh @@ -1,9 +1,10 @@ os=$(uname -s) -. $HOME/.nix-profile/etc/profile.d/nix.sh - [ -n "$SSH_CLIENT" ] && export MINIMAL_USER_CHAR="$(hostname)" +. $HOME/.nix-profile/etc/profile.d/nix.sh +export NIX_IGNORE_SYMLINK_STORE=1 + export GITHUB_HOME=$HOME/Projects export FZF_DEFAULT_COMMAND='fd --type file --hidden --no-ignore' export ALTERNATE_EDITOR="emacs -nw -Q" @@ -24,7 +25,7 @@ if [ $os = "Darwin" ]; then prepend_path "/Library/TeX/texbin" prepend_path "/usr/local/opt/bison/bin" - append_path "${HOME}/Library/Python/3.8/bin" + append_path "${HOME}/Library/Python/3.9/bin" fi prepend_path "/usr/local/bin" @@ -33,11 +34,14 @@ prepend_path "${HOME}/.yarn/bin" prepend_path "${HOME}/.cargo/bin" prepend_path "${HOME}/.cabal/bin" prepend_path "${HOME}/.local/bin" +# prepend_path "/usr/local/opt/llvm/bin" prepend_path "/mnt/data/tools/panda/bambu-9.7-dev/bin" append_path "/opt/Xilinx/Vivado/2019.1/bin" append_path "/opt/intelFPGA_lite/18.1/quartus/bin" +append_path "$HOME/projects/vericert/bin" +append_path "/opt/bin" export PATH @@ -27,9 +27,11 @@ setopt HIST_FIND_NO_DUPS #if [ -d ~/.cache/wal ]; then (cat ~/.cache/wal/sequences &) fi +export MINIMAL_MAGIC_ENTER=no + # Sourcing everything -if [ -e /usr/share/fzf/key-bindings.zsh ]; then source /usr/share/fzf/key-bindings.zsh; fi -if [ -e /usr/share/fzf/completion.zsh ]; then source /usr/share/fzf/completion.zsh; fi +#if [ -e /usr/share/fzf/key-bindings.zsh ]; then source /usr/share/fzf/key-bindings.zsh; fi +#if [ -e /usr/share/fzf/completion.zsh ]; then source /usr/share/fzf/completion.zsh; fi if [ -e $HOME/.zsh/export.zsh ]; then source $HOME/.zsh/export.zsh; fi if [ -e $HOME/.zsh/minimal.zsh ]; then source $HOME/.zsh/minimal.zsh; fi if [ -e $HOME/.zsh/function.zsh ]; then source $HOME/.zsh/function.zsh; fi |