Get everything into shape

Author: otype

README.md

@@ -23,6 +23,7 @@ Configurations exist for tools/SDKs like [Android SDK](https://developer.android
 
 - [ZSH](http://www.zsh.org/)
 - [Oh My ZSH!](https://ohmyz.sh/)
+- [Vim](https://www.vim.org/)
 
 #### Automatic installer
 
@@ -45,4 +46,4 @@ ln -nsf ../env-available/zshenv-android
 
 Repeat this for any other configuration and restart your terminal session.
 
-_Note: Make sure to check each configuration for sanity and correct paths!_
+_Note: Make sure to check each configuration for sanity and correct paths!._

zsh/env-available/zshenv-android

@@ -4,7 +4,7 @@
 #
 #
 
-if [[ $OSTYPE == 'darwin' ]]; then
+if [[ `uname -s` == "Darwin" ]]; then
     if [[ -d "/usr/local/Cellar/android-sdk" ]]; then
 	export ANDROID_SDK_ROOT=/usr/local/Cellar/android-sdk/`ls /usr/local/Cellar/android-sdk`
 	export ANDROID_HOME=$ANDROID_SDK_ROOT

zsh/env-available/zshenv-asdf

@@ -3,6 +3,7 @@
 # ZSHENV ASDF
 #
 #
+
 if [[ $OSTYPE == 'darwin' ]]; then
     [[ -d "/usr/local/opt/asdf" ]] && source /usr/local/opt/asdf/asdf.sh
 elif [[ $OSTYPE == 'linux-gnu' ]]; then

zsh/env-available/zshenv-brew

@@ -2,6 +2,7 @@
 
 # ZSHENV HOMEBREW
 #
+# NOTE: POTENTIALLY OUTDATED!!!
 #
 
 if [[ $OSTYPE == 'darwin' ]]; then

zsh/env-available/zshenv-rust zsh/env-available/zshenv-cargozsh/env-available/zshenv-rust renamed to zsh/env-available/zshenv-cargo

@@ -1,6 +1,7 @@
 #!/usr/bin/env zsh
 
-# RUST
+# ZSHENV CARGO (Rust)
 #
 #
+
 [[ -d "$HOME/.cargo" ]] && . "$HOME/.cargo/env"

zsh/env-available/zshenv-emacs

@@ -1,6 +1,6 @@
 #!/usr/bin/env zsh
 
-# ZSHENV Emacs
+# ZSHENV EMACS
 #
 # Great read to enable Emacs daemon automatically on Ubuntu:
 # https://simpleit.rocks/linux/ubuntu/start-emacs-in-ubuntu-the-right-way/
@@ -15,6 +15,9 @@ export EDITOR="emacsclient -t"
 # $VISUAL opens in GUI with non-daemon as alternate
 export VISUAL="emacsclient -c -a emacs"
 
+# prevent emacs term-mode to print "4m" at the end of each command
+[[ `uname -s` == "Darwin" ]] && export TERM=xterm-256color
+
 # Aliases
 alias e="emacsclient -t"
 alias ec="emacsclient -c"

zsh/env-available/zshenv-general

@@ -36,11 +36,6 @@ export LC_ALL="en_US.UTF-8"
 export LANG="en_US.UTF-8"
 export LANGUAGE="en_US.UTF-8"
 
-# prevent emacs term-mode to print "4m" at the end of each command
-if [[ `uname -s` = "Darwin" ]]; then
-    export TERM=xterm-256color
-fi
-
 # Add ~/bin to our PATH
 [[ -d "$HOME/bin" ]] && export PATH=$PATH:$HOME/bin
 

zsh/env-available/zshenv-go

@@ -1,6 +1,11 @@
 #!/usr/bin/env zsh
 
-if [[ $OSTYPE == 'darwin' ]]; then
+# ZSHENV GO
+#
+# NOTE: POTENTIALLY OUTDATED!!!
+#
+
+if [[ `uname -s` == "Darwin" ]]; then
     if [[ -d "/usr/local/Cellar/go" ]]; then
 	export GOROOT=/usr/local/Cellar/go/`ls /usr/local/Cellar/go`/libexec
 	# Enable Go111

zsh/env-available/zshenv-goenv

@@ -3,7 +3,9 @@
 # ZSHENV GOENV
 #
 # goenv (https://github.com/syndbg/goenv)
-if [[ $OSTYPE == 'darwin' ]]; then
+#
+
+if [[ `uname -s` == "Darwin" ]]; then
     if [[ -f "/usr/local/bin/goenv" ]]; then
 	export GOENV_ROOT="$HOME/.goenv"
 	export PATH="$GOENV_ROOT/bin:$PATH"