diff options
| -rw-r--r-- | .gitconfig | 2 | ||||
| -rw-r--r-- | .xinitrc | 17 | ||||
| -rw-r--r-- | .zshrc | 7 |
3 files changed, 15 insertions, 11 deletions
@@ -19,6 +19,8 @@ mff = merge --ff-only refl = reflog --date=relative mnf = merge --no-ff + ours = "!f() { git checkout --ours $@ && git add $@; }; f" + theirs = "!f() { git checkout --theirs $@ && git add $@; }; f" [merge] tool = vimdiff conflictstyle = diff3 @@ -3,6 +3,7 @@ cd $HOME export VDPAU_NVIDIA_NO_OVERLAY=1 export SDL_AUDIODRIVER=pulseaudio +export SSH_AUTH_SOCK=$HOME/.gnupg/S.gpg-agent.ssh xrandr --output DVI-D-0 --left-of DVI-I-1 @@ -20,9 +21,9 @@ setxkbmap de nodeadkeys xkbcomp ~/.xkbmap $DISPLAY & xautolock -nowlocker $HOME/bin/screen-locker.sh -locker $HOME/bin/screen-locker.sh -time 10 & pulseaudio --start & -remote-notify-client.sh & +remote-notify-client.sh </dev/null & +# might need --glx-copy-from-front to reduce lag in urxvt compton -bfzCG --backend glx --vsync opengl-swc --paint-on-overlay -D2 #--glx-no-rebind-pixmap --glx-no-stencil --unredir-if-possible -#xflux -l 48.190 -g 15.62 -k 4200 redshift -l 48.190:15.62 -t 5700:4000 -m randr & autostart () { @@ -43,14 +44,14 @@ autostart () { # WM case "$1" in console) - openbox & - sleep 1 - urxvt & + openbox & + sleep 1 + urxvt & ;; *|openbox) - openbox & - sleep 1 - autostart & + openbox & + sleep 1 + autostart & ;; esac @@ -350,7 +350,7 @@ hless() { # History {{{ export HISTFILE=~/.zsh/histfile export HISTSIZE=10000 -export SAVEHIST=500000 +export SAVEHIST=5000000 # }}} # Other ZSH options {{{ autoload -U colors @@ -388,7 +388,7 @@ setopt inc_append_history setopt no_bg_nice setopt share_history #setopt bang_hist -setopt no_extended_history +setopt extended_history #setopt hist_reduce_blanks setopt hist_ignore_space setopt hist_find_no_dups @@ -431,7 +431,7 @@ alias lla='ls -la' alias lld='ls -ld' # well I got used to that name ;) -alias aurball='makepkg --source -f' +alias aurball='mkaurball -f' #alias sudo="sudo " #Sudo wont recognize aliases without this alias s='sudo ' @@ -654,6 +654,7 @@ if [[ -e $HOME/git/dotfiles/.zsh/zsh-syntax-highlighting-git/zsh-syntax-highligh fi source $HOME/bin/gpg-agent.sh +export SSH_AUTH_SOCK=$HOME/.gnupg/S.gpg-agent.ssh #if type keychain >/dev/null; then #eval $(keychain --eval -q) |