misc

Signed-off-by: Florian Pritz <bluewind@xinu.at>

4 files changed, 5 insertions, 5 deletions

diff --git a/.gitconfig b/.gitconfig
index 8c9d9c0..22b054f 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -22,6 +22,7 @@
 	ours   = "!f() { git checkout --ours $@ && git add $@; }; f"
 	theirs = "!f() { git checkout --theirs $@ && git add $@; }; f"
 	p = push --follow-tags
+	dw = diff --color-words
 [merge]
 	tool = vimdiff
 	conflictstyle = diff3
diff --git a/.vimrc b/.vimrc
index a403dc9..86c4ce4 100644
--- a/.vimrc
+++ b/.vimrc
@@ -252,6 +252,6 @@ autocmd Syntax * syn match ExtraWhitespace /\s\+$\| \+\ze\t/ containedin=ALL
 
 if has("gui_running")
   set guifont=Dejavu\ Sans\ Mono\ 10
-  set guioptions-=T
-  set lines=80 columns=125
+  set guioptions=aegi
+  set lines=80 columns=180
 endif
diff --git a/.xinitrc b/.xinitrc
index 7d0776d..bdd798f 100644
--- a/.xinitrc
+++ b/.xinitrc
@@ -7,7 +7,7 @@ export SDL_AUDIODRIVER=pulse
 export SSH_AUTH_SOCK=$HOME/.gnupg/S.gpg-agent.ssh
 
 [[ -f ~/.nvidia-settings-rc ]] && nvidia-settings -l
-xrandr --output DVI-D-0 --left-of DVI-I-1
+xrandr --output DP-4 --left-of DP-2
 
 # I don't like no background ;)
 dash $HOME/.bg &
diff --git a/.zshrc b/.zshrc
index 21c5307..529aaed 100644
--- a/.zshrc
+++ b/.zshrc
@@ -368,7 +368,7 @@ hless() {
 # History {{{
 HISTFILE=~/.zsh/histfile
 HISTSIZE=10000
-SAVEHIST=5000000
+SAVEHIST=10000000
 # }}}
 # Other ZSH options {{{
 autoload -U colors
@@ -679,7 +679,6 @@ if [[ -e $HOME/git/dotfiles/.zsh/zsh-syntax-highlighting-git/zsh-syntax-highligh
 	source $HOME/git/dotfiles/.zsh/zsh-syntax-highlighting-git/zsh-syntax-highlighting.zsh
 fi
 
-source $HOME/bin/gpg-agent.sh
 export SSH_AUTH_SOCK=$HOME/.gnupg/S.gpg-agent.ssh
 
 #if type keychain >/dev/null; then