Weekly commit

7 files changed, 6 insertions, 107 deletions

diff --git a/colors b/colors
deleted file mode 100755
index ec6c9b4..0000000
--- a/colors
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/bash
-# Original: http://frexx.de/xterm-256-notes/
-#           http://frexx.de/xterm-256-notes/data/colortable16.sh
-# Modified by Aaron Griffin
-# and further by Kazuo Teramoto
-
-
-FGNAMES=(' black ' '  red  ' ' green ' ' yellow' '  blue ' 'magenta' '  cyan ' ' white ')
-BGNAMES=('DFT' 'BLK' 'RED' 'GRN' 'YEL' 'BLU' 'MAG' 'CYN' 'WHT')
-echo "     ----------------------------------------------------------------------------"
-for b in $(seq 0 8); do
-    if [ "$b" -gt 0 ]; then
-      bg=$(($b+39))
-    fi
-
-    echo -en "\033[0m ${BGNAMES[$b]} : "
-    for f in $(seq 0 7); do
-      echo -en "\033[${bg}m\033[$(($f+30))m ${FGNAMES[$f]} "
-    done
-    echo -en "\033[0m :"
-
-    echo -en "\033[0m\n\033[0m     : "
-    for f in $(seq 0 7); do
-      echo -en "\033[${bg}m\033[1;$(($f+30))m ${FGNAMES[$f]} "
-    done
-    echo -en "\033[0m :"
-	echo -e "\033[0m"
-    	
-  if [ "$b" -lt 8 ]; then
-    echo "     ----------------------------------------------------------------------------"
-  fi
-done
-echo "     ----------------------------------------------------------------------------"
-
diff --git a/gitconfig b/gitconfig
index 511dc9f..8aed15c 100644
--- a/gitconfig
+++ b/gitconfig
@@ -7,4 +7,4 @@
 [colors]
 	ui = auto
 [core]
-	editor = emacs
+	editor = vim
diff --git a/i3/config b/i3/config
deleted file mode 100644
index 5c7f3a9..0000000
--- a/i3/config
+++ /dev/null
@@ -1,60 +0,0 @@
-font -misc-fixed-medium-r-normal--13-*-*-*-*-*-*-*
-
-terminal /usr/bin/urxvt
-bind Mod1+36 exec /usr/bin/urxvt
-
-floating_modifier Mod1
-
-# Fullscreen, Stacked, Default
-bind Mod1+58 f
-bind Mod1+43 s
-bind Mod1+47 d
-
-# Focus (Mod1+j/k/l/;)
-bind Mod1+44 h
-bind Mod1+45 j
-bind Mod1+31 k
-bind Mod1+46 l
-
-# Move
-bind Mod1+Shift+44 mh
-bind Mod1+Shift+45 mj
-bind Mod1+Shift+31 mk
-bind Mod1+Shift+46 ml
-
-# Workspaces
-bind Mod1+10 1
-bind Mod1+11 2
-bind Mod1+12 3
-bind Mod1+13 4
-bind Mod1+14 5
-bind Mod1+15 6
-bind Mod1+16 7
-bind Mod1+17 8
-bind Mod1+18 9
-bind Mod1+19 10
-
-# Move to workspaces
-bind Mod1+Shift+10 m1
-bind Mod1+Shift+11 m2
-bind Mod1+Shift+12 m3
-bind Mod1+Shift+13 m4
-bind Mod1+Shift+14 m5
-bind Mod1+Shift+15 m6
-bind Mod1+Shift+16 m7
-bind Mod1+Shift+17 m8
-bind Mod1+Shift+18 m9
-bind Mod1+Shift+19 m10
-
-# Stuff
-bind Mod1+Shift+27 kill
-bind Mod1+33 exec /usr/bin/dmenu_run
-bind Mod1+Shift+33 exit
-bind Mod1+Shift+45 restart
-
-# Style
-bar.focused      #111111 #000000 #CCCCCC
-bar.unfocused    #111111 #000000 #111111
-client.focused   #111111 #000000 #CCCCCC
-client.unfocused #111111 #000000 #111111
-client.focused_inactive #111111 #000000 #111111
diff --git a/moc/mocconfig b/moc/mocconfig
index 29a6dc8..6dc7bb5 100644
--- a/moc/mocconfig
+++ b/moc/mocconfig
@@ -19,7 +19,7 @@ StartInMusicDir			= yes
 HideFileExtension		= yes
 ShowFormat			= yes
 ShowTime			= IfAvailable
-Theme				= moctheme
+Theme				= green_theme
 MOCDir				= ~/.moc
 UseMmap				= no
 SavePlaylist			= yes
diff --git a/newsbeuterconfig b/newsbeuterconfig
deleted file mode 100644
index f848bf0..0000000
--- a/newsbeuterconfig
+++ /dev/null
@@ -1,11 +0,0 @@
-browser firefox
-auto-reload yes
-reload-time 10
-cleanup-on-quit yes
-refresh-on-startup yes
-
-color background default default
-color listnormal white default
-color listfocus green red bold
-color info white blue bold
-color article white default
diff --git a/vim/vimrc b/vim/vimrc
index d52f77d..04186d0 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -11,6 +11,8 @@ set shiftround
 set modeline
 set nobackup
 set cursorline
+set listchars=tab:»·
+set list
 
 map <f9> :make<CR>
 map <f1> :execute 'NERDTreeToggle'<CR>
diff --git a/xmonad/xmonad-0.8.hs b/xmonad/xmonad-0.8.hs
index 1c3392d..f5926f1 100644
--- a/xmonad/xmonad-0.8.hs
+++ b/xmonad/xmonad-0.8.hs
@@ -41,6 +41,8 @@ myMouseBindings (XConfig {XMonad.modMask = modMask}) = M.fromList $
 
 myManageHook = composeAll
     [ className =? "MPlayer"        --> doFloat
+    , className =? "vlc"            --> doFloat
+    , className =? "psi"            --> doFloat
     , className =? "Gimp"           --> doFloat ]
 
 myFocusFollowsMouse :: Bool