Add additional files.

diff --git a/Xresources b/Xresources
new file mode 100644 (file)
index 0000000..b74ce78
--- /dev/null
+++ b/Xresources
@@ -0,0 +1,8 @@
+xterm*termName: xterm-256color
+XTerm*locale: true
+XTerm*metaSendsEscape: true
+*foreground: rgb:ff/ff/ff
+*background: rgb:00/00/00
+xterm*faceName: DejaVu Sans Mono for Powerline:size=12:antialias=true
+
+Xcursor.size: 30 

diff --git a/gitconfig b/gitconfig
new file mode 100644 (file)
index 0000000..c9dc715
--- /dev/null
+++ b/gitconfig
@@ -0,0 +1,25 @@
+[color]
+       ui = true
+       branch = always
+       status = always
+       interactive = always
+       diff = always
+[user]
+       name = Maximilian Friedersdorff
+       email = maxf130@gmail.com
+[core]
+       editor = vim
+       excludesfile = /home/max/.gitignore
+[merge]
+       tool = diffuse
+[push]
+       default = simple
+[alias]
+       lg = log --graph --pretty=format:'%Cred%h%Creset %ad %s %C(bold blue)<%an>%Creset %C(yellow)%d%Creset' --date=short
+       hist = log --graph --full-history --all --pretty=format:'%Cred%h%Creset %ad %s %C(bold blue)<%an>%Creset %C(yellow)%d%Creset' --date=short
+        struct = log --graph --full-history --all --pretty=format:'%ad %s %Creset %C(yellow)%d%Creset' --date=short --simplify-by-decoration
+       co = checkout
+       ci = commit
+       st = status
+       br = branch
+       df = diff

diff --git a/makelinks.sh b/makelinks.sh
index c63edcd3bba3f13677b24691eb9e775406663df0..ec9ab75af562067f9793310099b3024425d7ffb7 100755 (executable)
--- a/makelinks.sh
+++ b/makelinks.sh
@@ -8,7 +8,7 @@
 
 dir=~/etc/dotfiles                    
 olddir=~/etc/dotfiles.bak             
-files="vimrc bashrc xsession"
+files="vimrc bashrc xsession Xresources gitconfig zprofile zshenv zshrc xinitrc"
 
 ##########
 

diff --git a/xinitrc b/xinitrc
new file mode 100644 (file)
index 0000000..46c4191
--- /dev/null
+++ b/xinitrc
@@ -0,0 +1,33 @@
+#!/bin/sh
+#
+# ~/.xinitrc
+#
+# Executed by startx (run your window manager from here)
+
+
+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"
+
+
+
+
+# exec gnome-session
+# exec startkde
+# exec startxfce4
+# ...or the Window Manager of your choice
+#exec i3
+exec ck-launch-session dbus-launch --sh-syntax --exit-with-session qtile 

diff --git a/zprofile b/zprofile
new file mode 100644 (file)
index 0000000..9b46929
--- /dev/null
+++ b/zprofile
@@ -0,0 +1 @@
+export PATH="/home/max/bin:${PATH}"

diff --git a/zshenv b/zshenv
new file mode 100644 (file)
index 0000000..06a8fbd
--- /dev/null
+++ b/zshenv
@@ -0,0 +1,11 @@
+export NPM_PACKAGES="$HOME/.npm-packages"
+export EDITOR="/usr/bin/vim"
+export PAGER="/usr/bin/less"
+export PATH="/home/max/bin:$NPM_PACKAGES/bin:${PATH}"
+unset MANPATH
+MANPATH="$NPM_PACKAGES/share/man:$(manpath)"
+NODE_PATH="$NPM_PACKAGES/lib/node_modules:$NODE_PATH"
+
+alias emacs="emacs -nw"
+alias ls="ls --color=auto"
+alias la="ls -la"

diff --git a/zshrc b/zshrc
new file mode 100644 (file)
index 0000000..14b884f
--- /dev/null
+++ b/zshrc
@@ -0,0 +1,43 @@
+#!/bin/zsh
+
+# zsh config file
+
+# Completion
+autoload -U compinit
+compinit
+
+zstyle ':completion:*:descriptions' format '%U%B%d%b%u'
+zstyle ':completion:*:warnings' format '%BSorry, no matches for: %d%b'
+
+# Correction - zsh will correct mispelt commands
+setopt correctall
+
+# Prompt - Set prompt to gentoo
+autoload -U promptinit
+promptinit
+autoload -U colors && colors
+
+autoload -Uz vcs_info
+precmd () { vcs_info }
+setopt prompt_subst
+
+zstyle ':vcs_info:*' enable git
+zstyle ':vcs_info:*' formats "%s-[%b]"
+PROMPT="%F{green}%n@%m%k %B%F{blue}%3~ %# %b%f%k"
+RPROMPT="%B%F{blue} \${vcs_info_msg_0_} %(?..%F{red}<%?>)"
+
+# Command history
+export HISTSIZE=2000
+export HISTFILE="$HOME/.zsh_history"
+export SAVEHIST=$HISTSIZE
+bindkey "^[[A" history-search-backward
+bindkey "^[[B" history-search-forward
+
+setopt hist_ignore_all_dups
+setopt hist_ignore_space
+
+# Misc
+setopt autocd
+
+export PATH="$PATH:$HOME/.rvm/bin" # Add RVM to PATH for scripting
+[[ -s "$HOME/.rvm/scripts/rvm" ]] && source "$HOME/.rvm/scripts/rvm"