Merge branch 'master' of https://github.com/emiel/dotfiles

Conflicts: psql/psqlrc
emiel · Jan 6, 2015 · d86e9bf · d86e9bf
2 parents 7e1ccff + 61101c9
commit d86e9bf
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 7 deletions.
diff --git a/Makefile b/Makefile
@@ -13,6 +13,10 @@ install-gdb:
 	rm -f $(HOME)/.gdbinit
 	ln -s `pwd`/gdb/gdbinit $(HOME)/.gdbinit
 
+install-ghci:
+	rm -f $(HOME)/.ghci
+	ln -s `pwd`/ghci/ghci $(HOME)/.ghci
+
 install-git:
 	rm -f $(HOME)/.gitconfig
 	cp `pwd`/git/gitconfig $(HOME)/.gitconfig

diff --git a/ghci/ghci b/ghci/ghci
@@ -0,0 +1 @@
+:set +m
diff --git a/psql/psqlrc b/psql/psqlrc
@@ -5,7 +5,7 @@
 \pset null '<null>'
 
 -- nicer tables
-\pset linestyle unicode
+--\pset linestyle unicode
 
 -- enable timers
 \timing

diff --git a/tmux/tmux.conf b/tmux/tmux.conf
@@ -2,8 +2,10 @@
 set -g repeat-time 700
 set -g history-limit 100000
 
-set -g default-command /bin/zsh
-set -g default-shell /bin/zsh
+#set -g default-command /usr/local/bin/zsh
+#set -g default-shell /usr/local/bin/zsh
+#set -g default-command /bin/zsh
+#set -g default-shell /bin/zsh
 
 # Mouse click to select window/pane
 #set -g mode-mouse on

diff --git a/vim/after/ftplugin/haskell.vim b/vim/after/ftplugin/haskell.vim
@@ -0,0 +1,5 @@
+set tabstop=8
+set expandtab
+set softtabstop=4
+set shiftwidth=4
+set shiftround
diff --git a/vim/bundle/nerdcommenter b/vim/bundle/nerdcommenter
diff --git a/vim/bundle/nerdtree b/vim/bundle/nerdtree
diff --git a/vim/bundle/supertab b/vim/bundle/supertab
diff --git a/vim/bundle/tagbar b/vim/bundle/tagbar