Merge branch 'dev/stow'

diff --git a/Xresources b/X/.Xresources
similarity index 100%
rename from Xresources
rename to X/.Xresources

diff --git a/xinitrc b/X/.xinitrc
similarity index 100%
rename from xinitrc
rename to X/.xinitrc

diff --git a/bash_aliases b/bash/.bash_aliases
similarity index 100%
rename from bash_aliases
rename to bash/.bash_aliases

diff --git a/bash_profile b/bash/.bash_profile
similarity index 100%
rename from bash_profile
rename to bash/.bash_profile

diff --git a/bashrc b/bash/.bashrc
similarity index 100%
rename from bashrc
rename to bash/.bashrc

diff --git a/dir_colors b/bash/.dir_colors
similarity index 100%
rename from dir_colors
rename to bash/.dir_colors

diff --git a/inputrc b/bash/.inputrc
similarity index 100%
rename from inputrc
rename to bash/.inputrc

diff --git a/gitconfig b/git/.gitconfig
similarity index 100%
rename from gitconfig
rename to git/.gitconfig

diff --git a/gitignore b/git/.gitignore
similarity index 100%
rename from gitignore
rename to git/.gitignore

diff --git a/makelinks.sh b/makelinks.sh
deleted file mode 100755 (executable)
index 5f34e6f..0000000
--- a/makelinks.sh
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-############################
-# .make.sh
-# Create symlinks from the home directory to dotfiles in ~/etc/dotfiles
-############################
-
-########## Variables
-
-dir=~/etc/dotfiles                    
-olddir=~/etc/dotfiles.bak             
-files="octaverc vimrc bashrc bash_profile bash_aliases dir_colors Xresources gitconfig gitignore xinitrc inputrc"
-directories="mutt"
-
-##########
-
-# create dotfiles_old in homedir
-mkdir -p $olddir
-
-# change to the dotfiles directory
-cd $dir
-
-# move any existing dotfiles in homedir to dotfiles_old directory, 
-#then create symlinks from the homedir to any files in the 
-#~/dotfiles directory specified in $files
-for file in $files; do
-  mv ~/.$file $olddir/
-  ln -s $dir/$file ~/.$file
-done
-
-# For every directory execute the install file.
-for directory in $directories; do
-  mkdir -p ~/.$directory
-  source ./$directory/makelinks.sh
-done
-
-

diff --git a/mutt/account.com.friedersdorff.max b/mutt/.mutt/account.com.friedersdorff.max
similarity index 100%
rename from mutt/account.com.friedersdorff.max
rename to mutt/.mutt/account.com.friedersdorff.max

diff --git a/mutt/account.com.gmail.maxf130 b/mutt/.mutt/account.com.gmail.maxf130
similarity index 100%
rename from mutt/account.com.gmail.maxf130
rename to mutt/.mutt/account.com.gmail.maxf130

diff --git a/mutt/account.uk.ac.le.student.mf195 b/mutt/.mutt/account.uk.ac.le.student.mf195
similarity index 100%
rename from mutt/account.uk.ac.le.student.mf195
rename to mutt/.mutt/account.uk.ac.le.student.mf195

diff --git a/mutt/mailcap b/mutt/.mutt/mailcap
similarity index 100%
rename from mutt/mailcap
rename to mutt/.mutt/mailcap

diff --git a/mutt/muttrc b/mutt/.mutt/muttrc
similarity index 100%
rename from mutt/muttrc
rename to mutt/.mutt/muttrc

diff --git a/mutt/passwords.gpg b/mutt/.mutt/passwords.gpg
similarity index 100%
rename from mutt/passwords.gpg
rename to mutt/.mutt/passwords.gpg

diff --git a/mutt/solarized.muttrc b/mutt/.mutt/solarized.muttrc
similarity index 100%
rename from mutt/solarized.muttrc
rename to mutt/.mutt/solarized.muttrc

diff --git a/mutt/makelinks.sh b/mutt/makelinks.sh
deleted file mode 100755 (executable)
index 7616679..0000000
--- a/mutt/makelinks.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-dir=~/etc/dotfiles/mutt
-olddir=~/etc/dotfiles.bak/mutt
-target=~/.mutt
-files="account.com.friedersdorff.max account.com.gmail.maxf130 account.uk.ac.le.student.mf195 mailcap muttrc solarized.muttrc passwords.gpg"
-directories="com.friedersdorff.max com.gmail.maxf130.account uk.ac.le.student.mf195"
-
-mkdir -p $olddir
-
-cd $dir
-
-for file in $files; do
-  mv $target/$file $olddir/
-  ln -s $dir/$file $target/$file
-done
-
-for directory in $directories; do
-  mkdir -p $target/$directory
-  /bin/bash $dir/$directory/makelinks.sh
-done

diff --git a/octaverc b/octave/.octaverc
similarity index 100%
rename from octaverc
rename to octave/.octaverc

diff --git a/vimrc b/vim/.vimrc
similarity index 100%
rename from vimrc
rename to vim/.vimrc

diff --git a/vim_lite/.vimrc b/vim_lite/.vimrc
new file mode 100644 (file)
index 0000000..aec79e6
--- /dev/null
+++ b/vim_lite/.vimrc
@@ -0,0 +1,19 @@
+:let mapleader = "-"
+:let maplocalleader = "\\"
+
+set nocompatible              " be iMproved, required
+filetype off                  " required
+filetype plugin indent on    " required
+
+" Random look and feel stuff
+set t_Co=256
+syntax on
+set background=dark
+set expandtab
+set shiftwidth=2
+set softtabstop=2
+set number
+
+" Color 80th column
+highlight ColorColumn ctermbg=237
+set colorcolumn=80