summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Pritz <bluewind@xinu.at>2015-12-25 18:10:44 +0100
committerFlorian Pritz <bluewind@xinu.at>2015-12-25 18:10:44 +0100
commit19dd43f53c8cc1aa3bc3f11364736364e0f9686f (patch)
tree54759b50311080b192237a8c54b0f385ee6c0ad2
parent62faba9b5db29d4bc170fb7d278350786d55b76d (diff)
downloaddotfiles-19dd43f53c8cc1aa3bc3f11364736364e0f9686f.tar.gz
dotfiles-19dd43f53c8cc1aa3bc3f11364736364e0f9686f.tar.xz
misc
Signed-off-by: Florian Pritz <bluewind@xinu.at>
-rw-r--r--.Xdefaults4
-rw-r--r--.gitconfig6
-rw-r--r--.vimrc2
-rw-r--r--.zshrc8
4 files changed, 13 insertions, 7 deletions
diff --git a/.Xdefaults b/.Xdefaults
index e199f86..bcc0168 100644
--- a/.Xdefaults
+++ b/.Xdefaults
@@ -1,5 +1,5 @@
-URxvt*font: xft:DejaVu\ Sans\ Mono:size=10:antialias=true,xft:unifont
-URxvt*boldFont: xft:DejaVu\ Sans\ Mono:size=10:bold,xft:unifont
+URxvt*font: xft:DejaVu\ Sans\ Mono:size=10:antialias=true,xft:unifont,xft:Symbola
+URxvt*boldFont: xft:DejaVu\ Sans\ Mono:size=10:bold,xft:unifont,xft:Symbola
! xterm
xterm*faceName: DejaVu Sans Mono:pixelsize=12
diff --git a/.gitconfig b/.gitconfig
index 1680f55..8c9d9c0 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -52,3 +52,9 @@
decorate = full
[gc]
autopacklimit = 20
+[pager]
+ diff = /usr/share/git/diff-highlight/diff-highlight | less
+ log = /usr/share/git/diff-highlight/diff-highlight | less
+ show = /usr/share/git/diff-highlight/diff-highlight | less
+[grep]
+ lineNumber = true
diff --git a/.vimrc b/.vimrc
index 761758f..a403dc9 100644
--- a/.vimrc
+++ b/.vimrc
@@ -232,7 +232,7 @@ autocmd FileType python set ts=4 sw=4 softtabstop=4 et
" misc autocmd settings
autocmd FileType make setlocal noexpandtab
autocmd FileType text setlocal textwidth=78
-autocmd FileType plaintex setlocal textwidth=80
+autocmd FileType tex setlocal linebreak
autocmd BufRead,BufNewFile PKGBUILD let is_bash=1 | set ft=sh
" move to first line in git commits
diff --git a/.zshrc b/.zshrc
index 6007d1e..21c5307 100644
--- a/.zshrc
+++ b/.zshrc
@@ -402,7 +402,7 @@ setopt print_exit_value
# work saved ;)
setopt no_clobber
-#setopt inc_append_history
+setopt inc_append_history
setopt no_bg_nice
setopt share_history
#setopt bang_hist
@@ -483,8 +483,8 @@ alias scp='scp -o ControlPath=none'
alias mkdir='nocorrect mkdir'
alias wget='nocorrect noglob wget'
-alias p='pacman'
-alias sd='systemctl'
+alias p='COLUMNS=110 pacman'
+alias sd='systemctl --no-pager'
alias b='busybox'
alias su='su -'
@@ -502,7 +502,7 @@ alias vgfull='valgrind --leak-check=full --show-reachable=yes'
alias is="iostat -Nyxm 2"
-alias md='mysqldump -lc --skip-extended-insert'
+alias md='mysqldump --quick --create-options --disable-keys --add-locks --add-drop-table --lock-tables --complete-insert --skip-extended-insert'
# other random aliases
alias ☠='pkill -9'