From 3e89506bd66776a4227f90a3ba1ffe07cc438a61 Mon Sep 17 00:00:00 2001
From: Tobias Schmidl <tobias@schmidl.cc>
Date: Wed, 27 Sep 2017 16:16:35 +0200
Subject: [PATCH] update

---
 Xresources  |  7 ++++---
 aliases.zsh |  4 ++++
 gitconfig   |  5 -----
 vimrc       | 14 +++++++++-----
 4 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/Xresources b/Xresources
index d2eb442..7ce4884 100644
--- a/Xresources
+++ b/Xresources
@@ -48,19 +48,20 @@ URxvt.boldFont:        xft:Hack-9:bold
 URxvt.italicfont:      xft:Hack-9:italic
 URxvt.bolditalicFont:  xft:Hack-9:bold:italic
 URxvt.letterSpace:     -2
-URxvt.perl-ext-common: default,matcher,bell-command
+URxvt.perl-ext-common: default,matcher
+!,bell-command
 ! this setting assumes that the current browser is set correctly via update-alternatives
 URxvt.url-launcher:    /usr/bin/x-www-browser
 URxvt.matcher.button:  1
 URxvt.urgentOnBell:    true
 URxvt.saveLines:       65535
-URxvt.bell-command:    notify-send "Bell rang" "The bell rang in URxvt"
+!URxvt.bell-command:    notify-send "Bell rang" "The bell rang in URxvt"
 ! URxvt.termName:        rxvt-256color
 URxvt.secondaryScroll: true
 URxvt.secondaryScreen: true
 
 ! URxvt with solarized colors
-URxvt.background: rgba:0000/2b00/3600/c000
+URxvt.background: rgba:0000/2b00/3600/f000
 URxvt.foreground: S_base0
 ! URxvt.fading:     40
 URxvt.fadeColor:  S_base03
diff --git a/aliases.zsh b/aliases.zsh
index 21195e7..f9be3c5 100644
--- a/aliases.zsh
+++ b/aliases.zsh
@@ -8,6 +8,10 @@ alias xzc='xz --best --extreme'
 alias halt='systemctl poweroff'
 alias reboot='systemctl reboot'
 
+alias extip='curl -LR1fs --compressed https://ipinfo.io/ | jq -Sc'
+
+alias jjar='java -jar'
+
 current_dist=`lsb_release -c -s`
 all_dkms_packages="`apt-cache rdepends --installed dkms | sed -rn 's/^ +([^ ]+)$/\1/p' | sort -iu`"
 
diff --git a/gitconfig b/gitconfig
index 5225938..8cba240 100644
--- a/gitconfig
+++ b/gitconfig
@@ -26,7 +26,6 @@
 
 [core]
 	preloadindex = 1
-	attributesfile = ~/.gitattributes
 
 [merge]
 	renormalize = true
@@ -34,7 +33,3 @@
 
 [pack]
 	threads = 0
-
-[filter "uncrustify_cpp"]
-	clean = /usr/bin/uncrustify -c /home/schtobia/.config/uncrustify/cpp.cfg -l cpp
-
diff --git a/vimrc b/vimrc
index 8f52df5..aae7bfe 100644
--- a/vimrc
+++ b/vimrc
@@ -1,21 +1,24 @@
 syntax enable
-let g:solarized_hitrail=1
-"let g:solarized_termcolors=256
-colorscheme solarized
 if has('gui_running')
     set background=light
+    set gfn=Hack\ Regular\ 9
 else
     set background=dark
 endif
+let g:solarized_hitrail=1
+"let g:solarized_termcolors=256
+colorscheme solarized
+call togglebg#map("<F5>")
 let load_doxygen_syntax = 1
-set autoindent
+"set autoindent
 set encoding=utf-8
 set icon
-set smartindent
+"set smartindent
 set smartcase
 set spelllang=de,en
 set softtabstop=4
 set tabstop=4
+set shiftwidth=4
 set nowrap
 set number
 set foldmethod=indent
@@ -24,3 +27,4 @@ set nofoldenable
 set modeline
 set listchars=eol:¶,tab:\»\ ,trail:~,extends:>,precedes:<
 set list
+filetype plugin indent on