Merge branch 'master' of github.com:danijoo/dotfiles

install.sh

@@ -1,18 +1,17 @@
 #!/bin/bash
 
 # Make ZSH the default shell environment
-if [ `cat /etc/passwd | grep $USER | awk -F ':' '{print $7}'` != "/bin/zsh" ]; then
+if [ `cat /etc/passwd | grep $USER | awk -F ':' '{print $7}'` != "/usr/bin/zsh" ]; then
 	echo "Changing shell to zsh"
 	chsh -s $(which zsh)
 fi
 
-# ZIM Installation
-if [ ! -d "$HOME/.zim" ]; then
-	echo "Installing ZIM"
-	git clone --recursive --depth=1 https://github.com/zimfw/zimfw.git \
-		${ZDOTDIR:-${HOME}}/.zim
+# zgen Installation
+if [ ! -d "$HOME/.zgen" ]; then
+	echo "Installing zgen"
+	git clone --depth=1 https://github.com/tarjoilija/zgen.git "${HOME}/.zgen"
 else
-	echo "ZIM already exists."
+	echo "zgen already exists."
 fi
 
 # Powerlevel9k Theme

profiles/base/.aliases

@@ -9,6 +9,12 @@ alias ls='ls --color=auto -lh'
 alias workon='source activate' # enable anaconda environ
 alias cwl="cwl-runner"
 
+function gitignore() {
+    for i in "$@"; do
+        echo $i >> .gitignore
+    done
+}
+
 # lhr
 alias squeue="ssh lcluster11 squeue"
 alias csum="ssh lcluster11 csum"

profiles/base/.tmux.conf

@@ -14,7 +14,8 @@ set -g @plugin 'tmux-plugins/tpm'
 set -g @plugin 'tmux-plugins/tmux-sensible'
 set -g @plugin 'tmux-plugins/tmux-cpu'
 set -g @plugin 'pwittchen/tmux-plugin-ram'
+set -g @plugin 'danijoo/tmux-plugin-simple-gpu'
 
 run -b '~/.tmux/plugins/tpm/tpm'
 
-set -g status-right '#{cpu_bg_color} CPU: #{cpu_percentage} RAM: #{ram}| %a %h-%d %H:%M '
+set -g status-right '#{cpu_bg_color} CPU: #{cpu_percentage} GPU: #{gpu} RAM: #{ram}| %a %h-%d %H:%M '

profiles/base/.vimrc

@@ -29,6 +29,7 @@ Plugin 'Yggdroot/indentLine'
 Plugin 'godlygeek/tabular'
 Plugin 'plasticboy/vim-markdown'
 Plugin 'morhetz/gruvbox'
+Plugin 'preservim/nerdcommenter'
 Plugin 'jpalardy/vim-slime'
 let g:slime_target = "x11"
 
@@ -64,3 +65,6 @@ set colorcolumn=80,100,120
 colorscheme gruvbox
 let g:gruvbox_contrast_dark = 'hard'
 set background=dark
+
+" nerdcommenter
+filetype plugin on