diff options
| author | Yann Herklotz <git@yannherklotz.com> | 2020-03-16 18:29:47 +0000 |
|---|---|---|
| committer | Yann Herklotz <git@yannherklotz.com> | 2020-03-16 18:29:47 +0000 |
| commit | b60f9d79638294d21902825996191d78e8ff9211 (patch) | |
| tree | a807e909fcd858e4f083e1c604bd26557a02856f /zsh | |
| parent | 6979b88787a03193422cc14322134bd2cda77754 (diff) | |
| parent | be5de99c1957b92ce4f749d504c79c572bb2ec52 (diff) | |
| download | dotfiles-b60f9d79638294d21902825996191d78e8ff9211.tar.gz dotfiles-b60f9d79638294d21902825996191d78e8ff9211.zip | |
Merge branch 'uni'
Diffstat (limited to 'zsh')
| -rw-r--r-- | zsh/.zsh/export.zsh | 3 | ||||
| -rw-r--r-- | zsh/.zsh/function.zsh | 4 | ||||
| -rw-r--r-- | zsh/.zsh/startup.zsh | 4 | ||||
| -rw-r--r-- | zsh/.zshrc | 9 |
4 files changed, 14 insertions, 6 deletions
diff --git a/zsh/.zsh/export.zsh b/zsh/.zsh/export.zsh index a395d92..78cff50 100644 --- a/zsh/.zsh/export.zsh +++ b/zsh/.zsh/export.zsh @@ -13,9 +13,12 @@ export PATH="${PATH}:/opt/intelFPGA_lite/18.1/quartus/bin" export PATH="${HOME}/.local/bin:${PATH}" export PATH="${HOME}/.cargo/bin:${PATH}" export PATH="${HOME}/.cabal/bin:${PATH}" +if [[ -d "${HOME}/.gem/ruby/2.7.0/bin" ]]; then export PATH="${HOME}/.gem/ruby/2.7.0/bin:${PATH}"; fi # Stop dotnet telemetry export DOTNET_CLI_TELEMETRY_OPTOUT=1 # Fix java windows for tiling window managers export _JAVA_AWT_WM_NONREPARENTING=1 + +eval "$(direnv hook zsh)" diff --git a/zsh/.zsh/function.zsh b/zsh/.zsh/function.zsh index fdd6980..b4cc40a 100644 --- a/zsh/.zsh/function.zsh +++ b/zsh/.zsh/function.zsh @@ -24,11 +24,11 @@ fdd() { wal-tile() { wal -n -i "$@" feh --bg-fill "$(< "${HOME}/.cache/wal/wal")" - /home/yannherklotz/.local/bin/betterlock -u "$(< "${HOME}/.cache/wal/wal")" + $HOME/.local/bin/betterlock -u "$(< "${HOME}/.cache/wal/wal")" } wal-tile-l() { wal -l -n -i "$@" feh --bg-fill "$(< "${HOME}/.cache/wal/wal")" - /home/yannherklotz/.local/bin/betterlock -u "$(< "${HOME}/.cache/wal/wal")" + $HOME/.local/bin/betterlock -u "$(< "${HOME}/.cache/wal/wal")" } diff --git a/zsh/.zsh/startup.zsh b/zsh/.zsh/startup.zsh index e8caf69..2002337 100644 --- a/zsh/.zsh/startup.zsh +++ b/zsh/.zsh/startup.zsh @@ -5,6 +5,6 @@ fi # direnv -eval "$(direnv hook zsh)" - # End Nix + +eval $(opam env) @@ -1,3 +1,5 @@ +[[ $TERM == "dumb" ]] && unsetopt zle && PS1=$ && return + # Lines configured by zsh-newuser-install HISTFILE=~/.histfile HISTSIZE=100000 @@ -23,7 +25,7 @@ setopt HIST_IGNORE_DUPS setopt HIST_IGNORE_SPACE setopt HIST_FIND_NO_DUPS -(cat ~/.cache/wal/sequences &) +(cat ~/.cache/wal/sequences &) >/dev/null 2>&1 # Sourcing everything source /usr/share/fzf/key-bindings.zsh @@ -37,7 +39,10 @@ source $HOME/.zsh/zsh-autosuggestions/zsh-autosuggestions.zsh bindkey '^[[A' history-substring-search-up bindkey '^[[B' history-substring-search-down bindkey -M emacs '^P' history-substring-search-up -bindkey -M emacs '^N' history-substring-search-down +bindkey -M emacs ^N history-substring-search-down # opam configuration test -r /home/yannherklotz/.opam/opam-init/init.zsh && . /home/yannherklotz/.opam/opam-init/init.zsh > /dev/null 2> /dev/null || true + +# added by travis gem +[ -f /home/ymherklotz/.travis/travis.sh ] && source /home/ymherklotz/.travis/travis.sh |