From 657c371abe4fb142c374f616ff650bfd443f287a Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Wed, 16 Jun 2021 15:05:11 +0300
Subject: [PATCH] shells: update pyenv initial process

pyenv doesn't set path with `init -` anymore.
Also set PATH only once in login shell.
---
 home/.bash_profile                                 |  3 +++
 home/.bashrc-bloated                               |  8 ++++----
 home/.config/fish/conf.d/evaluate.fish             |  3 ++-
 home/.config/fish/conf.d/{startwm.fish => wm.fish} |  0
 home/.config/river/init                            | 14 +++++++-------
 home/.config/zsh/.zprofile                         |  5 +++++
 home/.config/zsh/.zshenv                           |  5 -----
 home/.config/zsh/.zshrc                            |  5 ++++-
 8 files changed, 25 insertions(+), 18 deletions(-)
 rename home/.config/fish/conf.d/{startwm.fish => wm.fish} (100%)

diff --git a/home/.bash_profile b/home/.bash_profile
index c6ce55a..be4cef5 100644
--- a/home/.bash_profile
+++ b/home/.bash_profile
@@ -2,6 +2,9 @@
 
 [ -f $HOME/.bashrc ] && . $HOME/.bashrc
 
+# PATH
+export PATH=$HOME/.local/bin:$HOME/.local/bin/fzf:$NODENV_ROOT/bin:$PYENV_ROOT/bin:$POETRY_HOME/bin:$CARGO_HOME/bin:$GOPATH/bin:$NPM_CONFIG_PREFIX/bin:$PATH
+
 # if [[ "$(tty)" = "/dev/tty1" ]]; then
 #   exec startx $HOME/.config/X11/xinitrc
 # fi
diff --git a/home/.bashrc-bloated b/home/.bashrc-bloated
index 1f7d28e..905e975 100644
--- a/home/.bashrc-bloated
+++ b/home/.bashrc-bloated
@@ -366,9 +366,6 @@ then
   "
 fi
 
-# PATH
-export PATH=$HOME/.local/bin:$HOME/.local/bin/fzf:$NODENV_ROOT/bin:$PYENV_ROOT/bin:$POETRY_HOME/bin:$CARGO_HOME/bin:$GOPATH/bin:$NPM_CONFIG_PREFIX/bin:$PATH
-
 # _________________
 # ___    |__  /__(_)_____ ________
 # __  /| |_  /__  /_  __ `/_  ___/
@@ -593,7 +590,10 @@ fi
 #   git clone https://github.com/pyenv/pyenv-virtualenv.git $PYENV_ROOT/plugins/pyenv-virtualenv
 #   git clone https://github.com/pyenv/pyenv-update.git $PYENV_ROOT/plugins/pyenv-update
 # fi
-# eval "$(pyenv init -)" >/dev/null
+# if shopt -q login_shell; then
+#   eval "$(pyenv init --path)"
+# fi
+# eval "$(pyenv init -)"
 # eval "$(pyenv virtualenv-init -)"
 
 # nodenv
diff --git a/home/.config/fish/conf.d/evaluate.fish b/home/.config/fish/conf.d/evaluate.fish
index 31d80e7..9eef0fa 100644
--- a/home/.config/fish/conf.d/evaluate.fish
+++ b/home/.config/fish/conf.d/evaluate.fish
@@ -33,7 +33,8 @@ end
 #   git clone https://github.com/pyenv/pyenv-update.git $PYENV_ROOT/plugins/pyenv-update
 #   git clone https://github.com/pyenv/pyenv-virtualenv.git $PYENV_ROOT/plugins/pyenv-virtualenv
 # end
-# pyenv init - | source >/dev/null
+# status is-login; and pyenv init --path | source
+# pyenv init - | source
 # pyenv virtualenv-init - | source
 
 # nodenv
diff --git a/home/.config/fish/conf.d/startwm.fish b/home/.config/fish/conf.d/wm.fish
similarity index 100%
rename from home/.config/fish/conf.d/startwm.fish
rename to home/.config/fish/conf.d/wm.fish
diff --git a/home/.config/river/init b/home/.config/river/init
index 413e084..ca13075 100755
--- a/home/.config/river/init
+++ b/home/.config/river/init
@@ -41,13 +41,13 @@ riverctl background-color #2e3440
 
 # Inputs ───────────────────────────────────────────────────────────────────────
 
-riverctl input 2:7:SynPS/2_Synaptics_TouchPad events disabled-on-external-mouse
-riverctl input 2:7:SynPS/2_Synaptics_TouchPad drag enabled
-riverctl input 2:7:SynPS/2_Synaptics_TouchPad disable-while-typing enabled
-riverctl input 2:7:SynPS/2_Synaptics_TouchPad natural-scroll enabled
-riverctl input 2:7:SynPS/2_Synaptics_TouchPad tap enabled
-riverctl input 2:7:SynPS/2_Synaptics_TouchPad tap-button-map left-right-middle
-riverctl input 2:7:SynPS/2_Synaptics_TouchPad scroll-method two-finger
+# riverctl input 2:7:SynPS/2_Synaptics_TouchPad events disabled-on-external-mouse
+# riverctl input 2:7:SynPS/2_Synaptics_TouchPad drag enabled
+# riverctl input 2:7:SynPS/2_Synaptics_TouchPad disable-while-typing enabled
+# riverctl input 2:7:SynPS/2_Synaptics_TouchPad natural-scroll enabled
+# riverctl input 2:7:SynPS/2_Synaptics_TouchPad tap enabled
+# riverctl input 2:7:SynPS/2_Synaptics_TouchPad tap-button-map left-right-middle
+# riverctl input 2:7:SynPS/2_Synaptics_TouchPad scroll-method two-finger
 
 # Bindings ─────────────────────────────────────────────────────────────────────
 
diff --git a/home/.config/zsh/.zprofile b/home/.config/zsh/.zprofile
index 6c27a6a..eba57f2 100644
--- a/home/.config/zsh/.zprofile
+++ b/home/.config/zsh/.zprofile
@@ -1,3 +1,8 @@
+# PATH
+typeset -U PATH path
+path=("$HOME/.local/bin" "$HOME/.local/bin/fzf" "$NODENV_ROOT/bin" "$PYENV_ROOT/bin" "$POETRY_HOME/bin" "$CARGO_HOME/bin" "$GOPATH/bin" "$NPM_CONFIG_PREFIX/bin" "$path[@]")
+export PATH
+
 # if [[ "$(tty)" = "/dev/tty1" ]]; then
 #   exec startx $HOME/.config/X11/xinitrc
 # fi
diff --git a/home/.config/zsh/.zshenv b/home/.config/zsh/.zshenv
index 56fbf2b..3c277d9 100644
--- a/home/.config/zsh/.zshenv
+++ b/home/.config/zsh/.zshenv
@@ -401,8 +401,3 @@ if [ -n "$XDG_SESSION_TYPE" ]; then
     fi
   fi
 fi
-
-# PATH
-typeset -U PATH path
-path=("$HOME/.local/bin" "$HOME/.local/bin/fzf" "$NODENV_ROOT/bin" "$PYENV_ROOT/bin" "$POETRY_HOME/bin" "$CARGO_HOME/bin" "$GOPATH/bin" "$NPM_CONFIG_PREFIX/bin" "$path[@]")
-export PATH
diff --git a/home/.config/zsh/.zshrc b/home/.config/zsh/.zshrc
index ec99af6..9d2c7a8 100644
--- a/home/.config/zsh/.zshrc
+++ b/home/.config/zsh/.zshrc
@@ -61,7 +61,10 @@ fi
 #    git clone https://github.com/pyenv/pyenv-virtualenv.git $PYENV_ROOT/plugins/pyenv-virtualenv
 #    git clone https://github.com/pyenv/pyenv-update.git $PYENV_ROOT/plugins/pyenv-update
 # fi
-# eval "$(pyenv init -)" >/dev/null
+# if [[ -o login ]]; then
+#   eval "$(pyenv init --path)"
+# fi
+# eval "$(pyenv init -)"
 # eval "$(pyenv virtualenv-init -)"
 
 # nodenv