3 files changed, 16 insertions, 14 deletions

diff --git a/bash/.bashrc b/bash/.bashrc
index b2b81ab..3fe1503 100644
--- a/bash/.bashrc
+++ b/bash/.bashrc
@@ -6,7 +6,6 @@
 [[ $- != *i* ]] && return
 
 export PS1='[\d][\t]\u on \h\n\w => '
-export TERM="xterm-256color"
 
 export PATH="$PATH:$HOME/.local/bin"
 export PATH="$PATH:$HOME/.local/usr/bin"
@@ -40,16 +39,6 @@ exists() {
         hash $@ 2> /dev/null
 }
 
-vim() {
-        if [[ -z $@ ]]; then
-                $usr/bin/vim
-        elif [[ -d $@ ]]; then
-                dir=$(pwd)
-                cd $@ && $usr/bin/vim && cd $dir
-        else
-                $usr/bin/vim $@
-        fi
-}
 
 if exists mpv; then
         alias jblive='mpv rtmp://videocdn-us.geocdn.scaleengine.net/jblive/live/jblive.stream'
@@ -59,6 +48,16 @@ fi
 
 if exists vim; then
         export EDITOR="vim"
+        vim() {
+                if [[ -z $@ ]]; then
+                        $usr/bin/vim
+                elif [[ -d $@ ]]; then
+                        dir=$(pwd)
+                        cd $@ && $usr/bin/vim && cd $dir
+                else
+                        $usr/bin/vim $@
+                fi
+        }
 fi
 
 if exists go; then
diff --git a/vim/.vimrc b/vim/.vimrc
index 2e30251..081ccc7 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -43,3 +43,5 @@ noremap  <Left> ""
 noremap! <Left> <Esc>
 noremap  <Right> ""
 noremap! <Right> <Esc>
+
+" vim: set ts=8 sw=8 tw=78 noet :
diff --git a/xorg/.Xresources b/xorg/.Xresources
index dfc0343..c5cb6c7 100644
--- a/xorg/.Xresources
+++ b/xorg/.Xresources
@@ -1,8 +1,8 @@
 !*dpi: 145
 
 ! Font and Fontsize
-*faceName: Droid Sans Mono
-*faceSize: 11
+*faceName: Monospace
+*faceSize: 10
 
 !  Colors
 *background: #2d2d2d
@@ -36,9 +36,10 @@
 *color6: #3cb691
 *color14: #53b4bd
 
-!Whites
+! Whites
 *color7: #d9d9d9
 *color15: #f9f9f9
 
+XTerm*termName: xterm-256color
 XTerm*selectToClipboard: true
 XTerm*metaSendsEscape: true