Добавлены переменные для rustup и ghcup

6 files changed, 20 insertions, 2 deletions

diff --git a/.cache/zsh/.gitkeep b/.cache/zsh/.gitkeep
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/.cache/zsh/.gitkeep
diff --git a/.local/bin/.gitkeep b/.local/bin/.gitkeep
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/.local/bin/.gitkeep
diff --git a/.local/share/.gitkeep b/.local/share/.gitkeep
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/.local/share/.gitkeep
diff --git a/.local/state/.gitkeep b/.local/state/.gitkeep
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/.local/state/.gitkeep
diff --git a/.profile b/.profile
index c73f55c..8f72ded 100644
--- a/.profile
+++ b/.profile
@@ -1,6 +1,6 @@
 # set PATH so it includes user's private bin if it exists
 if [ -d "$HOME/.local/bin" ] ; then
-    PATH="$PATH:$(du "$HOME/.local/bin/" | cut -f2 | paste -s -d ':' -)"
+    PATH="$PATH:$(du "$HOME/.local/bin" | cut -f2 | paste -s -d ':' -)"
 fi
 
 export LANG="en_US.UTF-8"
@@ -14,6 +14,7 @@ export _JAVA_AWT_WM_NONREPARENTING=1
 export XDG_CONFIG_HOME="$HOME/.config"
 export XDG_CACHE_HOME="$HOME/.cache"
 export XDG_DATA_HOME="$HOME/.local/share"
+export XDG_STATE_HOME="$HOME/.local/state"
 
 # XDG Specific configs
 export MYVIMRC="$XDG_CONFIG_HOME/vim/init.vim"
@@ -70,11 +71,17 @@ export PATH="$PATH:$GEM_HOME/bin"
 export CARGO_HOME="$XDG_DATA_HOME/cargo"
 export RUSTUP_HOME="$XDG_DATA_HOME/rustup"
 export PATH="$PATH:$CARGO_HOME/bin"
+. "$CARGO_HOME/env"
 
 # Go
 export GOPATH="$XDG_DATA_HOME/go"
 export PATH="$PATH:$GOPATH/bin"
 
+# Haskell
+export PATH="$PATH:$HOME/.cabal/bin"
+export GHCUP_USE_XDG_DIRS=true
+[ -f "$XDG_DATA_HOME/ghcup/env" ] && . "$XDG_DATA_HOME/ghcup/env"
+
 # Python
 # On Linux python executables installed with pip should be in ~/.local/bin
 if [ "$(uname)" = "Darwin" ]; then
@@ -86,3 +93,8 @@ fi
 if [ "$(uname)" = "Darwin" ]; then
     export PATH="$PATH:/opt/homebrew/bin"
 fi
+
+if [ "$(uname)" = "Darwin" ]; then
+    export PATH="/opt/local/bin:/opt/local/sbin:$PATH"
+fi
+
diff --git a/.zshrc b/.zshrc
index df4f2cc..7610c0a 100644
--- a/.zshrc
+++ b/.zshrc
@@ -28,6 +28,11 @@ SAVEHIST=1000
 setopt extendedglob nomatch
 unsetopt autocd beep
 bindkey -e
+bindkey -v
+bindkey '^[[A' up-line-or-search
+bindkey '^[[B' down-line-or-search
+bindkey '^R' history-incremental-pattern-search-backward
+bindkey -M vicmd '^R' history-incremental-pattern-search-backward
 autoload -Uz compinit
 zstyle ':completion:*' matcher-list 'm:{a-z}={A-Za-z}'
 compinit -d $XDG_CACHE_HOME/zsh/zcompdump
@@ -40,7 +45,7 @@ precmd() { vcs_info }
 zstyle ':vcs_info:git:*' formats ' (%b)'
 
 cdf() {
-	cd "$(find ~ -type d &>/dev/null | fzf)"
+    cd "$(find ~ -type d &>/dev/null | fzf)"
 }
 
 set_prompt() {
@@ -54,3 +59,4 @@ set_prompt() {
     PROMPT='%T $UCOLOR%n$STOP@$PURPLE%m$STOP:$BLUE%~$STOP${vcs_info_msg_0_}'$'\n''$END '
 }
 set_prompt
+