Updated merged zshrc.android and zshrc.server into zshrc

3 files changed, 96 insertions, 495 deletions

diff --git a/.zshrc b/.zshrc
index 10b8991..d0b9e08 100644
--- a/.zshrc
+++ b/.zshrc
@@ -10,6 +10,8 @@
 	# git clone https://github.com/eendroroy/alien.git && cd alien && git submodule update --init --recursive
 # }}}
 
+device="desktop" # can be either "desktop" (default when empty), "server" or "android"
+
 # General {{{
 	# Exports {{{
 		export PATH=$HOME/bin:/usr/local/bin:$PATH # Adds ~/bin and /usr/local/bin paths to PATH
@@ -55,6 +57,10 @@
 
 		# recognize comments
 		setopt interactivecomments
+
+		# don't backward-kill-word on forward slash
+		autoload -U select-word-style
+		select-word-style bash
 	# }}}
 # }}}
 
@@ -69,7 +75,14 @@
 		export ALIEN_SECTION_USER_BG=66
 		export ALIEN_GIT_TRACKED_COLOR=196
 		export ALIEN_GIT_UN_TRACKED_COLOR=214
-		
+	
+		if [[ $device == "server" ]]; then
+			export ALIEN_SECTION_BATTERY_FG=0
+			export ALIEN_SECTION_BATTERY_BG=67
+			export ALIEN_SECTION_USER_FG=0
+			export ALIEN_SECTION_USER_BG=67
+		fi
+
 		export ALIEN_PROMPT_SYM=" "
 		export ALIEN_GIT_SYM=
 		export ALIEN_BRANCH_SYM=
@@ -199,6 +212,44 @@
 				separator 1
 			)
 		}
+
+		if [[ $device == "server" ]]; then
+			alien_ssh_client(){
+				if [[ -n "${SSH_CLIENT}" ]]; then
+					echo " syndamia.com"
+				fi
+			}
+			
+			alien_prompt_section_ssh() {
+				local __ssh_info
+				__ssh_info=$(alien_ssh_client)
+				[[ -n $__ssh_info ]] || return 1
+				__section=(
+					content "${__ssh_info}"
+					foreground $ALIEN_SECTION_USER_FG
+					background $ALIEN_SECTION_USER_BG
+				)
+			}
+		fi
+
+		if [[ $device == "android" ]]; then
+			alien_user_info() {
+				whoami
+			}
+
+			alien_battery_stat(){
+				echo " "
+			}
+
+			alien_prompt_section_battery() {
+				__section=(
+					content " "
+					foreground $ALIEN_SECTION_BATTERY_FG
+					background $ALIEN_SECTION_BATTERY_BG
+					separator 1
+				)
+			}
+		fi
 	# }}}
 # }}}
 
@@ -240,6 +291,8 @@
 		# alias sagt="sudo apt update && sudo apt upgrade -y && sudo apt autoremove -y && sudo youtube-dl --update && wget -O - https://raw.githubusercontent.com/laurent22/joplin/master/Joplin_install_and_update.sh | bash"
 	# }}}
 		
+	if [[ device != "server" ]]; then
+	
 	# General commands {{{
 		if [[ -x "$(command -v exa)" ]]; then
 			alias ll="exa --icons --group-directories-first --git --time-style long-iso -labh"
@@ -276,6 +329,8 @@
 		alias cdl="cd ~/Programming/GitLab-repos/ && mcd"
 		alias cds="cd ~/Programming/source/ && mcd"
 	# }}}
+	
+	fi
 # }}}
 
 # Binds {{{
@@ -283,32 +338,6 @@
 # }}}
 
 # Functions {{{
-	if [[ -x "$(command -v vimx)" ]]; then
-		# Open vim with .vim-session file, if it exists and the vim command doesn't have any parameters
-		vim () {
-			if [ -f ".vim-session" ] && [ -z "$1" ]; then
-				vimx -S .vim-session
-			else
-				vimx $@
-			fi
-		}
-	fi
-	
-	if [[ -x "$(command -v grit)" ]]; then
-		# Add to grit parent, where first value is parent number and everything else is node value
-		grap () {
-			parent="$1"
-			shift
-			grit add -p $parent -- $@
-		}
-	fi
-
-	if [[ -x "$(command -v nemo)" ]]; then
-		onemo() {
-			bgr "nemo ./"
-		}
-	fi
-
 	# Execute multiple commands
 	mexec () {
 		for cmd in "${@[@]}"; do
@@ -338,23 +367,52 @@
 		pkill $@
 		bgr $@
 	}
+
+	if [[ device != "server" && device != "android" ]]; then
+
+		if [[ -x "$(command -v vimx)" ]]; then
+			# Open vim with .vim-session file, if it exists and the vim command doesn't have any parameters
+			vim () {
+				if [ -f ".vim-session" ] && [ -z "$1" ]; then
+					vimx -S .vim-session
+				else
+					vimx $@
+				fi
+			}
+		fi
 	
-	# Launch .desktop application (either full path or just name)
-	dela () {
-		name=$1
-		if [[ ${name:0:1} != "/" ]]; then
-			name="/usr/share/applications/${name}"
+		if [[ -x "$(command -v grit)" ]]; then
+			# Add to grit parent, where first value is parent number and everything else is node value
+			grap () {
+				parent="$1"
+				shift
+				grit add -p $parent -- $@
+			}
 		fi
-		if [[ ! $name =~ .desktop$ ]]; then
-			name+=".desktop"
+
+		if [[ -x "$(command -v nemo)" ]]; then
+			onemo() {
+				bgr "nemo ./"
+			}
 		fi
-		comm=($(awk -F= '$1=="Exec"{$1=""; print}' "$name"))
-		bgr "$comm"
-	}
+
+		# Launch .desktop application (either full path or just name)
+		dela () {
+			name=$1
+			if [[ ${name:0:1} != "/" ]]; then
+				name="/usr/share/applications/${name}"
+			fi
+			if [[ ! $name =~ .desktop$ ]]; then
+				name+=".desktop"
+			fi
+			comm=($(awk -F= '$1=="Exec"{$1=""; print}' "$name"))
+			bgr "$comm"
+		}
+
+	fi
 # }}}
 
 # Execute on startup {{{
-	(grit)
 #}}}
 
 # Added by scripts:
diff --git a/.zshrc.android b/.zshrc.android
deleted file mode 100644
index 7c483a3..0000000
--- a/.zshrc.android
+++ /dev/null
@@ -1,212 +0,0 @@
-# ------------------------------------------------------------------------------
-# You'll need to install oh-my-zsh and alien
-#
-# 1. oh-my-zsh
-#
-# sh -c "$(curl -fsSL https://raw.github.com/ohmyzsh/ohmyzsh/master/tools/install.sh)"
-#
-# 2. alien
-#
-# git clone https://github.com/eendroroy/alien.git && cd alien && git submodule update --init --recursive
-# ------------------------------------------------------------------------------
-
-# If you come from bash you might have to change your $PATH.
-# export PATH=$HOME/bin:/usr/local/bin:$PATH
-
-export ZSH="/home/kamen/.oh-my-zsh"
-
-ZSH_THEME="gruvbox"
-SOLARIZED_THEME="dark"
-
-# Which plugins would you like to load?
-# Standard plugins can be found in $ZSH/plugins/
-# Custom plugins may be added to $ZSH_CUSTOM/plugins/
-# Example format: plugins=(rails git textmate ruby lighthouse)
-# Add wisely, as too many plugins slow down shell startup.
-plugins=(git)
-
-source $ZSH/oh-my-zsh.sh
-
-# User configuration
-
-# Preferred editor for local and remote sessions
-if [[ -n $SSH_CONNECTION ]]; then
-  export EDITOR='vim'
-else
-  export EDITOR='vim'
-fi
-
-export NVM_DIR="$HOME/.nvm"
-[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"  # This loads nvm
-[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"  # This loads nvm bash_completion
-
-# Disables Software Flow Control
-stty -F/dev/tty -ixon -ixoff
-
-# ------------------------------------------------------------------------------
-# Alien theme config
-# ------------------------------------------------------------------------------
-
-source ~/alien/alien.zsh
-
-# colors
-
-export ALIEN_THEME="gruvbox"
-export ALIEN_SECTION_BATTERY_FG=223
-export ALIEN_SECTION_PATH_FG=178
-export ALIEN_SECTION_USER_FG=223
-export ALIEN_SECTION_USER_BG=66
-export ALIEN_GIT_TRACKED_COLOR=196
-export ALIEN_GIT_UN_TRACKED_COLOR=214
-
-# custom symbols
-
-export ALIEN_PROMPT_SYM=" "
-export ALIEN_GIT_SYM=
-export ALIEN_BRANCH_SYM=
-export ALIEN_GIT_ADD_SYM=ﰂ
-export ALIEN_GIT_DEL_SYM=ﯰ
-export ALIEN_GIT_MOD_SYM=﯂
-export ALIEN_GIT_NEW_SYM=?
-
-# sections
-
-export ALIEN_SECTION_TIME_FORMAT=%H:%M:%S
-
-export ALIEN_SECTIONS_LEFT=(
-  left_cap
-  ssh
-  user
-  path
-  git_branch:async
-  git_status:async
-  left_end_cap
-  newline
-  prompt
-)
-
-export ALIEN_SECTIONS_RIGHT=(
-  exit
-  time
-  battery
-  right_end_cap
-)
-
-# custom sections
-
-alien_prompt_section_left_cap() {
-  __section=(
-    content " %B%b"
-    foreground $ALIEN_SECTION_USER_BG
-  )
-}
-
-alien_prompt_section_right_end_cap() {
-  __section=(
-    content "%B%b"
-    foreground $ALIEN_SECTION_BATTERY_BG
-  )
-}
-
-alien_prompt_section_git_branch() {
-  local __branch_info=
-  if [[ $(alien_is_git) == 1 ]]; then
-    __branch_info=$(alien_git_branch)
-  else
-    return 1
-  fi
-  __section=(
-    content " ${__branch_info}"
-    foreground $ALIEN_SECTION_VCS_BRANCH_BG
-    background $ALIEN_SECTION_EXIT_BG
-  )
-}
-
-alien_prompt_section_git_status() {
-  local __stash_info=
-  local __lr_info=
-  local __dirty_info=
-  if [[ $(alien_is_git) == 1 ]]; then
-    __stash_info=$(alien_git_stash)
-    __lr_info=$(alien_git_lr)
-    __dirty_info=$(alien_git_dirty)
-  else
-    return 1
-  fi
-  __section=(
-    content " ${__stash_info}${__lr_info}${__dirty_info}"
-    foreground 214
-    background $ALIEN_SECTION_EXIT_BG
-	separator 1
-  )
-}
-
-# default section overrides (for stuff that can only be changed by changing the source)
-
-alien_user_info() {
-  whoami
-}
-
-alien_prompt_section_exit() {
-  __section=(
-    content "%(?.  . %? )"
-	foreground "%(?.$ALIEN_SECTION_VCS_BRANCH_BG.$ALIEN_SECTION_EXIT_FG)"
-    background "%(?.$ALIEN_SECTION_EXIT_BG.$ALIEN_SECTION_EXIT_BG_ERROR)"
-    separator 1
-  )
-}
-
-alien_prompt_section_prompt() {
-  __section=(
-    content "%B${ALIEN_PROMPT_SYM}%b "
-    foreground "%(?.$ALIEN_PROMPT_FG.$ALIEN_SECTION_EXIT_BG_ERROR)"
-  )
-}
-
-alien_battery_stat(){
- echo " "
-}
-
-alien_prompt_section_battery() {
-  __section=(
-	content " "
-	foreground $ALIEN_SECTION_BATTERY_FG
-    background $ALIEN_SECTION_BATTERY_BG
-    separator 1
-  )
-}
-
-# ------------------------------------------------------------------------------
-# Aliases
-# ------------------------------------------------------------------------------
-
-alias ydl="youtube-dl"
-alias ydlba="youtube-dl --audio-format best -x"
-
-# apt aliases
-
-alias sasy="apt install -y"
-alias sary="apt remove -y"
-alias saty="apt autoremove -y"
-alias sagt="apt update && apt upgrade -y && apt autoremove -y && youtube-dl --update"
-
-if [[ -x "$(command -v exa)" ]]; then
-	alias ll="exa --icons --group-directories-first --git --time-style long-iso -labh"
-	alias lk="exa --icons --group-directories-first --git --time-style long-iso -labhTL"
-	alias l.="exa --icons --group-directories-first --git --time-style long-iso -labhTL 2"
-	alias l="exa --icons --group-directories-first --time-style long-iso -abh"
-else
-	alias ll="la -alF"
-	alias la="ls -A"
-	alias l="ls -CF"
-fi
-
-alias lg="lazygit"
-
-alias q="exit"
-alias x="exit"
-
-if [[ -x "$(command -v vimx)" ]]; then alias vim='vimx'; fi
-alias v="vim"
-
-alias cdp="cd ~/Programming/GitHub-repos/"
diff --git a/.zshrc.server b/.zshrc.server
deleted file mode 100644
index bc45817..0000000
--- a/.zshrc.server
+++ /dev/null
@@ -1,245 +0,0 @@
-# ------------------------------------------------------------------------------
-# You'll need to install oh-my-zsh and alien
-#
-# 1. oh-my-zsh
-#
-# sh -c "$(curl -fsSL https://raw.github.com/ohmyzsh/ohmyzsh/master/tools/install.sh)"
-#
-# 2. alien
-#
-# git clone https://github.com/eendroroy/alien.git && cd alien && git submodule update --init --recursive
-# ------------------------------------------------------------------------------
-
-# If you come from bash you might have to change your $PATH.
-# export PATH=$HOME/bin:/usr/local/bin:$PATH
-
-export ZSH="$HOME/.oh-my-zsh"
-
-ZSH_THEME="gruvbox"
-SOLARIZED_THEME="dark"
-
-# Which plugins would you like to load?
-# Standard plugins can be found in $ZSH/plugins/
-# Custom plugins may be added to $ZSH_CUSTOM/plugins/
-# Example format: plugins=(rails git textmate ruby lighthouse)
-# Add wisely, as too many plugins slow down shell startup.
-plugins=(git)
-
-source $ZSH/oh-my-zsh.sh
-
-# User configuration
-
-# Preferred editor for local and remote sessions
-if [[ -n $SSH_CONNECTION ]]; then
-  export EDITOR='vim'
-else
-  export EDITOR='vim'
-fi
-
-export NVM_DIR="$HOME/.nvm"
-[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"  # This loads nvm
-[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"  # This loads nvm bash_completion
-
-# Disables Software Flow Control
-stty -F/dev/tty -ixon -ixoff
-
-# ------------------------------------------------------------------------------
-# Alien theme config
-# ------------------------------------------------------------------------------
-
-source ~/alien/alien.zsh
-
-# colors
-
-export ALIEN_THEME="gruvbox"
-export ALIEN_SECTION_BATTERY_FG=0
-export ALIEN_SECTION_PATH_FG=178
-export ALIEN_SECTION_USER_FG=0
-export ALIEN_SECTION_USER_BG=67
-export ALIEN_SECTION_BATTERY_BG=67
-export ALIEN_GIT_TRACKED_COLOR=196
-export ALIEN_GIT_UN_TRACKED_COLOR=214
-
-# custom symbols
-
-export ALIEN_PROMPT_SYM=" "
-export ALIEN_GIT_SYM=
-export ALIEN_BRANCH_SYM=
-export ALIEN_GIT_ADD_SYM=ﰂ
-export ALIEN_GIT_DEL_SYM=ﯰ
-export ALIEN_GIT_MOD_SYM=﯂
-export ALIEN_GIT_NEW_SYM=?
-
-# sections
-
-export ALIEN_SECTION_TIME_FORMAT=%H:%M:%S
-
-export ALIEN_SECTIONS_LEFT=(
-  left_cap
-  user
-  path
-  git_branch:async
-  git_status:async
-  left_end_cap
-  newline
-  prompt
-)
-
-export ALIEN_SECTIONS_RIGHT=(
-  exit
-  time
-  battery
-  ssh
-  right_end_cap
-)
-
-# custom sections
-
-alien_prompt_section_left_cap() {
-  __section=(
-    content " %B%b"
-    foreground $ALIEN_SECTION_USER_BG
-  )
-}
-
-alien_prompt_section_right_end_cap() {
-  __section=(
-    content "%B%b"
-    foreground $ALIEN_SECTION_BATTERY_BG
-  )
-}
-
-alien_prompt_section_git_branch() {
-  local __branch_info=
-  if [[ $(alien_is_git) == 1 ]]; then
-    __branch_info=$(alien_git_branch)
-  else
-    return 1
-  fi
-  __section=(
-    content " ${__branch_info}"
-    foreground $ALIEN_SECTION_VCS_BRANCH_BG
-    background $ALIEN_SECTION_EXIT_BG
-  )
-}
-
-alien_prompt_section_git_status() {
-  local __stash_info=
-  local __lr_info=
-  local __dirty_info=
-  if [[ $(alien_is_git) == 1 ]]; then
-    __stash_info=$(alien_git_stash)
-    __lr_info=$(alien_git_lr)
-    __dirty_info=$(alien_git_dirty)
-  else
-    return 1
-  fi
-  __section=(
-    content " ${__stash_info}${__lr_info}${__dirty_info}"
-    foreground 214
-    background $ALIEN_SECTION_EXIT_BG
-	separator 1
-  )
-}
-
-# default section overrides (for stuff that can only be changed by changing the source)
-
-alien_prompt_section_exit() {
-  __section=(
-    content "%(?.  . %? )"
-	foreground "%(?.$ALIEN_SECTION_VCS_BRANCH_BG.$ALIEN_SECTION_EXIT_FG)"
-    background "%(?.$ALIEN_SECTION_EXIT_BG.$ALIEN_SECTION_EXIT_BG_ERROR)"
-    separator 1
-  )
-}
-
-alien_prompt_section_prompt() {
-  __section=(
-    content "%B${ALIEN_PROMPT_SYM}%b "
-    foreground "%(?.$ALIEN_PROMPT_FG.$ALIEN_SECTION_EXIT_BG_ERROR)"
-  )
-}
-
-alien_battery_stat(){
-  __os=$(uname)
-  if [[ ${__os} = "Linux" ]]; then
-    if command -v upower > /dev/null 2>&1 ; then
-      __bat_power=$(upower -i /org/freedesktop/UPower/devices/battery_BAT0 | grep state | awk '{print $2}')
-      __bat_power_ind=""
-      if [[ ${__bat_power} = "charging" ]]; then __bat_power_ind=""
-      elif [[ ${__bat_power} = "discharging" ]]; then __bat_power_ind=""
-      elif [[ ${__bat_power} = "fully-charged" ]]; then __bat_power_ind=""
-      fi
-      __bat_per=$(upower -i /org/freedesktop/UPower/devices/battery_BAT0 | grep percentage | awk '{print $2}' | sed "s|%||g")
-      if [[ -n ${__bat_per} ]]; then
-        echo -n "${__bat_power_ind} ${__bat_per}%%"
-      fi
-    fi
-  fi
-  unset __os __bat_power __bat_power_ind __bat_per
-}
-
-alien_prompt_section_battery() {
-  local __to_return=" "
-  if [ -n "$(upower -i /org/freedesktop/UPower/devices/battery_BAT0 | grep state)" ]; then
-    __to_return=" $(alien_battery_stat) "
-  fi
-  __section=(
-	content $__to_return
-	foreground $ALIEN_SECTION_BATTERY_FG
-    background $ALIEN_SECTION_BATTERY_BG
-    separator 1
-  )
-}
-
-alien_ssh_client(){
-  if [[ -n "${SSH_CLIENT}" ]]; then
-    echo "syndamia.com "
-  fi
-}
-
-alien_prompt_section_ssh() {
-  local __ssh_info
-  __ssh_info=$(alien_ssh_client)
-  [[ -n $__ssh_info ]] || return 1
-  __section=(
-    content "${__ssh_info}"
-    foreground $ALIEN_SECTION_USER_FG
-    background $ALIEN_SECTION_USER_BG
-  )
-}
-
-# ------------------------------------------------------------------------------
-# Aliases
-# ------------------------------------------------------------------------------
-
-alias ydl="youtube-dl"
-alias ydlba="youtube-dl --audio-format best -x"
-
-# apt aliases
-
-alias sasy="sudo apt install -y"
-alias sary="sudo apt remove -y"
-alias saty="sudo apt autoremove -y"
-alias sagt="sudo apt update && sudo apt upgrade -y && sudo apt autoremove -y"
-
-if [[ -x "$(command -v exa)" ]]; then
-	alias ll="exa --icons --group-directories-first --git --time-style long-iso -labh"
-	alias lk="exa --icons --group-directories-first --git --time-style long-iso -labhTL"
-	alias l.="exa --icons --group-directories-first --git --time-style long-iso -labhTL 2"
-	alias l="exa --icons --group-directories-first --time-style long-iso -abh"
-else
-	alias ll="la -alF"
-	alias la="ls -A"
-	alias l="ls -CF"
-fi
-
-alias lg="lazygit"
-
-alias q="exit"
-alias x="exit"
-
-if [[ -x "$(command -v vimx)" ]]; then alias vim='vimx'; fi
-alias v="vim"
-
-alias cdp="cd ~/Programming/GitHub-repos/"