dotfiles

commit 9ac375a61736e1a276e54286ec63069e74a607c0
parent c7e3c8e8a192516178790957576d5a36482d4d57
Author: Anders Damsgaard <andersd@riseup.net>
Date:   Fri, 14 Apr 2017 13:59:07 -0400

Merge branch 'master' of github.com:anders-dc/dotfiles

Diffstat:
M
.Xresources
 | 
9
+++++----
M
.gitconfig
 | 
10
+++++-----
M
.vimrc
 | 
8
++++----
M
.zshrc
 | 
11
+++++++++++
M
bin/google-cloud-lamps-instance1-ssh.sh
 | 
10
++++++----
M
bin/idkfa-ssh
 | 
18
++++++++++++------
M
install.sh
 | 
1
+

7 files changed, 44 insertions(+), 23 deletions(-)
diff --git a/.Xresources b/.Xresources
@@ -9,7 +9,7 @@ Xcursor.size:  22
 !#include "/home/ad/.colors/erosionedit"
 !#include "/home/ad/.colors/solarized"
 !#include "/home/ad/.colors/solarized_black"
-#include "/home/ad/.colors/TomorrowNight"
+#include "/home/Anders.Damsgaard/.colors/TomorrowNight"
 
 ! fonts ----------------------------------------------------------------------
 Xft*dpi:        96
@@ -68,8 +68,9 @@ URxvt.keysym.C-0: command:\033]710;xft:PragmataPro:size=20\007\033]711;xft:Pragm
 !URxvt.letterSpace: -1
 
 ! looks good with PragmataPro
-URxvt.letterSpace: -2
+!URxvt.letterSpace: -2
 !URxvt.letterSpace: -1
+URxvt.letterSpace: 0
 
 !urxvt*font: -*-lemon-*-*-*-*-*-*-*-*-*-*-*-*
 !urxvt*boldFont: -*-lemon-*-*-*-*-*-*-*-*-*-*-*-*
@@ -85,8 +86,8 @@ URxvt.letterSpace: -2
 !urxvt*boldfont: -*-termsynu-bold-r-*-*-13-*-*-*-*-*-*-*
 !urxvt*font: xft:DejaVu Sans Mono for Powerline:size=8
 !urxvt*boldfont: xft:DejaVu Sans Mono for Powerline:size=8
-urxvt*font: xft:PragmataPro:size=11
-urxvt*boldfont: xft:PragmataPro:size=11:style=Bold
+urxvt*font: xft:PragmataPro:size=10
+urxvt*boldfont: xft:PragmataPro:size=10:style=Bold
 !urxvt*boldfont: xft:DejaVu Sans Mono Bold for Powerline:size=8
 
 ! shading: 0-99 darkens, 101-200 lightens
diff --git a/.gitconfig b/.gitconfig
@@ -1,8 +1,8 @@
 [user]
-	email = andersd@riseup.net
-	name = Anders Damsgaard
-	signkey = 56A56CA2
+    email = andersd@riseup.net
+    name = Anders Damsgaard
+    signkey = 56A56CA2
 [color]
-	ui = auto
+    ui = auto
 [push]
-	default = simple
+    default = simple
diff --git a/.vimrc b/.vimrc
@@ -256,8 +256,8 @@ set hlsearch        " highlight search matches
 set ignorecase      " case-insensitive search
 set incsearch       " search as you type
 set laststatus=2    " always show the statusline
-set list            " enable rendering of invisible characters
-set listchars=tab:▸\ ,eol:¬ " Use symbols for tab and end-of-line
+"set list            " enable rendering of invisible characters
+"set listchars=tab:▸\ ,eol:¬ " Use symbols for tab and end-of-line
 set number          " set linenumbering ON as default
 set relativenumber  " set relative linenumbering ON as default
 set pastetoggle=<F2> " toggle paste mode
@@ -697,7 +697,7 @@ let g:startify_custom_header =
             "\ ]
 
 " Split divider appearance
-set fillchars=vert:│,fold:-
+"set fillchars=vert:│,fold:-
 "hi! VertSplit ctermfg=15 ctermbg=NONE term=NONE
 hi! VertSplit ctermfg=238 ctermbg=NONE term=NONE
 
@@ -709,7 +709,7 @@ nnoremap <leader>M :CtrlPMpc<cr>
 "set cm=blowfish
 
 " Indent guides color and character┆│¦⦙
-let g:indentLine_char = '┆'
+"let g:indentLine_char = '┆'
 " Vim
 "let g:indentLine_color_term = 238
 "GVim
diff --git a/.zshrc b/.zshrc
@@ -148,6 +148,12 @@ alias grep='grep --color=auto'
 alias fgrep='fgrep --color=auto'
 alias egrep='egrep --color=auto'
 
+if [ -f /usr/local/Modules/default/init/zsh ]; then
+    source /usr/local/Modules/default/init/zsh && \
+    #module load git vim #python paraview ncview matlab ifort
+    module load git vim paraview matlab ifort python/2.7.1
+fi
+
 # use Ctrl-Z as fg
 fancy-ctrl-z () {
     if [[ $#BUFFER -eq 0 ]]; then
@@ -223,6 +229,11 @@ if [[ "$HOSTNAME" == "iddqd" ]]; then
 fi
 
 [ -f $HOME/code/julia/julia ] && export PATH=$HOME/code/julia:$PATH
+[ -d $HOME/local/bin ] && export PATH=$HOME/local/bin:$PATH
+if [ -d $HOME/local/python ]; then
+    export PYTHONPATH=$HOME/local/python:$PYTHONPATH
+    export PATH=$HOME/local/python:$PATH
+fi
 
 [ -f $HOME/.locale ] && $HOME/.locale
 
diff --git a/bin/google-cloud-lamps-instance1-ssh.sh b/bin/google-cloud-lamps-instance1-ssh.sh
@@ -1,12 +1,14 @@
 #!/bin/bash
-remotecommand='tmux attach -dt 0'
 set -e
+remotecommand='tmux attach -dt 0'
+host=104.154.231.211
+user=andersdc
 if [ "$1" = "-s" ]; then
-    ssh -i ~/.ssh/google-cloud-ssh-key andersdc@104.154.231.211 \
+    ssh -i ~/.ssh/google-cloud-ssh-key $user@$host \
         -t $remotecommand
 elif [ "$1" = "-a" ]; then
-    autossh -i ~/.ssh/google-cloud-ssh-key andersdc@104.154.231.211
+    autossh -i ~/.ssh/google-cloud-ssh-key $user@$host
 else
-    mosh --ssh="ssh -i ~/.ssh/google-cloud-ssh-key" andersdc@104.154.231.211 \
+    mosh --ssh="ssh -i ~/.ssh/google-cloud-ssh-key" $user@$host \
         -- $remotecommand
 fi
diff --git a/bin/idkfa-ssh b/bin/idkfa-ssh
@@ -1,6 +1,12 @@
-#!/bin/sh
-#ssh ad@172.16.154.22
-#ssh ad@132.239.153.219
-#ssh ad@idkfa.ucsd.edu
-tmux rename-window idkfa
-mosh ad@idkfa.ucsd.edu
+#!/bin/bash
+set -e
+remotecommand='tmux attach -dt utility'
+host=idkfa.ucsd.edu
+user=ad
+if [ "$1" = "-s" ]; then
+    ssh $user@$host -t $remotecommand
+elif [ "$1" = "-a" ]; then
+    autossh $user@$host
+else
+    mosh $user@$host -- $remotecommand
+fi
diff --git a/install.sh b/install.sh
@@ -1,4 +1,5 @@
 #!/bin/sh
+set -e
 
 # Create symlinks
 mkdir -p ./.vim/bundle