commit 0f6cf5379c24693922200826fb1a7d6a4580f93d
parent 1cdb854a8d127664e7f37b3d011282a89701377f
Author: Antoine Amarilli <a3nm@a3nm.net>
Date: Fri, 4 Oct 2013 00:40:08 +0200
Merge branch 'master' of gitorious.org:myconfig/myconfig
Diffstat:
5 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/apt/minimal b/apt/minimal
@@ -12,7 +12,6 @@ tcpdump
lftp
ncdu
moreutils
-parallel
pmount
pv
p7zip-full
diff --git a/apt/server b/apt/server
@@ -10,7 +10,6 @@ python-matplotlib
python-pyglet
python-pyquery
python-statsmodels
-python-xkit
gcc
pbzip2
mtools
diff --git a/i3/config b/i3/config
@@ -23,9 +23,9 @@ floating_modifier $mod
focus_follows_mouse yes
# start a terminal
-bindsym $mod+Return exec "urxvtcd -e ~/scripts/my_ttyrec"
+bindsym $mod+Return exec "urxvtcd -e ~/bin/urxvt_startup"
bindsym $mod+b exec "firefox"
-bindsym $mod+o exec "urxvtcd -e mutt"
+bindsym $mod+o exec "urxvtcd -e my-mutt"
bindsym $mod+i exec "urxvtcd -e irssi"
# kill focused window
@@ -107,7 +107,7 @@ bindsym $mod+Shift+P restart
# exit i3 (logs you out of your X session)
bindsym $mod+Shift+greater exit
-bindsym $mod+x exec afk
+bindsym $mod+x exec ~/bin/afk
# resize window (you can also use the mouse for that)
mode "resize" {
@@ -143,5 +143,4 @@ bar {
#TODO default split ratio 2/3
#TODO default veritcal split is stacked
-exec ~/scripts/startup
-
+exec ~/bin/startup
diff --git a/install.sh b/install.sh
diff --git a/vim/vimrc b/vim/vimrc
@@ -1,4 +1,4 @@
-call pathogen#runtime_append_all_bundles()
+call pathogen#incubate()
call pathogen#helptags()
" personal stuff