commit 6ae1b44346246fd1d2e9a5b534c60f978cdefa75
parent 7ff473696a7f43beaa40121d1c562071278c66b6
Author: Anders Damsgaard <anders.damsgaard@geo.au.dk>
Date: Sun, 21 Sep 2014 19:34:28 +0200
Merge branch 'master' of https://github.com/anders-dc/dotfiles
Diffstat:
32 files changed, 674 insertions(+), 117 deletions(-)
diff --git a/.Xresources b/.Xresources
@@ -33,17 +33,34 @@ urxvt*internalBorder: 2
URxvt.meta8: true
URxvt.intensityStyles: false
+URxvt.iso14755: false
+URxvt.iso14755_52: false
-URxvt.keysym.C-1: command:\033]710;xft:inconsolata:size=7\007\033]711;xft:inconsolata:size=7\007
-URxvt.keysym.C-2: command:\033]710;xft:inconsolata:size=8\007\033]711;xft:inconsolata:size=8\007
-URxvt.keysym.C-3: command:\033]710;xft:inconsolata:size=10\007\033]711;xft:Monaco for Powerline:size=10\007
-URxvt.keysym.C-4: command:\033]710;xft:inconsolata:size=12\007\033]711;xft:inconsolata:size=12\007
-URxvt.keysym.C-5: command:\033]710;xft:inconsolata:size=14\007\033]711;xft:inconsolata:size=14\007
-URxvt.keysym.C-6: command:\033]710;xft:inconsolata:size=16\007\033]711;xft:inconsolata:size=16\007
-URxvt.keysym.C-7: command:\033]710;xft:inconsolata:size=18\007\033]711;xft:inconsolata:size=18\007
-URxvt.keysym.C-8: command:\033]710;xft:inconsolata:size=24\007\033]711;xft:inconsolata:size=24\007
-URxvt.keysym.C-9: command:\033]710;-*-uushi-*-*-*-*-*-*-*-*-*-*-*-*\007\033]711;-*-uushi-*-*-*-*-*-*-*-*-*-*-*-*\007
-URxvt.keysym.C-0: command:\033]710;-*-termsynu-medium-r-*-*-13-*-*-*-*-*-*-*\007\033]711;-*-termsynu-medium-r-*-*-13-*-*-*-*-*-*-*\007
+!URxvt.keysym.C-1: command:\033]710;xft:DejaVu Sans Mono for Powerline:size=7\007\033]711;xft:DejaVu Sans Mono Bold for Powerline:size=7\007
+!URxvt.keysym.C-2: command:\033]710;xft:DejaVu Sans Mono for Powerline:size=7.5\007\033]711;xft:DejaVu Sans Mono Bold for Powerline:size=7.5\007
+!URxvt.keysym.C-3: command:\033]710;xft:DejaVu Sans Mono for Powerline:size=8\007\033]711;xft:DejaVu Sans Mono Bold for Powerline:size=8\007
+!URxvt.keysym.C-4: command:\033]710;xft:DejaVu Sans Mono for Powerline:size=9\007\033]711;xft:DejaVu Sans Mono Bold for Powerline:size=9\007
+!URxvt.keysym.C-5: command:\033]710;xft:DejaVu Sans Mono for Powerline:size=10\007\033]711;xft:DejaVu Sans Mono Bold for Powerline:size=10\007
+!URxvt.keysym.C-6: command:\033]710;xft:DejaVu Sans Mono for Powerline:size=12\007\033]711;xft:DejaVu Sans Mono Bold for Powerline:size=12\007
+!URxvt.keysym.C-7: command:\033]710;xft:DejaVu Sans Mono for Powerline:size=14\007\033]711;xft:DejaVu Sans Mono Bold for Powerline:size=14\007
+!URxvt.keysym.C-8: command:\033]710;xft:DejaVu Sans Mono for Powerline:size=16\007\033]711;xft:DejaVu Sans Mono Bold for Powerline:size=16\007
+!URxvt.keysym.C-9: command:\033]710;xft:DejaVu Sans Mono for Powerline:size=18\007\033]711;xft:DejaVu Sans Mono Bold for Powerline:size=18\007
+!URxvt.keysym.C-0: command:\033]710;xft:DejaVu Sans Mono for Powerline:size=20\007\033]711;xft:DejaVu Sans Mono Bold for Powerline:size=20\007
+URxvt.keysym.C-1: command:\033]710;xft:PragmataPro:size=7\007\033]711;xft:PragmataPro:size=7\007
+URxvt.keysym.C-2: command:\033]710;xft:PragmataPro:size=7.5\007\033]711;xft:PragmataPro:size=7.5\007
+URxvt.keysym.C-3: command:\033]710;xft:PragmataPro:size=8\007\033]711;xft:PragmataPro:size=8\007
+URxvt.keysym.C-4: command:\033]710;xft:PragmataPro:size=9\007\033]711;xft:PragmataPro:size=9\007
+URxvt.keysym.C-5: command:\033]710;xft:PragmataPro:size=10\007\033]711;xft:PragmataPro:size=10\007
+URxvt.keysym.C-6: command:\033]710;xft:PragmataPro:size=12\007\033]711;xft:PragmataPro:size=12\007
+URxvt.keysym.C-7: command:\033]710;xft:PragmataPro:size=14\007\033]711;xft:PragmataPro:size=14\007
+URxvt.keysym.C-8: command:\033]710;xft:PragmataPro:size=16\007\033]711;xft:PragmataPro:size=16\007
+URxvt.keysym.C-9: command:\033]710;xft:PragmataPro:size=18\007\033]711;xft:PragmataPro:size=18\007
+URxvt.keysym.C-0: command:\033]710;xft:PragmataPro:size=20\007\033]711;xft:PragmataPro:size=20\007
+!URxvt.keysym.C-9: command:\033]710;-*-termsynu-medium-r-*-*-13-*-*-*-*-*-*-*\007\033]711;-*-termsynu-medium-r-*-*-13-*-*-*-*-*-*-*\007
+!URxvt.keysym.C-0: command:\033]710;-*-termsynu-medium-r-*-*-14-*-*-*-*-*-*-*\007\033]711;-*-termsynu-medium-r-*-*-14-*-*-*-*-*-*-*\007
+
+! looks good with DejaVi Sans Mono:
+!URxvt.letterSpace: -1
!urxvt*font: -*-lemon-*-*-*-*-*-*-*-*-*-*-*-*
!urxvt*boldFont: -*-lemon-*-*-*-*-*-*-*-*-*-*-*-*
@@ -55,9 +72,13 @@ URxvt.keysym.C-0: command:\033]710;-*-termsynu-medium-r-*-*-13-*-*-*-*-*-*-*\007
!urxvt*font: -*-uushi-*-*-*-*-*-*-*-*-*-*-*-*
!urxvt*font: -*-termsynu-medium-r-*-*-11-*-*-*-*-*-*-*
!urxvt*boldfont: -*-termsynu-bold-r-*-*-11-*-*-*-*-*-*-*
-urxvt*font: -*-termsynu-medium-r-*-*-13-*-*-*-*-*-*-*
-urxvt*boldfont: -*-termsynu-bold-r-*-*-13-*-*-*-*-*-*-*
-!urxvt*font: xft:SourceCodePro-Light:size=7.3
+!urxvt*font: -*-termsynu-medium-r-*-*-13-*-*-*-*-*-*-*
+!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=8
+urxvt*boldfont: xft:PragmataPro:size=8
+!urxvt*boldfont: xft:DejaVu Sans Mono Bold for Powerline:size=8
! shading: 0-99 darkens, 101-200 lightens
!urxvt*transparent: true
diff --git a/.bashrc b/.bashrc
@@ -165,4 +165,17 @@ if [[ "$HOSTNAME" == "iddqd" ]]; then
alias pizza="python $CFDEM_LPP_DIR/pizza.py"
fi
+PENGUINCUDA=/public/apps/cuda/6.0
+if [ -d $PENGUINCUDA ]; then
+ module load cmake/2.8.11.2
+ module load cuda/6.0
+ module load python/2.7.4
+ module load numpy/1.7.1/python.2.7.4
+ module load matplotlib/1.7.1/python.2.7.4
+fi
+
[ -f $HOME/code/julia/julia ] && export PATH=$HOME/code/julia:$PATH
+
+[ -f $HOME/.locale ] && $HOME/.locale
+
+source ~/.tmuxinator/tmuxinator.zsh
diff --git a/.colors/LICENSE.md b/.colors/LICENSE.md
@@ -0,0 +1,24 @@
+# LICENSE
+
+Base16 Builder is released under the MIT License:
+
+> Copyright (C) 2013 [Chris Kempson](http://chriskempson.com)
+>
+> Permission is hereby granted, free of charge, to any person obtaining
+> a copy of this software and associated documentation files (the
+> "Software"), to deal in the Software without restriction, including
+> without limitation the rights to use, copy, modify, merge, publish,
+> distribute, sublicense, and/or sell copies of the Software, and to
+> permit persons to whom the Software is furnished to do so, subject to
+> the following conditions:
+>
+> The above copyright notice and this permission notice shall be
+> included in all copies or substantial portions of the Software.
+>
+> THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+> EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+> MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+> NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+> LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+> OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+> WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/.colors/Tomorrow b/.colors/Tomorrow
@@ -0,0 +1,50 @@
+!Tomorrow
+#define t_background #ffffff
+#define t_current_line #efefef
+#define t_selection #d6d6d6
+#define t_foreground #4d4d4c
+#define t_comment #8e908c
+#define t_red #c82829
+#define t_orange #f5871f
+#define t_yellow #eab700
+#define t_green #718c00
+#define t_aqua #3e999f
+#define t_blue #4271ae
+#define t_purple #8959a8
+
+
+*.foreground: t_foreground
+*.background: t_background
+*.cursorColor: #aeafad
+
+! Black / Grey
+*.color0: #000000
+*.color8: #666666
+
+! Red / Bright Red
+*.color1: t_red
+*.color9: #FF3334
+
+! Green + Bright Green
+*.color2: t_green
+*.color10: #9ec400
+
+! Yellow (Orange) + Bright Yellow (Yellow)
+*.color3: t_orange
+*.color11: t_yellow
+
+! Blue + Bright Blue
+*.color4: t_blue
+*.color12: t_blue
+
+! Magenta (Purple) + Bright Magenta
+*.color5: t_purple
+*.color13: #b777e0
+
+! Cyan (Aqua) + Bright Cyan
+*.color6: t_aqua
+*.color14: #54ced6
+
+! Light Grey (Selection) + White (Current Line)
+*.color7: t_selection
+*.color15: t_current_line
diff --git a/.colors/TomorrowNight b/.colors/TomorrowNight
@@ -0,0 +1,50 @@
+!TomorrowNight
+#define t_background #1d1f21
+#define t_current_line #282a2e
+#define t_selection #373b41
+#define t_foreground #c5c8c6
+#define t_comment #969896
+#define t_red #cc6666
+#define t_orange #de935f
+#define t_yellow #f0c674
+#define t_green #b5bd68
+#define t_aqua #8abeb7
+#define t_blue #81a2be
+#define t_purple #b294bb
+
+
+*.foreground: t_foreground
+*.background: t_background
+*.cursorColor: #aeafad
+
+! Black / Grey
+*.color0: #000000
+*.color8: #666666
+
+! Red / Bright Red
+*.color1: t_red
+*.color9: #FF3334
+
+! Green + Bright Green
+*.color2: t_green
+*.color10: #9ec400
+
+! Yellow (Orange) + Bright Yellow (Yellow)
+*.color3: t_orange
+*.color11: t_yellow
+
+! Blue + Bright Blue
+*.color4: t_blue
+*.color12: t_blue
+
+! Magenta (Purple) + Bright Magenta
+*.color5: t_purple
+*.color13: #b777e0
+
+! Cyan (Aqua) + Bright Cyan
+*.color6: t_aqua
+*.color14: #54ced6
+
+! Light Grey (Selection) + White (Current Line)
+*.color7: t_selection
+*.color15: t_current_line
diff --git a/.colors/TomorrowNightBlue b/.colors/TomorrowNightBlue
@@ -0,0 +1,50 @@
+!TomorrowNightBlue
+#define t_background #002451
+#define t_current_line #00346e
+#define t_selection #003f8e
+#define t_foreground #ffffff
+#define t_comment #7285b7
+#define t_red #ff9da4
+#define t_orange #ffc58f
+#define t_yellow #ffeead
+#define t_green #d1f1a9
+#define t_aqua #99ffff
+#define t_blue #bbdaff
+#define t_purple #ebbbff
+
+
+*.foreground: t_foreground
+*.background: t_background
+*.cursorColor: #aeafad
+
+! Black / Grey
+*.color0: #000000
+*.color8: #666666
+
+! Red / Bright Red
+*.color1: t_red
+*.color9: #FF3334
+
+! Green + Bright Green
+*.color2: t_green
+*.color10: #9ec400
+
+! Yellow (Orange) + Bright Yellow (Yellow)
+*.color3: t_orange
+*.color11: t_yellow
+
+! Blue + Bright Blue
+*.color4: t_blue
+*.color12: t_blue
+
+! Magenta (Purple) + Bright Magenta
+*.color5: t_purple
+*.color13: #b777e0
+
+! Cyan (Aqua) + Bright Cyan
+*.color6: t_aqua
+*.color14: #54ced6
+
+! Light Grey (Selection) + White (Current Line)
+*.color7: t_selection
+*.color15: t_current_line
diff --git a/.colors/TomorrowNightBright b/.colors/TomorrowNightBright
@@ -0,0 +1,50 @@
+!TomorrowNightBright
+#define t_background #000000
+#define t_current_line #2a2a2a
+#define t_selection #424242
+#define t_foreground #eaeaea
+#define t_comment #969896
+#define t_red #d54e53
+#define t_orange #e78c45
+#define t_yellow #e7c547
+#define t_green #b9ca4a
+#define t_aqua #70c0b1
+#define t_blue #7aa6da
+#define t_purple #c397d8
+
+
+*.foreground: t_foreground
+*.background: t_background
+*.cursorColor: #aeafad
+
+! Black / Grey
+*.color0: #000000
+*.color8: #666666
+
+! Red / Bright Red
+*.color1: t_red
+*.color9: #FF3334
+
+! Green + Bright Green
+*.color2: t_green
+*.color10: #9ec400
+
+! Yellow (Orange) + Bright Yellow (Yellow)
+*.color3: t_orange
+*.color11: t_yellow
+
+! Blue + Bright Blue
+*.color4: t_blue
+*.color12: t_blue
+
+! Magenta (Purple) + Bright Magenta
+*.color5: t_purple
+*.color13: #b777e0
+
+! Cyan (Aqua) + Bright Cyan
+*.color6: t_aqua
+*.color14: #54ced6
+
+! Light Grey (Selection) + White (Current Line)
+*.color7: t_selection
+*.color15: t_current_line
diff --git a/.colors/TomorrowNightEighties b/.colors/TomorrowNightEighties
@@ -0,0 +1,50 @@
+!TomorrowNightEighties
+#define t_background #2d2d2d
+#define t_current_line #393939
+#define t_selection #515151
+#define t_foreground #cccccc
+#define t_comment #999999
+#define t_red #f2777a
+#define t_orange #f99157
+#define t_yellow #ffcc66
+#define t_green #99cc99
+#define t_aqua #66cccc
+#define t_blue #6699cc
+#define t_purple #cc99cc
+
+
+*.foreground: t_foreground
+*.background: t_background
+*.cursorColor: #aeafad
+
+! Black / Grey
+*.color0: #000000
+*.color8: #666666
+
+! Red / Bright Red
+*.color1: t_red
+*.color9: #FF3334
+
+! Green + Bright Green
+*.color2: t_green
+*.color10: #9ec400
+
+! Yellow (Orange) + Bright Yellow (Yellow)
+*.color3: t_orange
+*.color11: t_yellow
+
+! Blue + Bright Blue
+*.color4: t_blue
+*.color12: t_blue
+
+! Magenta (Purple) + Bright Magenta
+*.color5: t_purple
+*.color13: #b777e0
+
+! Cyan (Aqua) + Bright Cyan
+*.color6: t_aqua
+*.color14: #54ced6
+
+! Light Grey (Selection) + White (Current Line)
+*.color7: t_selection
+*.color15: t_current_line
diff --git a/.config/dwb/keys b/.config/dwb/keys
@@ -41,7 +41,7 @@ find_forward_ic= c/
find_forward= /
find_next= n
find_previous= N
-tabgrep=
+tabgrep=
focus_input= gi
focus_next= J
focus_tab= T
@@ -53,13 +53,13 @@ win_hist_forward= wl
tab_hist_forward= tl
history_forward= L
insert_mode= i
-jump= '
+jump='
show_keys= Sk
load_html=
load_html_tab=
lock_domain= xd
lock_uri= xu
-mark= `
+mark=`
tab_move_left= gl
tab_move_right= gr
tab_move= gm
@@ -79,13 +79,13 @@ tab_paste_primary= PP
print=Control Mod1 p
protect=Control P
quit=Control q
-adblock_reload_rules=
+adblock_reload_rules=
reload_bookmarks=
reload= r
reload_bypass_cache= R
reload_quickmarks=
reload_userscripts=
-repeat= .
+repeat=.
save= sf
save_session= ZZ
save_named_session= gZZ
@@ -148,7 +148,7 @@ hints_url_background= ;Ob
backopen_url= xO
backopen= xo
bookmarks= gb
-hints_selector=
+hints_selector=
hints= f
hints_clipboard= ;y
hints_download= ;d
diff --git a/.config/dwb/settings b/.config/dwb/settings
@@ -84,7 +84,7 @@ tab-normal-fg-color-1=#cccccc
default-monospace-font-size=10
save-session=true
enable-ipc=true
-tabbar-visible=2.00
+tabbar-visible=2
auto-insert-mode=false
tab-normal-bg-color-2=#707070
tab-normal-bg-color-1=#505050
@@ -160,3 +160,4 @@ message-delay=2
scheme-handler=
default-font-size=12
enable-offline-web-application-cache=true
+enable-accelerated-compositing=false
diff --git a/.emacs.d/init.el b/.emacs.d/init.el
@@ -25,8 +25,8 @@
(setq evil-want-C-u-scroll t) ;; enable half-screen page up using C-u
;; add julia mode from github repo
-(add-to-list 'load-path "~/code/julia/contrib")
-(require 'julia-mode)
+;(add-to-list 'load-path "~/code/julia/contrib")
+;(require 'julia-mode)
;; now set our own packages
(setq
@@ -108,12 +108,13 @@
"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
"i" (lambda () (interactive)(find-file "~/.emacs.d/init.el"))
- "t" (lambda () (interactive)(find-file "~/owncloud/todo.org")))
+ "t" (lambda () (interactive)(find-file "~/doc/todo.org")))
;; equivalent to vim scrolloff
(setq scroll-margin 3)
@@ -215,6 +216,7 @@
"pdflatex -interaction nonstopmode -output-directory %o %f"))
;; render special characters using UTF-8 character set
+;; Toggle with C-c C-x \
(setq org-pretty-entities t)
;; avoid compiz manager rendering bugs
@@ -394,6 +396,7 @@
;; Your init file should contain only one such instance.
;; If there is more than one, they won't work right.
'(custom-safe-themes (quote ("1e7e097ec8cb1f8c3a912d7e1e0331caeed49fef6cff220be63bd2a6ba4cc365" default)))
+ '(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.
diff --git a/.i3/config b/.i3/config
@@ -10,7 +10,8 @@
# Please see http://i3wm.org/docs/userguide.html for a complete reference!
set $mod Mod4
-set $alt Mod1
+#set $mod Mod1
+#set $alt Mod1
# Font for window titles. Will also be used by the bar unless a different font
# is used in the bar {} block below. ISO 10646 = Unicode
@@ -21,7 +22,8 @@ set $alt Mod1
# chose an xft font, such as:
#font xft:DejaVu Sans Mono 10
#font xft:LucidaTypewriter 7
-font -*-termsynu-medium-r-*-*-13-*-*-*-*-*-*-*
+#font -*-termsynu-medium-r-*-*-13-*-*-*-*-*-*-*
+font xft:PragmataPro 8
#font -*-nu-*-*-*-*-*-*-*-*-*-*-*-*
#font -*-terminus-*-*-*-*-*-*-*-*-*-*-*-*
@@ -71,6 +73,7 @@ bindsym $mod+b exec firefox
bindsym $mod+c exec emacs
bindsym $mod+t exec tor-browser.sh
bindsym $mod+p exec zathura
+bindsym $mod+Mod1+l exec --no-startup-id ~/bin/keyboard-layout-switch.sh && notify-send `cat ~/.kbd-layout`
# volume control with pulseaudio
#bindsym XF86AudioRaiseVolume exec --no-startup-id pactl set-sink-volume 0 -- +10% && killall -SIGUSR1 i3status
@@ -80,6 +83,9 @@ bindsym $mod+p exec zathura
bindsym XF86AudioRaiseVolume exec --no-startup-id amixer set Master 3%+ unmute && killall -SIGUSR1 i3status
bindsym XF86AudioLowerVolume exec --no-startup-id amixer set Master 3%- unmute && killall -SIGUSR1 i3status
bindsym XF86AudioMute exec --no-startup-id amixer set Master toggle && killall -SIGUSR1 i3status
+bindsym $mod+Shift+i exec --no-startup-id amixer set Master 3%+ unmute && killall -SIGUSR1 i3status
+bindsym $mod+Shift+o exec --no-startup-id amixer set Master 3%- unmute && killall -SIGUSR1 i3status
+bindsym $mod+Shift+m exec --no-startup-id amixer set Master toggle && killall -SIGUSR1 i3status
# mpd control
bindsym $mod+Shift+p exec mpc toggle
@@ -89,7 +95,7 @@ bindsym $mod+Shift+s exec mpc stop
# Light X colors
bindsym $mod+Shift+w exec --no-startup-id /home/adc/bin/solarized-light.sh
-bindsym $mod+Shift+d exec --no-startup-id /home/adc/bin/solarized-light.sh
+bindsym $mod+Shift+d exec --no-startup-id /home/adc/bin/solarized-dark.sh
# screen lock
bindsym $mod+z exec /home/adc/bin/zzz
@@ -239,6 +245,7 @@ bar {
#inactive_workspace #333333 #222222 #888888
#urgent_workspace #2f343a #900000 #ffffff
+ # solarized dark
background #002b36
statusline #657b83
separator #586e75
@@ -246,10 +253,20 @@ bar {
active_workspace #586e75 #586e75 #002b36
inactive_workspace #073642 #002b36 #839496
urgent_workspace #dc322f #dc322f #fdf6e3
+
+ # solarized light
+ #background #fdf6e3
+ #statusline #657b83
+ #separator #586e75
+ #focused_workspace #b58900 #b58900 #002b36
+ #active_workspace #586e75 #586e75 #002b36
+ #inactive_workspace #fdf6e3 #fdf6e3 #839496
+ #urgent_workspace #dc322f #dc322f #fdf6e3
}
}
# auto-start programs
#exec --no-startup-id wicd-client --tray
exec --no-startup-id nm-applet
-exec --no-startup-id i3-msg 'workspace 2; exec emacs; workspace 3; exec firefox; workspace 1; exec urxvt -e tmux-utility.sh'
+#exec --no-startup-id i3-msg 'workspace 2; exec emacs; workspace 3; exec firefox; workspace 1; exec urxvt -e tmux-utility.sh'
+exec --no-startup-id i3-msg 'workspace 2; exec firefox; workspace 1; exec urxvt -e tmuxinator utility'
diff --git a/.locale b/.locale
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+# Set locale preferences
+export LANG="en_US.UTF-8"
+export LANGUAGE="en_US.UTF-8"
+export LC_ALL=
+export LC_CTYPE="en_US.UTF-8"
+export LC_COLLATE="C"
diff --git a/.mutt/colors b/.mutt/colors
@@ -14,12 +14,12 @@ color quoted4 green default
color quoted5 default default
#color indicator white default
-color indicator brightdefault default
+color indicator blue default
#color message yellow black
color message yellow default
#color status white black
color status white default
-color error yellow red
+color error black red
color attachment magenta default
color signature red default
color markers red yellow
diff --git a/.mutt/muttrc b/.mutt/muttrc
@@ -11,7 +11,7 @@ set my_tmp_secret = `gpg -o ~/.sec/.tmp -d ~/.sec/pass.gpg`
# NFIT credentials
set my_nfit_user = "ad\\adc"
set my_nfit_pass = `awk '/NFIT/ {print $2}' ~/.sec/.tmp`
-set my_nfit_email = "adc@geo.au.dk"
+set my_nfit_email = "anders.damsgaard@geo.au.dk"
# Riseup credentials
set my_riseup_user = "andersd"
@@ -31,16 +31,12 @@ set mbox_type=Maildir
# Send mail settings
folder-hook riseup 'set \
- from=andersd@riseup.net\
- smtp_authenticators = "login"\
- smtp_url = "smtp://$my_riseup_user@mail.riseup.net:587"\
- smtp_pass = $my_riseup_pass'
+ from=$my_riseup_email\
+ sendmail = "/usr/bin/msmtp -a riseup"'
folder-hook geomail 'set \
- from=anders.damsgaard@geo.au.dk\
- smtp_authenticators = "login"\
- smtp_url = "smtp://$my_nfit_user@asmtp.au.dk:587"\
- smtp_pass = $my_nfit_pass'
+ from=$my_nfit_email\
+ sendmail = "/usr/bin/msmtp -a geomail"'
# Cache files
set header_cache=~/.mutt/cache/headers
@@ -121,8 +117,11 @@ bind index <space> collapse-thread
macro index M "T.*\n;WN" "Mark all messages as read"
# Macros to change between inboxes
-macro index \\1 "<change-folder>=riseup/INBOX/<enter>"
-macro index \\2 "<change-folder>=geomail/INBOX/<enter>"
+macro index \\1 "<change-folder>=riseup/INBOX/<enter>" "Go to Riseup inbox"
+macro index \\2 "<change-folder>=geomail/INBOX/<enter>" "Go to Geomail inbox"
+
+macro index A "!$EDITOR ~/.mutt/aliases\n:source ~/.mutt/aliases\n" "Edit aliases file and reload it"
+macro pager A "!$EDITOR ~/.mutt/aliases\n:source ~/.mutt/aliases\n" "Edit aliases file and reload it"
# Sync email
macro index O "<shell-escape>offlineimap<enter>" "run offlineimap to sync all mail"
diff --git a/.tmux.conf b/.tmux.conf
@@ -29,6 +29,9 @@ bind -r J resize-pane -D 5
bind -r H resize-pane -L 5
bind -r L resize-pane -R 5
+# zoom pane
+bind -r z resize-pane -Z
+
bind r source-file ~/.tmux.conf \; display "Source file reloaded"
set -g base-index 1 # start window numbering at 1
@@ -117,3 +120,6 @@ set -g message-attr bright
# Linux clipboard
bind C-c run "tmux save-buffer - | xclip -i -sel clipboard"
bind C-v run "tmux set-buffer \"$(xclip -o -sel clipboard)\"; tmux paste-buffer"
+
+# use urlview to follow URLs
+bind-key u capture-pane \; save-buffer /tmp/active_tmux_buffer \; new-window -n urlview '$SHELL -c "urlview < /tmp/active_tmux_buffer && rm /tmp/active_tmux_buffer"'
diff --git a/.tmuxinator/article2.yml b/.tmuxinator/article2.yml
@@ -0,0 +1,22 @@
+# ~/.tmuxinator/article2.yml
+
+name: article2
+root: ~/articles/own/2-org
+
+# Optional tmux socket
+# socket_name: foo
+
+# Runs before everything. Use it to start daemons etc.
+# pre: sudo /etc/rc.d/mysqld start
+
+# Runs in each window and pane before window/pane specific commands. Useful for setting up interpreter versions.
+# pre_window: rbenv shell 2.0.0-p247
+
+# Pass command line options to tmux. Useful for specifying a different tmux.conf.
+# tmux_options: -f ~/.tmux.mac.conf
+
+# Change the command to call tmux. This can be used by derivatives/wrappers like byobu.
+# tmux_command: byobu
+
+windows:
+ - editor: emacs article2.org & && zathura article2.pdf
diff --git a/.tmuxinator/tmuxinator.bash b/.tmuxinator/tmuxinator.bash
@@ -0,0 +1,21 @@
+#!/usr/bin/env bash
+
+_tmuxinator() {
+ COMPREPLY=()
+ local word="${COMP_WORDS[COMP_CWORD]}"
+
+ if [ "$COMP_CWORD" -eq 1 ]; then
+ local commands="$(compgen -W "$(tmuxinator commands)" -- "$word")"
+ local projects="$(compgen -W "$(tmuxinator completions start)" -- "$word")"
+
+ COMPREPLY=( $commands $projects )
+ else
+ local words=("${COMP_WORDS[@]}")
+ unset words[0]
+ unset words[$COMP_CWORD]
+ local completions=$(tmuxinator completions "${words[@]}")
+ COMPREPLY=( $(compgen -W "$completions" -- "$word") )
+ fi
+}
+
+complete -F _tmuxinator tmuxinator mux
diff --git a/.tmuxinator/tmuxinator.zsh b/.tmuxinator/tmuxinator.zsh
@@ -0,0 +1,20 @@
+#!/usr/bin/env zsh
+
+if [[ ! -o interactive ]]; then
+ return
+fi
+
+compctl -K _tmuxinator tmuxinator mux
+
+_tmuxinator() {
+ local words completions
+ read -cA words
+
+ if [ "${#words}" -eq 2 ]; then
+ completions="$(tmuxinator commands)"
+ else
+ completions="$(tmuxinator completions ${words[2,-2]})"
+ fi
+
+ reply=("${(ps:\n:)completions}")
+}
diff --git a/.tmuxinator/tutorial.yml b/.tmuxinator/tutorial.yml
@@ -0,0 +1,28 @@
+# ~/.tmuxinator/tutorial.yml
+
+name: tutorial
+root: ~/
+
+# Optional tmux socket
+# socket_name: foo
+
+# Runs before everything. Use it to start daemons etc.
+# pre: sudo /etc/rc.d/mysqld start
+
+# Runs in each window and pane before window/pane specific commands. Useful for setting up interpreter versions.
+# pre_window: rbenv shell 2.0.0-p247
+
+# Pass command line options to tmux. Useful for specifying a different tmux.conf.
+# tmux_options: -f ~/.tmux.mac.conf
+
+# Change the command to call tmux. This can be used by derivatives/wrappers like byobu.
+# tmux_command: byobu
+
+windows:
+ - editor:
+ layout: main-vertical
+ panes:
+ - vim
+ - guard
+ - server: bundle exec rails s
+ - logs: tail -f log/development.log
diff --git a/.tmuxinator/utility.yml b/.tmuxinator/utility.yml
@@ -0,0 +1,39 @@
+# ~/.tmuxinator/utility.yml
+
+name: utility
+root: ~/
+pre: mpd
+
+# Optional tmux socket
+# socket_name: foo
+
+# Runs before everything. Use it to start daemons etc.
+# pre: sudo /etc/rc.d/mysqld start
+
+# Runs in each window and pane before window/pane specific commands. Useful for setting up interpreter versions.
+# pre_window: rbenv shell 2.0.0-p247
+
+# Pass command line options to tmux. Useful for specifying a different tmux.conf.
+# tmux_options: -f ~/.tmux.mac.conf
+
+# Change the command to call tmux. This can be used by derivatives/wrappers like byobu.
+# tmux_command: byobu
+
+windows:
+ - utility:
+ layout: main-vertical
+ panes:
+ - mutt
+ - ~/bin/irc.sh
+ - zsh
+ - sys:
+ layout: main-vertical
+ panes:
+ - htop
+ - zsh
+ - twitter: rainbowstream #--image-on-term
+ - audio:
+ layout: main-vertical
+ panes:
+ - vimpc
+ - alsamixer
diff --git a/.vim/vimrc.tiny b/.vim/vimrc.tiny
@@ -0,0 +1,13 @@
+" Vim configuration file, in effect when invoked as "vi". The aim of this
+" configuration file is to provide a Vim environment as compatible with the
+" original vi as possible. Note that ~/.vimrc configuration files as other
+" configuration files in the runtimepath are still sourced.
+" When Vim is invoked differently ("vim", "view", "evim", ...) this file is
+" _not_ sourced; /etc/vim/vimrc and/or /etc/vim/gvimrc are.
+
+" Debian system-wide default configuration Vim
+set runtimepath=~/.vim,/var/lib/vim/addons,/usr/share/vim/vimfiles,/usr/share/vim/vim74,/usr/share/vim/vimfiles/after,/var/lib/vim/addons/after,~/.vim/after
+
+set compatible
+
+" vim: set ft=vim:
diff --git a/.vimpcrc b/.vimpcrc
@@ -42,8 +42,10 @@ set windows library,playlist
"play 1
" Color the statusline and tabs
-highlight status blackbg
-highlight tab blackbg
+"highlight status blackbg
+"highlight tab blackbg
+highlight status default
+highlight tab default
" Case insensitive search
set ignorecase
diff --git a/.vimperatorrc b/.vimperatorrc
@@ -15,7 +15,7 @@ set hintchars=hjklasdfgyuiopqwertnmzxcvb
"set hintchars=hutenosa
" Define appearance of hints (CSS)
-highlight Hint font-size:100%;color:white;background-color:red;padding:2px;
+highlight Hint font-size:100%;color:black;background-color:yellow;padding:2px;
""" Default search engine
" Manage search engines with `:dialog searchengine`
diff --git a/.vimrc b/.vimrc
@@ -1,83 +1,106 @@
-set nocompatible " Disable vi-compatibility
filetype off
" terminal colors
-set t_Co=16
-"set t_Co=256
+"set t_Co=16
+set t_Co=256
-set rtp+=~/.vim/bundle/vundle " use Vundle plugin manager
-call vundle#rc()
+if has('vim_starting')
+ set nocompatible " Disable vi-compatibility
+ set runtimepath+=~/.vim/bundle/neobundle.vim/
+endif
+
+call neobundle#begin(expand('~/.vim/bundle/'))
-""" Vundle plugins
+""" NeoBundle plugins
" By default fom github.
-" Install and update with :BundleInstall(!), see :h vundle
+" Install and update with :NeoBundleInstall(!), see :h NeoBundle
-" let Vundle manage Vundle. Required!
-Bundle 'gmarik/vundle'
+" let NeoBundle manage Vundle. Required!
+NeoBundle 'Shougo/neobundle.vim'
" more functional statusline
-"Bundle 'Lokaltog/vim-powerline'
-Bundle 'bling/vim-airline'
-
-" successor to vim-powerline
-"Bundle 'Lokaltog/powerline'
+"NeoBundle 'Lokaltog/vim-powerline'
+"NeoBundle 'Lokaltog/powerline'
+NeoBundle 'bling/vim-airline'
" file system browser
-Bundle 'scrooloose/nerdtree'
+NeoBundle 'scrooloose/nerdtree'
" syntax checking plugin
-Bundle 'scrooloose/syntastic'
+NeoBundle 'scrooloose/syntastic'
" fuzzy file, buffer, and tag finder
-Bundle 'kien/ctrlp.vim'
+NeoBundle 'kien/ctrlp.vim'
-" solarized colorscheme
-Bundle 'altercation/vim-colors-solarized'
+" colorschemes
+NeoBundle 'altercation/vim-colors-solarized'
+NeoBundle 'chriskempson/vim-tomorrow-theme'
" modify surrounding characters in pairs
-Bundle 'tpope/vim-surround'
+NeoBundle 'tpope/vim-surround'
" git wrapper
-Bundle 'tpope/vim-fugitive'
+NeoBundle 'tpope/vim-fugitive'
" dispatch.vim for :Make
-Bundle 'tpope/vim-dispatch'
+NeoBundle 'tpope/vim-dispatch'
" browse buffers (vim.org/scripts), \be, \bs, \bv
-Bundle 'bufexplorer.zip'
+NeoBundle 'bufexplorer.zip'
" Vim-LaTeX suite
-Bundle 'git://git.code.sf.net/p/vim-latex/vim-latex'
+NeoBundle 'git://git.code.sf.net/p/vim-latex/vim-latex'
" Use <Tab> to autocomplete in insert mode
-Bundle 'ervandew/supertab'
+NeoBundle 'ervandew/supertab'
" Ack is a grep replacement. Debian pkg: ack-grep. Run from Vim:
" usage: :Ack [options] {pattern} [{directory}]
-"Bundle 'mileszs/ack.vim'
+"NeoBundle 'mileszs/ack.vim'
" Rainbow parantheses
-Bundle 'kien/rainbow_parentheses.vim'
+NeoBundle 'kien/rainbow_parentheses.vim'
" Calendar
-"Bundle 'itchyny/calendar.vim'
+"NeoBundle 'itchyny/calendar.vim'
"let g:calendar_google_calendar = 1
"let g:calendar_google_task = 1
" ctags list (:TlistOpen)
-Bundle 'taglist.vim'
+NeoBundle 'taglist.vim'
" vim-OrgMode
-Bundle 'jceb/vim-orgmode'
+NeoBundle 'jceb/vim-orgmode'
" increment dates and times with Ctrl-a and Ctrl-x
-Bundle 'tpope/vim-speeddating'
+NeoBundle 'tpope/vim-speeddating'
" support for Julia
-Bundle 'JuliaLang/julia-vim'
+NeoBundle 'JuliaLang/julia-vim'
+
+" SnipMate
+NeoBundle 'msanders/snipmate.vim'
+
+" vim motion on speed
+NeoBundle 'Lokaltog/vim-easymotion'
+
+" vimproc for asynchronous processes
+NeoBundle 'Shougo/vimproc.vim', {
+ \ 'build' : {
+ \ 'wimdows' : 'tools\\update-dll-mingw',
+ \ 'cygwin' : 'make -f make_cygwin.mak',
+ \ 'mac' : 'make -f make_mac.mak',
+ \ 'unix' : 'make -f make_unix.mak',
+ \ },
+ \ }
+
+call neobundle#end()
filetype plugin indent on
-filetype plugin on
+
+" If there are uninstalled bundles found on startup, this will prompt you to
+" install them
+NeoBundleCheck
" Enable syntax highligting
syntax on
@@ -86,9 +109,11 @@ syntax on
set background=dark " adjust colors for better contrast
"colorscheme desert
colorscheme solarized
-call togglebg#map("<F3>")
+"colorscheme Tomorrow-Night-Eighties
+"call togglebg#map("<F3>")
"let g:airline_theme = 'ubaryd'
let g:airline_theme = 'solarized'
+"let g:airline_theme = 'tomorrow'
" hilight column 80
set textwidth=80
@@ -135,20 +160,45 @@ else
let &t_EI = "\<Esc>]50;CursorShape=0\x7"
endif
-" vim-airline
-"let g:airline_symbols = {}
-"let g:airline_left_sep = '⮀'
-"let g:airline_left_alt_sep = '⮁'
-"let g:airline_right_sep = '⮂'
-"let g:airline_right_alt_sep = '⮃'
-"let g:airline_symbols.branch = '⭠'
-"let g:airline_symbols.readonly = '⭤'
-"let g:airline_symbols.linenr = '⭡'
+" vim-airline symbols
+if !exists('g:airline_symbols')
+ let g:airline_symbols = {}
+endif
+
+" unicode symbols
+"let g:airline_left_sep = '»'
+"let g:airline_left_sep = '▶'
+"let g:airline_right_sep = '«'
+"let g:airline_right_sep = '◀'
+"let g:airline_symbols.linenr = '␊'
+"let g:airline_symbols.linenr = ''
+"let g:airline_symbols.linenr = '¶'
+"let g:airline_symbols.branch = '⎇'
+"let g:airline_symbols.paste = 'ρ'
+"let g:airline_symbols.paste = 'Þ'
+"let g:airline_symbols.paste = '∥'
+"let g:airline_symbols.whitespace = 'Ξ'
+
+" powerline symbols
+let g:airline_left_sep = ''
+let g:airline_left_alt_sep = ''
+let g:airline_right_sep = ''
+let g:airline_right_alt_sep = ''
+let g:airline_symbols.branch = ''
+let g:airline_symbols.readonly = ''
+let g:airline_symbols.linenr = ''
" Powerline symbols, fancy needs a patched/edited font
-let g:Powerline_symbols = 'unicode'
+"let g:Powerline_symbols = 'unicode'
"let g:Powerline_symbols = 'fancy'
+" use airline decorations for tab line
+let g:airline#extensions#tabline#enabled = 1
+let g:airline#extensions#tabline#left_sep = ''
+let g:airline#extensions#tabline#left_alt_sep = ''
+let g:airline#extensions#tabline#tab_min_count = 2
+let g:airline#extensions#tabline#buffer_min_count = 2
+
" Rainbow parantheses always on
au VimEnter * RainbowParenthesesToggle
au Syntax * RainbowParenthesesLoadRound
@@ -182,7 +232,10 @@ nmap ZX :w<CR>
nmap <leader>r :source $MYVIMRC<CR>
" Shortcut to switch background color
-nmap <leader>b :ToggleBG<CR>
+nmap <leader>w :ToggleBG<CR>
+
+" Explore buffers
+nmap <leader>b :BufExplorer<CR>
" toggle spelling
nmap <leader>s :set spell!<CR>
@@ -199,6 +252,11 @@ nmap <leader>d :NERDTreeToggle<CR>
" Toggle TAB and EOL symbols
nmap <leader>l :set list!<CR>
+" vimproc
+nmap <leader>e :VimProcBang
+nmap <leader>E :VimProcRead
+nmap <leader>c :VimProcBang make -k
+
" Resize with <C-h>, <C-j>, <C-k> and <C-l>
map <C-h> <C-w>h
map <C-j> <C-w>j
diff --git a/.xinitrc b/.xinitrc
@@ -27,8 +27,8 @@ fi
# Keyboard layout
#setxkbmap dk
-#setxkbmap us -option ctrl:nocaps
-setxkbmap us
+setxkbmap us -option ctrl:nocaps
+#setxkbmap us
#setxkbmap dvorak -option ctrl:nocaps
# Set display color profile
@@ -64,15 +64,16 @@ dunst &
# Bluetooth applet
#blueman-applet &
-if [ "$HOSTNAME" = "iddqd" ]; then
- gnome-settings-daemon & # handles themes, starts gnome-screensaver. You may have to use gconf to disable it setting the background.
-fi
+#if [ "$HOSTNAME" == "iddqd" ]; then
+ #gnome-settings-daemon & # handles themes, starts gnome-screensaver. You may have to use gconf to disable it setting the background.
+#fi
#nm-applet & # assuming you're using Network Manager
#pidgin & # if you're using pidgin. You can really put any programs here.
#gnome-power-manager & # for laptops and stuff
#gnome-volume-manager & # for mounting CDs, USB sticks, and such
#eval `gnome-keyring-daemon --start --components=secrets` # possible components: gpg,pkcs11,secrets,ssh
-eval `gnome-keyring-daemon --start --components=gpg,pkcs11,secrets,ssh`
+eval $(/usr/bin/gnome-keyring-daemon --start --components=gpg,pkcs11,secrets,ssh)
+export GPG_AGENT_INFO SSH_AUTH_SOCK
# Enable tap-to-click on touchpad
synclient TapButton1=1 TapButton2=2 TapButton3=3
@@ -91,11 +92,13 @@ setxkbmap -option ctrl:nocaps
xbindkeys
# cloud clients
-owncloud &
+if [ "$HOSTNAME" = "iddqd" ]; then
+ owncloud &
+fi
+seafile-applet &
# Setup two monitors at iddqd
-if [ "$HOSTNAME" = "iddqd" ]
-then
+if [ "$HOSTNAME" = "iddqd" ]; then
xrandr --output DVI-D-0 --primary
xrandr --output DP-1 --auto --left-of DVI-D-0
@@ -110,7 +113,9 @@ fi
#/usr/bin/xscreensaver -no-splash &
# Typing breaks (optionally add +lock)
-xwrits breaktime=5:00 typetime=55:00 +clock +breakclock +mouse &
+#xwrits breaktime=5:00 typetime=55:00 +clock +breakclock +mouse &
+xset dpms 300 600 900
+
exec i3
#exec herbstluftwm --locked
diff --git a/.xprofile b/.xprofile
@@ -1,9 +1,4 @@
-#export LC_ALL="en_DK.UTF-8"
-#export LANG=en_DK.UTF-8
-export LANG=en_US.UTF-8
-export LC_ALL=
-export LC_COLLATE="en_US.UTF-8"
-export LC_CTYPE="en_US.UTF-8"
-
+#!/bin/sh
+[ -f $HOME/.locale ] && $HOME/.locale
#export TERMINAL=xterm
export TERMINAL=urxvt
diff --git a/.zshrc b/.zshrc
@@ -8,7 +8,7 @@ promptinit
colors
PROMPT="
-%{$fg[red]%} » %{$reset_color%}"
+%{$fg[red]%} » %{$reset_color%}"
RPROMPT="%B%{$fg[cyan]%}%~%{$reset_color%} %n@%m"
setopt AUTO_CD
@@ -39,6 +39,8 @@ fi
function lt() { ls -ltrsa "$@" | tail; }
function psgrep() { ps axuf | grep -v grep | grep "$@" -i --color=auto; }
function fname() { find . -iname "*$@*"; }
+function say() { echo "$@" | festival --tts; }
+function sayfile() { festival --tts $@; }
# Start tmux on shell login
#[[ -z "$TMUX" ]] && exec tmux
@@ -151,3 +153,7 @@ if [[ "$HOSTNAME" == "iddqd" ]]; then
fi
[ -f $HOME/code/julia/julia ] && export PATH=$HOME/code/julia:$PATH
+
+[ -f $HOME/.locale ] && $HOME/.locale
+
+source ~/.tmuxinator/tmuxinator.zsh
diff --git a/bin/keyboard-layout-switch.sh b/bin/keyboard-layout-switch.sh
@@ -8,14 +8,15 @@ LANG1="us"
LANG2="dk"
# make the caps lock key a ctrl key
-OPTS="-option ctrl:nocaps,altwin:swap_lalt_lwin"
+#OPTS="-option ctrl:nocaps,altwin:swap_lalt_lwin"
+OPTS="-option ctrl:nocaps"
# write the file if it doesn't exist
if [ ! -f $LAYOUTFILE ]; then
echo 'echo "us" > $LAYOUTFILE'
echo "us" > $LAYOUTFILE
- setxkbmap $LANG1
- xmodmap ~/.Xmodmap $OPTS
+ setxkbmap $LANG1 $OPTS
+ xmodmap ~/.Xmodmap
exit
fi
@@ -24,10 +25,10 @@ CURRLANG="`cat $LAYOUTFILE`"
if [ "$CURRLANG" == "$LANG1" ]; then
echo $LANG2 > $LAYOUTFILE
- setxkbmap $LANG2
- xmodmap ~/.Xmodmap $OPTS
+ setxkbmap $LANG2 $OPTS
+ xmodmap ~/.Xmodmap
else
echo $LANG1 > $LAYOUTFILE
- setxkbmap $LANG1
- xmodmap ~/.Xmodmap $OPTS
+ setxkbmap $LANG1 $OPTS
+ xmodmap ~/.Xmodmap
fi
diff --git a/bin/tmux-utility.sh b/bin/tmux-utility.sh
@@ -20,7 +20,7 @@ then
tmux split-window -v -p 75 -t $SESSION # create a pane below second pane
#tmux send-keys -t $SESSION 'irc.sh' C-m # process in fourth pane
#tmux send-keys -t $SESSION 'ncmpcpp' C-m # process in fourth pane
- tmux send-keys -t $SESSION 'mpd && vimpc' C-m # process in fourth pane
+ tmux send-keys -t $SESSION 'mpd; vimpc' C-m # process in fourth pane
tmux select-pane -t $SESSION:1.1 # select first pane
fi
tmux attach -t $SESSION
diff --git a/create_symlinks.sh b/create_symlinks.sh
@@ -1,7 +1,7 @@
#!/bin/bash
# Home folder dotfiles
-for F in .bashrc .vimrc .inputrc .tmux.conf .xpdfrc .signature .Xresources .Xmodmap .xinitrc .xprofile .zshrc .conkyrc .xbindkeysrc .gitconfig .vimperatorrc .vimpcrc .compton.conf; do
+for F in .bashrc .vimrc .inputrc .tmux.conf .xpdfrc .signature .Xresources .Xmodmap .xinitrc .xprofile .zshrc .conkyrc .xbindkeysrc .gitconfig .vimperatorrc .vimpcrc .compton.conf .locale; do
SOURCE=$PWD/$F
TARGET=~/$F
@@ -14,7 +14,7 @@ for F in .bashrc .vimrc .inputrc .tmux.conf .xpdfrc .signature .Xresources .Xmod
done
# Home folder dotfolders
-for F in .colors .config/uzbl .config/awesome .config/dwb .config/bspwm .config/sxhkd .config/luakit .config/openbox .config/zathura .i3 .mutt .ncmpcpp .vim .vimperrator .w3m wallpapers .emacs.d; do
+for F in .colors .config/uzbl .config/awesome .config/dwb .config/bspwm .config/sxhkd .config/luakit .config/openbox .config/zathura .tmuxinator .i3 .mutt .ncmpcpp .vim .vimperrator .w3m wallpapers .emacs.d; do
SOURCE=$PWD/$F
TARGET=~/$F
diff --git a/install.sh b/install.sh
@@ -12,8 +12,13 @@ git clone https://github.com/zsh-users/zsh-syntax-highlighting.git
git clone https://github.com/phallus/fonts ~/code/phallus-fonts &&
cd ~/code/phallus-fonts && ./install
+mkdir -p ~/.vim/bundle
+
# Install Vundle
-git clone https://github.com/gmarik/vundle.git ~/.vim/bundle/vundle
+#git clone https://github.com/gmarik/vundle.git ~/.vim/bundle/vundle
+
+# Install NeoBundle
+git clone https://github.com/Shougo/neobundle.vim ~/.vim/bundle/neobundle.vim
# Install font
cd /tmp &&\
