dotfiles

commit b7d106da8d3abca7c21de01c403628d119275b7d
parent e1b62bdb4b2bdc1fccb88a72ad658b8756421f3c
Author: Anders Damsgaard <anders.damsgaard@geo.au.dk>
Date:   Sun,  9 Nov 2014 11:30:20 +0100

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

Diffstat:
M
.Xresources
 | 
8
++++++++
M
.emacs.d/init.el
 | 
20
++++++++++----------
M
.tmux.conf
 | 
2
+-
M
.vimrc
 | 
19
++++++++++++++++---
M
.xinitrc
 | 
3
++-
M
.zshrc
 | 
7
++++++-
M
install.sh
 | 
4
+++-
A
wallpapers/fall.jpg
 | 
0

8 files changed, 46 insertions(+), 17 deletions(-)
diff --git a/.Xresources b/.Xresources
@@ -134,3 +134,11 @@ xscreensaver.passwd.thermometer.background:  #000000
 xscreensaver.passwd.thermometer.width:       8
 !datestamp format--see the strftime(3) manual page for details
 xscreensaver.dateFormat:    %I:%M%P %a %b %d, %Y
+
+! xclock
+!xclock*update:      1
+xclock*analog:      true
+xclock*background:  #002b36
+xclock*Foreground:  #657b83
+
+
diff --git a/.emacs.d/init.el b/.emacs.d/init.el
@@ -52,8 +52,8 @@
      zencoding-mode         ; http://www.emacswiki.org/emacs/ZenCoding
      window-number          ; choose window with number using C-x o
      fill-column-indicator  ; indicate column 80
-     color-theme            ; nice looking emacs
-     color-theme-solarized)) ; check out color-theme-solarized
+     color-theme-solarized  ; check out color-theme-solarized
+     color-theme))          ; nice looking emacs
 
 (setq my:el-get-packages
       (append
@@ -90,6 +90,7 @@
 
 ;; color theme
 (load-theme 'solarized-dark t)
+(setq solarized-termcolor 256)
 
 ;; rainbow delimiters in programming modes
 (add-hook 'prog-mode-hook 'rainbow-delimiters-mode)
@@ -106,14 +107,16 @@
   "s" 'flyspell-mode
   "S" 'ispell
   "n" 'linum-mode
-  "w" 'whitespace-mode
+  ;"w" 'whitespace-mode
   "m" 'mu4e
   "p" 'org-latex-export-to-pdf
   "P" 'org-beamer-export-to-pdf
   "c" 'compile
   "g" 'magit-commit
-  "w" 'color-theme-solarized-light
-  "d" 'color-theme-solarized-dark
+  ;"w" 'color-theme-solarized-light
+  ;"d" 'color-theme-solarized-dark
+  "w" 'evil-write
+  "q" 'evil-quit
   "i" (lambda () (interactive)(find-file "~/.emacs.d/init.el"))
   "t" (lambda () (interactive)(find-file "~/doc/todo.org")))
 
@@ -400,11 +403,8 @@
  '(org-file-apps (quote ((auto-mode . emacs) ("\\.mm\\'" . default) ("\\.x?html?\\'" . default) ("\\.pdf\\'" . "zathura %s"))))
  '(send-mail-function (quote smtpmail-send-it)))
 (custom-set-faces
- ;; custom-set-faces was added by Custom.
- ;; If you edit it by hand, you could mess it up, so be careful.
- ;; Your init file should contain only one such instance.
- ;; If there is more than one, they won't work right.
- '(default ((t (:inherit nil :stipple nil :background "#002b36" :foreground "#839496" :inverse-video nil :box nil :strike-through nil :overline nil :underline nil :slant normal :weight normal :height 128 :width normal :foundry "unknown" :family "termsyn")))))
+ ;'(default ((t (:inherit nil :stipple nil :background "#002b36" :foreground "#839496" :inverse-video nil :box nil :strike-through nil :overline nil :underline nil :slant normal :weight normal :height 128 :width normal :foundry "unknown" :family "termsyn")))))
+ '(default ((t (:inherit nil :stipple nil :inverse-video nil :box nil :strike-through nil :overline nil :underline nil :slant normal :weight normal :height 86 :width normal :foundry "unknown" :family "PragmataPro")))))
 ;; choose your own fonts, in a system dependant way
 (if (string-match "apple-darwin" system-configuration)
   (set-face-font 'default "Monaco-11"))     ; os x
diff --git a/.tmux.conf b/.tmux.conf
@@ -1,6 +1,6 @@
 # C-a as tmux key
 set-option -g prefix C-a
-bind-key C-w last-window  # Go to last window with C-a C-w
+bind-key C-s last-window  # Go to last window with C-a C-s
 bind-key C-a last-pane    # Go to last pane with C-a C-a
 #set-option -g prefix C-b
 #bind-key C-w last-window  # Go to last window with C-b C-w
diff --git a/.vimrc b/.vimrc
@@ -30,7 +30,8 @@ NeoBundle 'scrooloose/nerdtree'
 NeoBundle 'scrooloose/syntastic'
 
 " fuzzy file, buffer, and tag finder
-NeoBundle 'kien/ctrlp.vim'
+"NeoBundle 'kien/ctrlp.vim'
+NeoBundle 'ctrlpvim/ctrlp.vim'
 
 " colorschemes
 NeoBundle 'altercation/vim-colors-solarized'
@@ -57,7 +58,7 @@ NeoBundle 'ervandew/supertab'
 
 " Ack is a grep replacement. Debian pkg: ack-grep. Run from Vim:
 " usage: :Ack [options] {pattern} [{directory}]
-"NeoBundle 'mileszs/ack.vim'
+NeoBundle 'mileszs/ack.vim'
 
 " Rainbow parantheses
 NeoBundle 'kien/rainbow_parentheses.vim'
@@ -237,6 +238,7 @@ let mapleader="\<Space>"
 
 " Shortcut to reload .vimrc
 nmap <leader>r :source $MYVIMRC<CR>
+nmap <leader>C :e $MYVIMRC<CR>
 
 " Shortcut to switch background color
 "nmap <leader>w :ToggleBG<CR>
@@ -268,11 +270,17 @@ nmap <leader>d :NERDTreeToggle<CR>
 " Toggle TAB and EOL symbols
 nmap <leader>l :set list!<CR>
 
+nmap <leader>T :e ~/doc/todo.org<CR>
+nmap <leader>% :vsplit 
+nmap <leader>" :split 
+
 " vimproc
 nmap <leader>e :VimProcBang 
 nmap <leader>E :VimProcRead 
 nmap <leader>c :VimProcBang make -k
 
+nmap <leader>g :Gcommit<CR>
+
 " Switch split focus with leader+hjkl
 nmap <leader>h <C-w>h
 nmap <leader>j <C-w>j
@@ -309,4 +317,9 @@ nmap <leader>t :!ctags -R --python-kinds=-i --langmap=c++:.cu,c++:.cuh .<CR>
 " When the cursor is on a function call, press <Ctrl-[> to go to its definition.
 " Press <Ctrl-t> to go back
 " Use the Ctrl-P plugin to search the tags
-nmap <leader>p :CtrlPTag<CR>
+nmap <leader>P :CtrlPTag<CR>
+nmap <leader>p :CtrlPBuffer<CR>
+nmap <leader>o :CtrlPMRUFiles<CR>
+
+" Launch Ack
+nmap <leader>a :Ack 
diff --git a/.xinitrc b/.xinitrc
@@ -15,7 +15,8 @@ xsetroot -cursor_name left_ptr &
 if [ "$HOSTNAME" = "iddqd" ]
 then
     #hsetroot -fill ~/wallpapers/octahedron-bg-gimp-double.png # dual screen
-    hsetroot -fill ~/wallpapers/octahedron-bg-gimp.png # single screen
+    #hsetroot -fill ~/wallpapers/octahedron-bg-gimp.png # single screen
+    hsetroot -fill ~/wallpapers/fall.jpg # single screen
 else
     hsetroot -cover ~/wallpapers/octahedron-bg-gimp.png
 fi
diff --git a/.zshrc b/.zshrc
@@ -1,4 +1,5 @@
 source ~/code/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
+source ~/code/zsh-git-prompt/zshrc.sh
 
 ARCH=$(uname)
 
@@ -9,7 +10,10 @@ colors
 
 PROMPT="
 %{$fg[red]%} » %{$reset_color%}"
-RPROMPT="%B%{$fg[cyan]%}%~%{$reset_color%} %n@%m"
+#PROMPT='%B%m%~%b$(git_super_status) %# '
+#PROMPT='
+#%b$(git_super_status) %{$fg[red]%}»%{$reset_color%} '
+RPROMPT='%B%{$fg[cyan]%}%~%{$reset_color%} $(git_super_status) %n@%m'
 
 setopt AUTO_CD
 setopt CORRECT
@@ -49,6 +53,7 @@ function sayfile() { festival --tts $@; }
 alias svim='sudoedit'
 alias e='emacs -nw'
 alias v='vim'
+alias f='fg'
 alias vi='vim -u NONE'
 alias gs='git status'
 alias gl='git log --oneline'
diff --git a/install.sh b/install.sh
@@ -4,9 +4,10 @@
 mkdir -p ./.vim/bundle
 ./create_symlinks.sh
 
-# Clone zsh syntax highlighting
+# Clone zsh syntax highlighting and git prompt
 mkdir -p $HOME/code && cd $HOME/code && \
 git clone https://github.com/zsh-users/zsh-syntax-highlighting.git
+git clone https://github.com/olivierverdier/zsh-git-prompt.git
 
 # Install fonts
 git clone https://github.com/phallus/fonts ~/code/phallus-fonts &&
@@ -20,6 +21,7 @@ mkdir -p ~/.vim/bundle
 # Install NeoBundle
 git clone https://github.com/Shougo/neobundle.vim ~/.vim/bundle/neobundle.vim
 
+
 # Install font
 cd /tmp &&\
     wget http://susanoganders.dk/termsyn-1.8.7.tar.gz &&\
diff --git a/wallpapers/fall.jpg b/wallpapers/fall.jpg
Binary files differ.