From: Maximilian Friedersdorff <maxf130@gmail.com>
Date: Tue, 3 Nov 2015 13:50:00 +0000 (+0000)
Subject: Add vimrc, bashrc and xsessions.
X-Git-Url: https://git.friedersdorff.com/?a=commitdiff_plain;ds=sidebyside;h=f0faba15cb05b5a5b6269816bb42e736fac9bb4b;p=max%2Fdotfiles.git

Add vimrc, bashrc and xsessions.

These are the files available on my laptop at
the moment.
---

diff --git a/bashrc b/bashrc
new file mode 100644
index 0000000..a2a2cdd
--- /dev/null
+++ b/bashrc
@@ -0,0 +1,113 @@
+# ~/.bashrc: executed by bash(1) for non-login shells.
+# see /usr/share/doc/bash/examples/startup-files (in the package bash-doc)
+# for examples
+
+# If not running interactively, don't do anything
+case $- in
+    *i*) ;;
+      *) return;;
+esac
+
+# don't put duplicate lines or lines starting with space in the history.
+# See bash(1) for more options
+HISTCONTROL=ignoreboth
+
+# append to the history file, don't overwrite it
+shopt -s histappend
+
+# for setting history length see HISTSIZE and HISTFILESIZE in bash(1)
+HISTSIZE=1000
+HISTFILESIZE=2000
+
+# check the window size after each command and, if necessary,
+# update the values of LINES and COLUMNS.
+shopt -s checkwinsize
+
+# If set, the pattern "**" used in a pathname expansion context will
+# match all files and zero or more directories and subdirectories.
+#shopt -s globstar
+
+# make less more friendly for non-text input files, see lesspipe(1)
+#[ -x /usr/bin/lesspipe ] && eval "$(SHELL=/bin/sh lesspipe)"
+
+# set variable identifying the chroot you work in (used in the prompt below)
+if [ -z "${debian_chroot:-}" ] && [ -r /etc/debian_chroot ]; then
+    debian_chroot=$(cat /etc/debian_chroot)
+fi
+
+# set a fancy prompt (non-color, unless we know we "want" color)
+case "$TERM" in
+    xterm-color) color_prompt=yes;;
+esac
+
+# uncomment for a colored prompt, if the terminal has the capability; turned
+# off by default to not distract the user: the focus in a terminal window
+# should be on the output of commands, not on the prompt
+force_color_prompt=yes
+
+if [ -n "$force_color_prompt" ]; then
+    if [ -x /usr/bin/tput ] && tput setaf 1 >&/dev/null; then
+	# We have color support; assume it's compliant with Ecma-48
+	# (ISO/IEC-6429). (Lack of such support is extremely rare, and such
+	# a case would tend to support setf rather than setaf.)
+	color_prompt=yes
+    else
+	color_prompt=
+    fi
+fi
+
+if [ "$color_prompt" = yes ]; then
+    PS1='${debian_chroot:+($debian_chroot)}\[\033[01;32m\]\u@\h\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]\$ '
+else
+    PS1='${debian_chroot:+($debian_chroot)}\u@\h:\w\$ '
+fi
+unset color_prompt force_color_prompt
+
+# If this is an xterm set the title to user@host:dir
+case "$TERM" in
+xterm*|rxvt*)
+    PS1="\[\e]0;${debian_chroot:+($debian_chroot)}\u@\h: \w\a\]$PS1"
+    ;;
+*)
+    ;;
+esac
+
+# enable color support of ls and also add handy aliases
+if [ -x /usr/bin/dircolors ]; then
+    test -r ~/.dircolors && eval "$(dircolors -b ~/.dircolors)" || eval "$(dircolors -b)"
+    alias ls='ls --color=auto'
+    alias dir='dir --color=auto'
+    alias vdir='vdir --color=auto'
+
+    alias grep='grep --color=auto'
+    alias fgrep='fgrep --color=auto'
+    alias egrep='egrep --color=auto'
+fi
+
+# colored GCC warnings and errors
+export GCC_COLORS='error=01;31:warning=01;35:note=01;36:caret=01;32:locus=01:quote=01'
+
+# some more ls aliases
+#alias ll='ls -l'
+alias la='ls -lA'
+#alias l='ls -CF'
+
+# Alias definitions.
+# You may want to put all your additions into a separate file like
+# ~/.bash_aliases, instead of adding them here directly.
+# See /usr/share/doc/bash-doc/examples in the bash-doc package.
+
+if [ -f ~/.bash_aliases ]; then
+    . ~/.bash_aliases
+fi
+
+# enable programmable completion features (you don't need to enable
+# this, if it's already enabled in /etc/bash.bashrc and /etc/profile
+# sources /etc/bash.bashrc).
+if ! shopt -oq posix; then
+  if [ -f /usr/share/bash-completion/bash_completion ]; then
+    . /usr/share/bash-completion/bash_completion
+  elif [ -f /etc/bash_completion ]; then
+    . /etc/bash_completion
+  fi
+fi
diff --git a/makelinks.sh b/makelinks.sh
new file mode 100755
index 0000000..c63edcd
--- /dev/null
+++ b/makelinks.sh
@@ -0,0 +1,33 @@
+#!/bin/bash
+############################
+# .make.sh
+# Create symlinks from the home directory to dotfiles in ~/etc/dotfiles
+############################
+
+########## Variables
+
+dir=~/etc/dotfiles                    
+olddir=~/etc/dotfiles.bak             
+files="vimrc bashrc xsession"
+
+##########
+
+# create dotfiles_old in homedir
+echo -n "Creating $olddir for backup of any existing dotfiles in ~ ..."
+mkdir -p $olddir
+echo "done"
+
+# change to the dotfiles directory
+echo -n "Changing to the $dir directory ..."
+cd $dir
+echo "done"
+
+# 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
+    echo "Moving any existing dotfiles from ~ to $olddir"
+    mv ~/.$file $olddir/
+    echo "Creating symlink to $file in home directory."
+    ln -s $dir/$file ~/.$file
+done
diff --git a/vimrc b/vimrc
new file mode 100644
index 0000000..9e21ef3
--- /dev/null
+++ b/vimrc
@@ -0,0 +1,68 @@
+set nocompatible              " be iMproved, required
+filetype off                  " required
+
+" set the runtime path to include Vundle and initialize
+set rtp+=~/.vim/bundle/Vundle.vim
+call vundle#begin()
+" alternatively, pass a path where Vundle should install plugins
+" call vundle#begin('~/some/path/here')
+Plugin 'gmarik/Vundle.vim'
+Plugin 'jelera/vim-javascript-syntax' 
+Plugin 'zanloy/vim-colors-sunburst'
+Plugin 'Lokaltog/vim-distinguished'
+Plugin 'pangloss/vim-javascript'
+Plugin 'Yggdroot/indentLine'
+Plugin 'git@github.com:Raimondi/delimitMate.git'
+Plugin 'scrooloose/syntastic'
+Plugin 'Valloric/YouCompleteMe'
+Plugin 'marijnh/tern_for_vim'
+Plugin 'git@github.com:docunext/closetag.vim.git'
+Plugin 'bling/vim-airline'
+Plugin 'airblade/vim-gitgutter'
+Plugin 'tpope/vim-fugitive'
+Plugin 'kien/ctrlp.vim'
+Plugin 'editorconfig/editorconfig-vim'
+
+" All of your Plugins must be added before the following line
+call vundle#end()            " required
+filetype plugin indent on    " required
+
+" Random look and feel stuff
+set t_Co=256
+syntax on
+set background=dark
+colorscheme sunburst 
+set expandtab
+set shiftwidth=2
+set softtabstop=2
+set number
+
+let g:html_indent_inctags = "html,body,head,tbody"
+let g:indentLine_color_term = 200
+
+" syntastic
+set statusline+=%#warningmsg#
+set statusline+=%{SyntasticStatuslineFlag()}
+set statusline+=%*
+
+let g:syntastic_always_populate_loc_list = 1
+let g:syntastic_auto_loc_list = 2
+let g:syntastic_check_on_open = 0
+let g:syntastic_check_on_wq = 0
+let g:syntastic_javascript_checkers = ['eslint']
+
+set laststatus=2
+let g:airline_powerline_fonts = 1
+set timeoutlen=50
+let g:airline#extensions#tabline#enabled = 1
+let g:airline#extensions#tabline#fnamemod = ':t'
+
+" Setting wildignore
+set wildignore+=venv
+set wildignore+=.git,.hg.svn
+
+" CtrlP
+let g:ctrlp_working_path_mode = 'r'
+
+" Editorconfig
+let g:EditorConfig_exclude_patterns = ['fugitive://.*']
diff --git a/xsession b/xsession
new file mode 100644
index 0000000..a84af3b
--- /dev/null
+++ b/xsession
@@ -0,0 +1,20 @@
+if [ -d /etc/X11/xinit/xinitrc.d ]; then
+  for f in /etc/X11/xinit/xinitrc.d/*; do
+    [ -x "$f" ] && . "$f"
+  done
+  unset f
+fi
+
+
+# Load .Xresources
+[[ -f ~/.Xresources ]] && xrdb -merge ~/.Xresources
+
+# Set caps lock as control to avoid emacs pinky
+setxkbmap -option ctrl:nocaps
+
+# Set java font option
+export _JAVA_OPTIONS="-Dawt.useSystemAAFontSettings=on"
+
+feh --bg-scale ~/Pictures/background.jpg
+
+exec qtile