From 1f875ce9cd15139988ae71f9d0e7e10e401ffc28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Diego=20Fernando=20Carri=C3=B3n?= <diego@crthaze.com>
Date: Thu, 27 Jan 2022 19:10:10 +0100
Subject: [PATCH] linux updates

---
 any/bash/.bashrc                   | 82 ++++++++++++++++++------------
 any/kitty/.config/kitty/kitty.conf | 15 +++++-
 any/vim/.vim/vimrc                 |  1 +
 linux-gnu/i3/.config/i3/config     |  2 +-
 4 files changed, 65 insertions(+), 35 deletions(-)

diff --git a/any/bash/.bashrc b/any/bash/.bashrc
index a13f24b..d7f6944 100644
--- a/any/bash/.bashrc
+++ b/any/bash/.bashrc
@@ -34,43 +34,61 @@ HISTFILESIZE=4096
 # update the values of LINES and COLUMNS.
 shopt -s checkwinsize
 
-if [ -d "$HOME/.pyenv" ]; then
-	export PYENV_ROOT="$HOME/.pyenv"
-	export PATH="$PYENV_ROOT/bin:$PATH"
-	if command -v pyenv 1>/dev/null 2>&1; then
-		if [[ "${OSTYPE%%+([[:digit:].])}" == "darwin" ]]
-		then
-			eval "$(pyenv init --path)"
+if [ -d "$HOME/.asdf" ]
+then
+	. $HOME/.asdf/asdf.sh
+	. $HOME/.asdf/completions/asdf.bash
+else
+	if [ -d "$HOME/.pyenv" ]; then
+		export PYENV_ROOT="$HOME/.pyenv"
+		export PATH="$PYENV_ROOT/bin:$PATH"
+		if command -v pyenv 1>/dev/null 2>&1; then
+			if [[ "${OSTYPE%%+([[:digit:].])}" == "darwin" ]]
+			then
+				eval "$(pyenv init --path)"
+			fi
+			eval "$(pyenv init -)"
+			eval "$(pyenv virtualenv-init -)"
 		fi
-		eval "$(pyenv init -)"
-		eval "$(pyenv virtualenv-init -)"
+	fi
+
+	if [[ -s "$HOME/.gvm/scripts/gvm" ]]; then
+		source "$HOME/.gvm/scripts/gvm"
+	fi
+
+	if [[ -d "$HOME/.fnm" ]]
+	then
+		export PATH=$HOME/.fnm:$PATH
+		eval "`fnm env`"
+		eval "`fnm completions --shell bash`"
+	fi
+
+	if [[ -d "$HOME/.rbenv" ]]
+	then
+		export PATH="$HOME/.rbenv/bin:$PATH"
+		eval "$(rbenv init - bash)"
+	fi
+
+	if [[ -d "$HOME/.tfenv" ]]
+	then
+		export PATH="$HOME/.tfenv/bin:$PATH"
+		eval "$(rbenv init - bash)"
+	fi
+
+	if [[ "$OSTYPE" == "linux-gnu"*  && -f /etc/debian_version ]]
+	then
+		# if [ -d $HOME/.pyenv ]
+		# then
+		# 	pyenv3
+		# 	export HI="hi"
+		# fi
+		echo
 	fi
 fi
 
-if [[ -s "$HOME/.gvm/scripts/gvm" ]]; then
-	source "$HOME/.gvm/scripts/gvm"
-fi
-
-if [[ -d "$HOME/.fnm" ]]
+if [ -d "$HOME/.kube" ]
 then
-	export PATH=$HOME/.fnm:$PATH
-	eval "`fnm env`"
-	eval "`fnm completions --shell bash`"
-fi
-
-if [[ -d "$HOME/.rbenv" ]]
-then
-	eval "$(rbenv init - bash)"
-fi
-
-if [[ "$OSTYPE" == "linux-gnu"*  && -f /etc/debian_version ]]
-then
-	# if [ -d $HOME/.pyenv ]
-	# then
-	# 	pyenv3
-	# 	export HI="hi"
-	# fi
-	echo
+	export KUBECONFIG=$HOME/.kube/config.yaml
 fi
 
 #### Includes ####
diff --git a/any/kitty/.config/kitty/kitty.conf b/any/kitty/.config/kitty/kitty.conf
index 6e63811..53a8e04 100644
--- a/any/kitty/.config/kitty/kitty.conf
+++ b/any/kitty/.config/kitty/kitty.conf
@@ -1,5 +1,18 @@
 font_family Fira Code Retina
 disable_ligatures never
+background_opacity   0.95
+
+enabled_layouts tall
+
+map kitty_mod+f show_scrollback
+map kitty_mod+alt+f move_window_forward
+map kitty_mod+alt+b move_window_backward
+map kitty_mod+h previous_window
+map kitty_mod+l next_window
+map kitty_mod+alt+h previous_tab
+map kitty_mod+alt+l next_tab
+map kitty_mod+j select_tab
+
 # Special Colors {{{
 
 foreground           #FCE8C3
@@ -10,8 +23,6 @@ selection_background #FCE8C3
 
 # }}}
 
-background_opacity   0.95
-
 # Main Colors {{{
 
 # Black
diff --git a/any/vim/.vim/vimrc b/any/vim/.vim/vimrc
index c467dbc..6dd4136 100644
--- a/any/vim/.vim/vimrc
+++ b/any/vim/.vim/vimrc
@@ -22,6 +22,7 @@ Plug 'PotatoesMaster/i3-vim-syntax'
 "Plug 'tpope/vim-surround'
 "Plugin 'jiangmiao/auto-pairs'
 "Plug 'elzr/vim-json'
+Plug 'tsandall/vim-rego'
 Plug 'honza/vim-snippets'
 if !has('nvim')
 	" Plugins for when you're not using neovim
diff --git a/linux-gnu/i3/.config/i3/config b/linux-gnu/i3/.config/i3/config
index b31600a..6876247 100644
--- a/linux-gnu/i3/.config/i3/config
+++ b/linux-gnu/i3/.config/i3/config
@@ -211,7 +211,7 @@ for_window [class="nm-connection-editor"] floating enable
 
 focus_on_window_activation focus
 
-exec --no-startup-id i3-external-display.sh
+exec --no-startup-id ~/bin/i3-external-display.sh
 exec --no-startup-id bash -c 'feh --bg-scale ~/Media/Pictures/Wallpapers/linux70s.png && sleep 1 && feh --bg-scale ~/Media/Pictures/Wallpapers/linux70s.png'
 exec --no-startup-id xcompmgr -c -f -n
 exec --no-startup-id xbanish