From 6c2ea396e71f4d50ff4485573e8ed62ecc79ed5f Mon Sep 17 00:00:00 2001 From: Faerbit Date: Sat, 26 Mar 2016 00:12:07 +0100 Subject: [PATCH 01/12] Pushing tags automatically. --- gitconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/gitconfig b/gitconfig index 3b1a982..ebd349e 100644 --- a/gitconfig +++ b/gitconfig @@ -9,3 +9,4 @@ pager = less -F -X [push] default = simple + followTags = true From b7e17d4a2f2306efdc01d6be4616fd4e1c850485 Mon Sep 17 00:00:00 2001 From: Faerbit Date: Mon, 28 Mar 2016 22:38:21 +0200 Subject: [PATCH 02/12] Updating vim plugins. --- vimrc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/vimrc b/vimrc index 50801f2..8574d3a 100644 --- a/vimrc +++ b/vimrc @@ -19,7 +19,8 @@ if exists("*vundle#begin") Plugin 'honza/vim-snippets' Plugin 'alfredodeza/coveragepy.vim' Plugin 'tikhomirov/vim-glsl' - Plugin 'ntpeters/vim-better-whitespace' + Plugin 'chrisbra/vim-show-whitespace' + Plugin 'krisajenkins/vim-projectlocal' " All of your Plugins must be added before the following line call vundle#end() " required From 748fcd23985f26960288c348ac3dacd6f8b1964b Mon Sep 17 00:00:00 2001 From: Faerbit Date: Mon, 28 Mar 2016 22:48:32 +0200 Subject: [PATCH 03/12] Highlight chars after column 80 in vim. --- vimrc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/vimrc b/vimrc index 8574d3a..cb27b7a 100644 --- a/vimrc +++ b/vimrc @@ -72,3 +72,6 @@ au FileType python :imap "Map on Latex files au FileType tex :map :! if [ -f Makefile ]; then; make; else; pdflatex %:t; rm *.aux; rm *.log; fi + +"Highlight chars after column 80 +match ErrorMsg '\%>80v.\+' From 8e673ebd03477b1358d71c2fc47e0b000c94cfdf Mon Sep 17 00:00:00 2001 From: Faerbit Date: Mon, 4 Apr 2016 00:41:43 +0200 Subject: [PATCH 04/12] Changing battery alias. --- zshrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zshrc b/zshrc index 090a897..553f0aa 100644 --- a/zshrc +++ b/zshrc @@ -39,7 +39,7 @@ alias gdfs='git diff --staged' alias gad='git add' alias gcm='git commit' alias resource='source ~/.zshrc' -alias battery='upower -i /org/freedesktop/UPower/devices/battery_BAT0 | grep "time to empty"' +alias battery='upower -i /org/freedesktop/UPower/devices/battery_BAT0 | grep "time to"' alias poweroff='sudo poweroff' alias reboot='sudo reboot' alias n='ninja' From 2cc08fe63753b9f9be84c9575305100551fab419 Mon Sep 17 00:00:00 2001 From: Faerbit Date: Fri, 15 Apr 2016 10:27:12 +0200 Subject: [PATCH 05/12] Adding m alias. --- zshrc | 1 + 1 file changed, 1 insertion(+) diff --git a/zshrc b/zshrc index 6c834b6..e155753 100644 --- a/zshrc +++ b/zshrc @@ -44,6 +44,7 @@ alias battery='upower -i /org/freedesktop/UPower/devices/battery_BAT0 | grep "ti alias poweroff='sudo poweroff' alias reboot='sudo reboot' alias n='ninja' +alias m='make' alias cmake='cmake -G Ninja' alias wlan='sudo netctl-auto list' alias adb-connect='adb connect 192.168.1.138:5555' From 20fad4bfba1fbf475b2d7e0d778cf536832301bf Mon Sep 17 00:00:00 2001 From: Faerbit Date: Sat, 23 Apr 2016 14:51:07 +0200 Subject: [PATCH 06/12] Updating update-mirrors. --- zsh_functions | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/zsh_functions b/zsh_functions index 131c88f..ef42a17 100644 --- a/zsh_functions +++ b/zsh_functions @@ -106,7 +106,8 @@ update-mirrors() { then echo "Not supported on this architecture." else - sudo sh -c "reflector -p http -l 50 --sort rate | tee /etc/pacman.d/mirrorlist" + sudo sh -c "reflector -p http -l 50 --sort rate | tee /etc/pacman.d/mirrorlist_" + sudo sed -i 's/mirrorlist$/mirrorlist_/g' /etc/pacman.conf fi } From f65fd8327e772785c899525a2113df3f05042cf1 Mon Sep 17 00:00:00 2001 From: Faerbit Date: Mon, 9 May 2016 23:49:32 +0200 Subject: [PATCH 07/12] Adding clang format to vim. --- vimrc | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/vimrc b/vimrc index cb27b7a..f23f3dc 100644 --- a/vimrc +++ b/vimrc @@ -21,6 +21,8 @@ if exists("*vundle#begin") Plugin 'tikhomirov/vim-glsl' Plugin 'chrisbra/vim-show-whitespace' Plugin 'krisajenkins/vim-projectlocal' + Plugin 'xolox/vim-misc' + Plugin 'rhysd/vim-clang-format' " All of your Plugins must be added before the following line call vundle#end() " required @@ -75,3 +77,7 @@ au FileType tex :map :! if [ -f Makefile ]; then; make; else; pdflatex %:t; "Highlight chars after column 80 match ErrorMsg '\%>80v.\+' + +"Map ctrl+f to ClangFormat +:nnoremap :ClangFormat +:vnoremap :ClangFormat From a772e7f1f905fb784efd4a7e451cd1e7d823cca2 Mon Sep 17 00:00:00 2001 From: Faerbit Date: Tue, 17 May 2016 12:26:42 +0200 Subject: [PATCH 08/12] Force german language for sysupgrade. --- zsh_functions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zsh_functions b/zsh_functions index ef42a17..a2c0d14 100644 --- a/zsh_functions +++ b/zsh_functions @@ -4,7 +4,7 @@ twitch() { sysupgrade(){ old_kernel=$(pacman -Q linux-raspberrypi 2>/dev/null | awk '{print $2 }') - sudo pacmatic -Syu + LANG=de_DE.UTF-8 sudo pacmatic -Syu new_kernel=$(pacman -Q linux-raspberrypi 2>/dev/null | awk '{print $2 }') if [[ $old_kernel != $new_kernel && $(uname -m) == 'armv7l' ]] then From 9be7edaead53a2d10ecd09a0a9dca6e5819e8e64 Mon Sep 17 00:00:00 2001 From: Faerbit Date: Tue, 24 May 2016 15:05:22 +0200 Subject: [PATCH 09/12] Improving highlight of lines which are too long in vim. --- vimrc | 14 +++++++++++++- zshrc | 15 ++++++++------- 2 files changed, 21 insertions(+), 8 deletions(-) diff --git a/vimrc b/vimrc index f23f3dc..c113c83 100644 --- a/vimrc +++ b/vimrc @@ -76,7 +76,19 @@ au FileType python :imap au FileType tex :map :! if [ -f Makefile ]; then; make; else; pdflatex %:t; rm *.aux; rm *.log; fi "Highlight chars after column 80 -match ErrorMsg '\%>80v.\+' +let s:activatedh=0 +highlight OverLength ctermbg=darkred guibg=#ffd9d9 +function! ToggleH() + if s:activatedh == 0 + let s:activatedh = 1 + match OverLength '\%>80v.\+' + else + let s:activatedh = 0 + match none + endif +endfunction +nnoremap :call ToggleH() +call ToggleH() "Map ctrl+f to ClangFormat :nnoremap :ClangFormat diff --git a/zshrc b/zshrc index b18db3a..97f8474 100644 --- a/zshrc +++ b/zshrc @@ -48,12 +48,13 @@ alias m='make' alias cmake='cmake -G Ninja' alias wlan='sudo netctl-auto list' alias adb-connect='adb connect 192.168.1.138:5555' -if test -f "$(which nvim)" -then - alias v='nvim' -else - alias v='vim' -fi +#if test -f "$(which nvim)" +#then +# alias v='nvim' +#else +# alias v='vim' +#fi +alias v='vim' if [ -f .zsh_environment ] then source ~/.zsh_environment @@ -76,7 +77,7 @@ alias rbtv='livestreamer twitch.tv/rocketbeanstv &' alias taketv='livestreamer twitch.tv/taketv &' alias ls='ls --color=auto' export ASPROOT=~/.asp -export PATH=$PATH:/home/fab/bin:/home/fab/.gem/ruby/2.3.0/bin +export PATH=$PATH:/home/fab/bin:/home/fab/.gem/ruby/2.3.0/bin:~/.local/bin export LFS=/mnt/lfs #vi mode From ac6c4c87af2bcff94971325f999f0f4a8f9afc70 Mon Sep 17 00:00:00 2001 From: Faerbit Date: Thu, 26 May 2016 20:09:11 +0200 Subject: [PATCH 10/12] Reenabling neovim. --- zshrc | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/zshrc b/zshrc index 97f8474..940aa58 100644 --- a/zshrc +++ b/zshrc @@ -48,13 +48,12 @@ alias m='make' alias cmake='cmake -G Ninja' alias wlan='sudo netctl-auto list' alias adb-connect='adb connect 192.168.1.138:5555' -#if test -f "$(which nvim)" -#then -# alias v='nvim' -#else -# alias v='vim' -#fi -alias v='vim' +if test -f "$(which nvim)" +then + alias v='nvim' +else + alias v='vim' +fi if [ -f .zsh_environment ] then source ~/.zsh_environment From ef9854500344ff41d09baf5824fdb98d868ce2ac Mon Sep 17 00:00:00 2001 From: Faerbit Date: Thu, 26 May 2016 22:35:05 +0200 Subject: [PATCH 11/12] Deactivating neovim once again. --- zshrc | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/zshrc b/zshrc index 940aa58..97f8474 100644 --- a/zshrc +++ b/zshrc @@ -48,12 +48,13 @@ alias m='make' alias cmake='cmake -G Ninja' alias wlan='sudo netctl-auto list' alias adb-connect='adb connect 192.168.1.138:5555' -if test -f "$(which nvim)" -then - alias v='nvim' -else - alias v='vim' -fi +#if test -f "$(which nvim)" +#then +# alias v='nvim' +#else +# alias v='vim' +#fi +alias v='vim' if [ -f .zsh_environment ] then source ~/.zsh_environment From ca8f32bdcac63df914faf81b04545d6d4e8f97fd Mon Sep 17 00:00:00 2001 From: Faerbit Date: Mon, 30 May 2016 13:36:23 +0200 Subject: [PATCH 12/12] Removing language setting for pacman in sysupgrade. --- zsh_functions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zsh_functions b/zsh_functions index a2c0d14..ef42a17 100644 --- a/zsh_functions +++ b/zsh_functions @@ -4,7 +4,7 @@ twitch() { sysupgrade(){ old_kernel=$(pacman -Q linux-raspberrypi 2>/dev/null | awk '{print $2 }') - LANG=de_DE.UTF-8 sudo pacmatic -Syu + sudo pacmatic -Syu new_kernel=$(pacman -Q linux-raspberrypi 2>/dev/null | awk '{print $2 }') if [[ $old_kernel != $new_kernel && $(uname -m) == 'armv7l' ]] then