From a7d6f3c8ea5ab417940ce4094569c0da84543992 Mon Sep 17 00:00:00 2001 From: Emiel van de Laar Date: Sun, 26 Oct 2014 10:23:39 +0100 Subject: [PATCH 1/4] Latest module --- vim/bundle/nerdcommenter | 2 +- vim/bundle/nerdtree | 2 +- vim/bundle/supertab | 2 +- vim/bundle/tagbar | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/vim/bundle/nerdcommenter b/vim/bundle/nerdcommenter index 6549cfd..0b3d928 160000 --- a/vim/bundle/nerdcommenter +++ b/vim/bundle/nerdcommenter @@ -1 +1 @@ -Subproject commit 6549cfde45339bd4f711504196ff3e8b766ef5e6 +Subproject commit 0b3d928dce8262dedfc2f83b9aeb59a94e4f0ae4 diff --git a/vim/bundle/nerdtree b/vim/bundle/nerdtree index 4f1e6ec..b0bb781 160000 --- a/vim/bundle/nerdtree +++ b/vim/bundle/nerdtree @@ -1 +1 @@ -Subproject commit 4f1e6ecb057fc0bac189171c1430d71ef25f6bb1 +Subproject commit b0bb781fc73ef40365e4c996a16f04368d64fc9d diff --git a/vim/bundle/supertab b/vim/bundle/supertab index fd4e0d0..7a32e08 160000 --- a/vim/bundle/supertab +++ b/vim/bundle/supertab @@ -1 +1 @@ -Subproject commit fd4e0d06c2b1d9bff2eef1d15e7895b3b4da7cd7 +Subproject commit 7a32e0866bfea26cf7781935289df131d1d0c0e0 diff --git a/vim/bundle/tagbar b/vim/bundle/tagbar index 64e935f..614b5b2 160000 --- a/vim/bundle/tagbar +++ b/vim/bundle/tagbar @@ -1 +1 @@ -Subproject commit 64e935fe5812d3b7022aba1dee63ec9f7456b02f +Subproject commit 614b5b244f3a7a9e0174ebcf73c809de6e62e32c From d8e8df48643d97cd8a223ff893a1c55cfe089fd3 Mon Sep 17 00:00:00 2001 From: Emiel van de Laar Date: Sun, 26 Oct 2014 10:24:48 +0100 Subject: [PATCH 2/4] Default shell --- tmux/tmux.conf | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tmux/tmux.conf b/tmux/tmux.conf index a246d12..d435712 100644 --- 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 From a8899586cb6c535890eee627499dec57bf542220 Mon Sep 17 00:00:00 2001 From: Emiel van de Laar Date: Fri, 21 Nov 2014 11:05:29 +0100 Subject: [PATCH 3/4] Add some haskell bits --- Makefile | 4 ++++ ghci/ghci | 1 + vim/after/ftplugin/haskell.vim | 5 +++++ 3 files changed, 10 insertions(+) create mode 100644 ghci/ghci create mode 100644 vim/after/ftplugin/haskell.vim diff --git a/Makefile b/Makefile index c2f2aa7..1f80404 100644 --- a/Makefile +++ b/Makefile @@ -14,6 +14,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 new file mode 100644 index 0000000..abcfd54 --- /dev/null +++ b/ghci/ghci @@ -0,0 +1 @@ +:set +m diff --git a/vim/after/ftplugin/haskell.vim b/vim/after/ftplugin/haskell.vim new file mode 100644 index 0000000..71ec710 --- /dev/null +++ b/vim/after/ftplugin/haskell.vim @@ -0,0 +1,5 @@ +set tabstop=8 +set expandtab +set softtabstop=4 +set shiftwidth=4 +set shiftround From 25be453812ba34b91fe73664567eb3c470a73429 Mon Sep 17 00:00:00 2001 From: Emiel van de Laar Date: Fri, 21 Nov 2014 12:37:44 +0100 Subject: [PATCH 4/4] Latest --- Makefile | 1 - psql/psqlrc | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index c2f2aa7..a0859cc 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,5 @@ install: \ install-gdb \ - install-git \ install-i3 \ install-i3status \ install-psql \ diff --git a/psql/psqlrc b/psql/psqlrc index 68cd6e7..08a84c6 100644 --- a/psql/psqlrc +++ b/psql/psqlrc @@ -2,10 +2,10 @@ \set QUIET on -- nicer rendering for null -\pset null '❌' +--\pset null '❌' -- nicer tables -\pset linestyle unicode +--\pset linestyle unicode -- enable timers \timing