From f217d2f0ff40c8836787cfc56475c9144f98923a Mon Sep 17 00:00:00 2001 From: Mart Lubbers Date: Mon, 25 Sep 2017 11:06:05 +0200 Subject: [PATCH 01/16] Volume migration to pulsaudio --- x/.config/i3/config | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/x/.config/i3/config b/x/.config/i3/config index 48c196c..0277172 100644 --- a/x/.config/i3/config +++ b/x/.config/i3/config @@ -50,9 +50,9 @@ bindsym $mod+s focus right # alternatively, you can use the cursor keys: bindsym XF86MonBrightnessUp exec xbacklight -inc 5 bindsym XF86MonBrightnessDown exec xbacklight -dec 5 -bindsym XF86AudioMute exec amixer -c 1 set Master toggle -bindsym XF86AudioLowerVolume exec amixer -c 1 set Master 5%- -bindsym XF86AudioRaiseVolume exec amixer -c 1 set Master 5%+ +bindsym XF86AudioMute exec pactl set-sink-mute @DEFAULT_SINK@ toggle +bindsym XF86AudioLowerVolume exec pactl set-sink-volume @DEFAULT_SINK@ -5% +bindsym XF86AudioRaiseVolume exec pactl set-sink-volume @DEFAULT_SINK@ +5% # move focused window bindsym $mod+Shift+h move left -- 2.20.1 From 4f86395e1e33a5df67315023b2a239a97d806807 Mon Sep 17 00:00:00 2001 From: Mart Lubbers Date: Mon, 16 Oct 2017 15:15:07 +0200 Subject: [PATCH 02/16] update email and shell --- email/.config/msmtp/config | 6 +++--- email/.config/offlineimap/config | 2 +- shell/.local/bin/update | 11 ++--------- 3 files changed, 6 insertions(+), 13 deletions(-) diff --git a/email/.config/msmtp/config b/email/.config/msmtp/config index b5de460..887ed28 100644 --- a/email/.config/msmtp/config +++ b/email/.config/msmtp/config @@ -3,11 +3,11 @@ host lubbers.email port 587 auth on tls on -tls_fingerprint 4C:C6:52:09:81:21:28:A7:B2:56:3E:EF:79:2A:49:C0:94:51:7F:1C:95:4F:77:63:15:70:0B:7D:54:D1:77:BB +tls_fingerprint 80:C8:64:F1:E4:E4:5F:4B:61:BF:DB:0D:52:D3:98:E2:03:E8:06:4B:6A:0B:4B:D2:FE:F5:79:7B:6C:85:43:A8 user mart@martlubbers.net passwordeval pass mail/mart@martlubbers.net -#proxy_host localhost -#proxy_port 8008 +proxy_host localhost +proxy_port 8008 from mart@martlubbers.net account ru diff --git a/email/.config/offlineimap/config b/email/.config/offlineimap/config index 0fd5652..4eb871c 100644 --- a/email/.config/offlineimap/config +++ b/email/.config/offlineimap/config @@ -8,7 +8,7 @@ ui = quiet localrepository = Local remoterepository = Remote postsynchook = notmuch new -#proxy = SOCKS5:localhost:8008 +proxy = SOCKS5:localhost:8008 [Repository Local] type = Maildir diff --git a/shell/.local/bin/update b/shell/.local/bin/update index b32ce61..06b7fb4 100755 --- a/shell/.local/bin/update +++ b/shell/.local/bin/update @@ -1,16 +1,9 @@ #!/bin/sh -DV=/etc/debian_version NUL='>/dev/null 2>&1' cmd() { - if [ -f $DV ] - then - echo -n 'apt-get update && apt-get dist-upgrade -y ' - [ `head -c 1 $DV` -ge 9 ] && echo -n '--' || -n '&& apt-get ' - echo -n 'autoremove --purge && apt-get clean && apt-get autoclean' - else - echo -n 'pacman -Syu && pacman -Qdtq | ifne xargs pacman -R' - fi + echo -n 'apt-get update && apt-get dist-upgrade -y && ' + echo -n 'apt-get autoremove --purge && apt-get clean && apt-get autoclean' } sudo sh -c "$(cmd)" -- 2.20.1 From 7111af2ac598add5a1eb22549dfe2badfceafd3f Mon Sep 17 00:00:00 2001 From: Mart Lubbers Date: Mon, 16 Oct 2017 15:15:35 +0200 Subject: [PATCH 03/16] update submodules --- vim/.vim/pack/plugins/start/syntastic | 2 +- vim/.vim/pack/plugins/start/vim-clean | 2 +- vim/.vim/pack/plugins/start/vimtex | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/vim/.vim/pack/plugins/start/syntastic b/vim/.vim/pack/plugins/start/syntastic index cf02b6e..08adf11 160000 --- a/vim/.vim/pack/plugins/start/syntastic +++ b/vim/.vim/pack/plugins/start/syntastic @@ -1 +1 @@ -Subproject commit cf02b6e29d2bfad9e11062df9eacf6886a4d2af7 +Subproject commit 08adf11e81baef2f504d766f8c5b7444b2ee5a6f diff --git a/vim/.vim/pack/plugins/start/vim-clean b/vim/.vim/pack/plugins/start/vim-clean index 43057db..b3e83a1 160000 --- a/vim/.vim/pack/plugins/start/vim-clean +++ b/vim/.vim/pack/plugins/start/vim-clean @@ -1 +1 @@ -Subproject commit 43057db146f8089fe1c3504ce03ff234ac1457e6 +Subproject commit b3e83a128455a2d2c899a61b8e5e6c575ecfc943 diff --git a/vim/.vim/pack/plugins/start/vimtex b/vim/.vim/pack/plugins/start/vimtex index 65dbbcf..8c6f46a 160000 --- a/vim/.vim/pack/plugins/start/vimtex +++ b/vim/.vim/pack/plugins/start/vimtex @@ -1 +1 @@ -Subproject commit 65dbbcf331fc1e0b9690412c7b99c0777e9c2485 +Subproject commit 8c6f46a8fc989729eee436fc3f192241802cacc4 -- 2.20.1 From 4ae597f2adadef003e4e2597849b5456509443d3 Mon Sep 17 00:00:00 2001 From: Mart Lubbers Date: Tue, 24 Oct 2017 18:38:39 +0200 Subject: [PATCH 04/16] up --- email/.config/offlineimap/config | 2 +- newsbeuter/.config/newsbeuter/urls | 1 + shell/.bashrc | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/email/.config/offlineimap/config b/email/.config/offlineimap/config index 4eb871c..0fd5652 100644 --- a/email/.config/offlineimap/config +++ b/email/.config/offlineimap/config @@ -8,7 +8,7 @@ ui = quiet localrepository = Local remoterepository = Remote postsynchook = notmuch new -proxy = SOCKS5:localhost:8008 +#proxy = SOCKS5:localhost:8008 [Repository Local] type = Maildir diff --git a/newsbeuter/.config/newsbeuter/urls b/newsbeuter/.config/newsbeuter/urls index fbae8de..9bfdcef 100644 --- a/newsbeuter/.config/newsbeuter/urls +++ b/newsbeuter/.config/newsbeuter/urls @@ -13,3 +13,4 @@ https://www.youtube.com/feeds/videos.xml?channel_id=UCc0kHafEIzm6PiqyrsC5lyg yt https://www.youtube.com/feeds/videos.xml?channel_id=UCyabCqc2M3J9HItEroLOTvA yt "Kmac2021" https://www.youtube.com/feeds/videos.xml?channel_id=UCVZlxkKqlvVqzRJXhAGq42Q yt "JoergSprave" https://www.youtube.com/feeds/videos.xml?channel_id=UC4btfgUBD9hxTNX2d1QydcQ yt "Last Gamer" +https://www.youtube.com/feeds/videos.xml?channel_id=UCJc3p1FsUXycsocQSQ2-_mg yt "dumpert" diff --git a/shell/.bashrc b/shell/.bashrc index d5e443b..03aef50 100644 --- a/shell/.bashrc +++ b/shell/.bashrc @@ -19,7 +19,7 @@ export CLEAN_HOME=/opt/clean export PATH=~/.local/bin:$PATH export PATH=$PATH:$CLEAN_HOME/lib/exe:$CLEAN_HOME/bin export PATH=$PATH:~/projects/esp-open-sdk/xtensa-lx106-elf/bin -export PATH=$PATH:/opt/texlive/bin/x86_64-linux:/opt/zotero +export PATH=$PATH:/opt/texlive/2017/bin/x86_64-linux:/opt/zotero export GTK_IM_MODULE=xim export QT_IM_MODULE=xim -- 2.20.1 From 4535aa1cfd970a8119d2fe5a962311fe558267da Mon Sep 17 00:00:00 2001 From: Mart Lubbers Date: Tue, 21 Nov 2017 08:23:37 +0100 Subject: [PATCH 05/16] update submodules --- vim/.vim/pack/plugins/start/syntastic | 2 +- vim/.vim/pack/plugins/start/vim-clean | 2 +- vim/.vim/pack/plugins/start/vim-gnupg | 2 +- vim/.vim/pack/plugins/start/vimtex | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/vim/.vim/pack/plugins/start/syntastic b/vim/.vim/pack/plugins/start/syntastic index 08adf11..96cc251 160000 --- a/vim/.vim/pack/plugins/start/syntastic +++ b/vim/.vim/pack/plugins/start/syntastic @@ -1 +1 @@ -Subproject commit 08adf11e81baef2f504d766f8c5b7444b2ee5a6f +Subproject commit 96cc251075f3f9d290c5afd4adf1b64c1542d469 diff --git a/vim/.vim/pack/plugins/start/vim-clean b/vim/.vim/pack/plugins/start/vim-clean index b3e83a1..ab14122 160000 --- a/vim/.vim/pack/plugins/start/vim-clean +++ b/vim/.vim/pack/plugins/start/vim-clean @@ -1 +1 @@ -Subproject commit b3e83a128455a2d2c899a61b8e5e6c575ecfc943 +Subproject commit ab141221b34dd3b9026ab7061b7d8d1dcfd8df64 diff --git a/vim/.vim/pack/plugins/start/vim-gnupg b/vim/.vim/pack/plugins/start/vim-gnupg index e7b6648..5b06978 160000 --- a/vim/.vim/pack/plugins/start/vim-gnupg +++ b/vim/.vim/pack/plugins/start/vim-gnupg @@ -1 +1 @@ -Subproject commit e7b6648ab2cbe88fe473eedb40b3eaf3cfec1a1e +Subproject commit 5b069789e237ca43533a229580822772640ce301 diff --git a/vim/.vim/pack/plugins/start/vimtex b/vim/.vim/pack/plugins/start/vimtex index 8c6f46a..edbf710 160000 --- a/vim/.vim/pack/plugins/start/vimtex +++ b/vim/.vim/pack/plugins/start/vimtex @@ -1 +1 @@ -Subproject commit 8c6f46a8fc989729eee436fc3f192241802cacc4 +Subproject commit edbf71069b3b0ff3d04bf78626ab6a8b6037e064 -- 2.20.1 From b32e821c4d49d807bb07b708bb99a8f8b16f285d Mon Sep 17 00:00:00 2001 From: Mart Lubbers Date: Sun, 3 Dec 2017 11:23:18 +0100 Subject: [PATCH 06/16] remove proxy, add transparency, add compton --- email/.config/msmtp/config | 6 +++--- email/.mutt/colors.muttrc | 2 +- pkgs.sh | 3 ++- shell/.bashrc | 5 ++++- vim/.vim/pack/plugins/start/vim-clean | 2 +- vim/.vim/pack/plugins/start/vimtex | 2 +- vim/.vimrc | 3 +++ x/.Xresources | 4 +++- x/.xinitrc | 2 ++ 9 files changed, 20 insertions(+), 9 deletions(-) diff --git a/email/.config/msmtp/config b/email/.config/msmtp/config index 887ed28..ebde36d 100644 --- a/email/.config/msmtp/config +++ b/email/.config/msmtp/config @@ -3,11 +3,11 @@ host lubbers.email port 587 auth on tls on -tls_fingerprint 80:C8:64:F1:E4:E4:5F:4B:61:BF:DB:0D:52:D3:98:E2:03:E8:06:4B:6A:0B:4B:D2:FE:F5:79:7B:6C:85:43:A8 +tls_fingerprint 04:89:EE:5E:B3:16:43:D7:48:4C:A3:4B:1A:16:68:3F:01:61:A4:E7:6A:4D:54:28:5A:E1:AD:88:62:65:3A:CD user mart@martlubbers.net passwordeval pass mail/mart@martlubbers.net -proxy_host localhost -proxy_port 8008 +#proxy_host localhost +#proxy_port 8008 from mart@martlubbers.net account ru diff --git a/email/.mutt/colors.muttrc b/email/.mutt/colors.muttrc index 99a2298..4da7645 100644 --- a/email/.mutt/colors.muttrc +++ b/email/.mutt/colors.muttrc @@ -1,4 +1,4 @@ -# sidebar +# regular color normal white default color attachment brightyellow default color hdrdefault cyan default diff --git a/pkgs.sh b/pkgs.sh index 0643d81..20888ae 100644 --- a/pkgs.sh +++ b/pkgs.sh @@ -26,4 +26,5 @@ sudo apt-get install \ w3m \ x11-xserver-utils \ xinit \ - xautolock + xautolock \ + compton diff --git a/shell/.bashrc b/shell/.bashrc index 03aef50..29d1747 100644 --- a/shell/.bashrc +++ b/shell/.bashrc @@ -19,11 +19,14 @@ export CLEAN_HOME=/opt/clean export PATH=~/.local/bin:$PATH export PATH=$PATH:$CLEAN_HOME/lib/exe:$CLEAN_HOME/bin export PATH=$PATH:~/projects/esp-open-sdk/xtensa-lx106-elf/bin -export PATH=$PATH:/opt/texlive/2017/bin/x86_64-linux:/opt/zotero +export PATH=$PATH:/opt/texlive/bin/x86_64-linux:/opt/zotero:/opt/firefox export GTK_IM_MODULE=xim export QT_IM_MODULE=xim +# transparency in some applications such as mutt +export COLORFGBG="default;default" + alias ls='ls --color=auto' alias grep='grep --color=auto' alias vi=vim diff --git a/vim/.vim/pack/plugins/start/vim-clean b/vim/.vim/pack/plugins/start/vim-clean index ab14122..74b9c00 160000 --- a/vim/.vim/pack/plugins/start/vim-clean +++ b/vim/.vim/pack/plugins/start/vim-clean @@ -1 +1 @@ -Subproject commit ab141221b34dd3b9026ab7061b7d8d1dcfd8df64 +Subproject commit 74b9c00a40a3e2b0a72b1887cbb59ee624084ec9 diff --git a/vim/.vim/pack/plugins/start/vimtex b/vim/.vim/pack/plugins/start/vimtex index edbf710..5d2dd46 160000 --- a/vim/.vim/pack/plugins/start/vimtex +++ b/vim/.vim/pack/plugins/start/vimtex @@ -1 +1 @@ -Subproject commit edbf71069b3b0ff3d04bf78626ab6a8b6037e064 +Subproject commit 5d2dd4664ea589eb9cf19c3c031af0ebd0c54b57 diff --git a/vim/.vimrc b/vim/.vimrc index 6740250..3e1569d 100644 --- a/vim/.vimrc +++ b/vim/.vimrc @@ -70,3 +70,6 @@ let g:syntastic_check_on_wq = 0 " Vimtex options let g:vimtex_compiler_enabled = 0 + +" Background transparency +hi Normal guibg=NONE ctermbg=NONE diff --git a/x/.Xresources b/x/.Xresources index 656f0ac..df96044 100644 --- a/x/.Xresources +++ b/x/.Xresources @@ -8,7 +8,9 @@ Xft.rgba: rgb Xft.dpi: 96 !Colors -Rxvt*background: rgb:00/00/00 +!URxvt*background: rgb:00/00/00 +URxvt*depth: 32 +URxvt*background: rgba:0000/0000/0200/c800 URxvt*foreground: rgb:cf/cf/cf URxvt*color0: rgb:00/00/00 URxvt*color1: rgb:e0/10/10 diff --git a/x/.xinitrc b/x/.xinitrc index f2daf31..bbd42d8 100755 --- a/x/.xinitrc +++ b/x/.xinitrc @@ -2,6 +2,8 @@ urxvtd -q -o -f & xautolock -locker ~/.local/bin/lock.sh & dunst & +compton -b +~/.fehbg eval "$(gpg-agent --daemon)" xrdb -merge ~/.Xresources -- 2.20.1 From 6dec7d72d5bbffd4459bc9e567cbdedb0672fc6b Mon Sep 17 00:00:00 2001 From: Mart Lubbers Date: Tue, 19 Dec 2017 08:37:10 +0100 Subject: [PATCH 07/16] update submodules --- vim/.vim/pack/plugins/start/syntastic | 2 +- vim/.vim/pack/plugins/start/vim-clean | 2 +- vim/.vim/pack/plugins/start/vim-gnupg | 2 +- vim/.vim/pack/plugins/start/vimtex | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/vim/.vim/pack/plugins/start/syntastic b/vim/.vim/pack/plugins/start/syntastic index 96cc251..4b93dff 160000 --- a/vim/.vim/pack/plugins/start/syntastic +++ b/vim/.vim/pack/plugins/start/syntastic @@ -1 +1 @@ -Subproject commit 96cc251075f3f9d290c5afd4adf1b64c1542d469 +Subproject commit 4b93dffbd98fd3885ee7c4fcedaa65cf5b72f56d diff --git a/vim/.vim/pack/plugins/start/vim-clean b/vim/.vim/pack/plugins/start/vim-clean index 74b9c00..e03f6f5 160000 --- a/vim/.vim/pack/plugins/start/vim-clean +++ b/vim/.vim/pack/plugins/start/vim-clean @@ -1 +1 @@ -Subproject commit 74b9c00a40a3e2b0a72b1887cbb59ee624084ec9 +Subproject commit e03f6f57d05b5708fde8a9b42ba90b1628034950 diff --git a/vim/.vim/pack/plugins/start/vim-gnupg b/vim/.vim/pack/plugins/start/vim-gnupg index 5b06978..b54fd4c 160000 --- a/vim/.vim/pack/plugins/start/vim-gnupg +++ b/vim/.vim/pack/plugins/start/vim-gnupg @@ -1 +1 @@ -Subproject commit 5b069789e237ca43533a229580822772640ce301 +Subproject commit b54fd4c18a45a27f2b9d9570f33dc2f93508733d diff --git a/vim/.vim/pack/plugins/start/vimtex b/vim/.vim/pack/plugins/start/vimtex index 5d2dd46..fe5b4a5 160000 --- a/vim/.vim/pack/plugins/start/vimtex +++ b/vim/.vim/pack/plugins/start/vimtex @@ -1 +1 @@ -Subproject commit 5d2dd4664ea589eb9cf19c3c031af0ebd0c54b57 +Subproject commit fe5b4a5b9606230c9cf843b65de4e94e0e63133a -- 2.20.1 From ec1f37d52d491d731b8b3463d8704102256a30ca Mon Sep 17 00:00:00 2001 From: Mart Lubbers Date: Fri, 12 Jan 2018 10:41:14 +0100 Subject: [PATCH 08/16] Some update --- email/.config/msmtp/config | 14 ++++++++------ email/.config/offlineimap/config | 2 +- email/.mutt/mailcap | 2 +- email/.mutt/muttrc | 3 ++- shell/.bashrc | 2 +- vim/.vim/after/ftplugin/clean.vim | 2 ++ vim/.vim/after/ftplugin/tex.vim | 9 +++++++++ vim/.vim/ftplugin/plaintex.vim | 1 + vim/.vim/ftplugin/tex.vim | 3 --- vim/.vim/pack/plugins/start/vimtex | 2 +- vim/.vimrc | 3 --- 11 files changed, 26 insertions(+), 17 deletions(-) create mode 100644 vim/.vim/after/ftplugin/clean.vim create mode 100644 vim/.vim/after/ftplugin/tex.vim create mode 100644 vim/.vim/ftplugin/plaintex.vim delete mode 100644 vim/.vim/ftplugin/tex.vim diff --git a/email/.config/msmtp/config b/email/.config/msmtp/config index 887ed28..1bd1a72 100644 --- a/email/.config/msmtp/config +++ b/email/.config/msmtp/config @@ -3,7 +3,7 @@ host lubbers.email port 587 auth on tls on -tls_fingerprint 80:C8:64:F1:E4:E4:5F:4B:61:BF:DB:0D:52:D3:98:E2:03:E8:06:4B:6A:0B:4B:D2:FE:F5:79:7B:6C:85:43:A8 +tls_fingerprint 04:89:EE:5E:B3:16:43:D7:48:4C:A3:4B:1A:16:68:3F:01:61:A4:E7:6A:4D:54:28:5A:E1:AD:88:62:65:3A:CD user mart@martlubbers.net passwordeval pass mail/mart@martlubbers.net proxy_host localhost @@ -11,11 +11,13 @@ proxy_port 8008 from mart@martlubbers.net account ru -host smtp-auth.ru.nl +host smtp.science.ru.nl port 587 auth on tls on -tls_fingerprint 51:BF:85:89:55:26:F6:73:4D:77:C7:0E:FA:B1:8E:A0:8C:64:BB:8D:21:B9:11:D6:3B:E1:AA:44:8C:DF:93:E0 -user s4109503 -passwordeval pass mail/mart.lubbers@student.ru.nl -from mart.lubbers@student.ru.nl +tls_fingerprint 1F:1D:F5:62:FC:9B:D4:BE:77:30:B1:F4:DB:24:49:F8:21:DD:6F:FC:08:1E:4A:78:0B:AC:C4:B4:FA:8E:A4:10 +user mlubbers +passwordeval pass science.ru.nl/mlubbers +from m.lubbers@cs.ru.nl +proxy_host localhost +proxy_port 8008 diff --git a/email/.config/offlineimap/config b/email/.config/offlineimap/config index 0fd5652..4eb871c 100644 --- a/email/.config/offlineimap/config +++ b/email/.config/offlineimap/config @@ -8,7 +8,7 @@ ui = quiet localrepository = Local remoterepository = Remote postsynchook = notmuch new -#proxy = SOCKS5:localhost:8008 +proxy = SOCKS5:localhost:8008 [Repository Local] type = Maildir diff --git a/email/.mutt/mailcap b/email/.mutt/mailcap index 8f502d4..e8892f5 100644 --- a/email/.mutt/mailcap +++ b/email/.mutt/mailcap @@ -1,5 +1,5 @@ # Fork off a process -application/pdf; gv %s; +application/pdf; evince %s; text/html; firefox -new-tab %s & sleep 5; # Open document formats diff --git a/email/.mutt/muttrc b/email/.mutt/muttrc index 701f965..44ab8af 100644 --- a/email/.mutt/muttrc +++ b/email/.mutt/muttrc @@ -16,7 +16,8 @@ set send_charset="us-ascii:utf-8" macro index,pager $ "offlineimap &" "Force refresh" macro attach B "firefox \"data:text/html;base64,$(base64 -w 0 <&0)\"" send2-hook "~f mart@martlubbers.net" "set sendmail=\"msmtp -C /home/mrl/.config/msmtp/config -a net\"" -send2-hook "~f mart.lubbers@student.ru.nl" "set sendmail=\"msmtp -C /home/mrl/.config/msmtp/config -a ru\"" +send2-hook "~f m.lubbers@cs.ru.nl" "set sendmail=\"msmtp -C /home/mrl/.config/msmtp/config -a ru\"" +send2-hook "~f m.lubbers@science.ru.nl" "set sendmail=\"msmtp -C /home/mrl/.config/msmtp/config -a ru\"" #folder-hook . push "~=$" diff --git a/shell/.bashrc b/shell/.bashrc index 03aef50..d5e443b 100644 --- a/shell/.bashrc +++ b/shell/.bashrc @@ -19,7 +19,7 @@ export CLEAN_HOME=/opt/clean export PATH=~/.local/bin:$PATH export PATH=$PATH:$CLEAN_HOME/lib/exe:$CLEAN_HOME/bin export PATH=$PATH:~/projects/esp-open-sdk/xtensa-lx106-elf/bin -export PATH=$PATH:/opt/texlive/2017/bin/x86_64-linux:/opt/zotero +export PATH=$PATH:/opt/texlive/bin/x86_64-linux:/opt/zotero export GTK_IM_MODULE=xim export QT_IM_MODULE=xim diff --git a/vim/.vim/after/ftplugin/clean.vim b/vim/.vim/after/ftplugin/clean.vim new file mode 100644 index 0000000..0f43883 --- /dev/null +++ b/vim/.vim/after/ftplugin/clean.vim @@ -0,0 +1,2 @@ +setlocal tags+=/opt/clean/lib/tags +set statusline+=%{cleanvim#tags#statusline()} diff --git a/vim/.vim/after/ftplugin/tex.vim b/vim/.vim/after/ftplugin/tex.vim new file mode 100644 index 0000000..978ea51 --- /dev/null +++ b/vim/.vim/after/ftplugin/tex.vim @@ -0,0 +1,9 @@ +setlocal wrap +setlocal tw=0 +setlocal colorcolumn=0 + +" Vimtex options +let g:vimtex_compiler_enabled = 0 +let g:vimtex_toc_enabled = 1 +let g:vimtex_toc_help = 0 +let g:vimtex_toc_refresh_always = 1 diff --git a/vim/.vim/ftplugin/plaintex.vim b/vim/.vim/ftplugin/plaintex.vim new file mode 100644 index 0000000..2aa1973 --- /dev/null +++ b/vim/.vim/ftplugin/plaintex.vim @@ -0,0 +1 @@ +set ft=tex diff --git a/vim/.vim/ftplugin/tex.vim b/vim/.vim/ftplugin/tex.vim deleted file mode 100644 index e4b82c2..0000000 --- a/vim/.vim/ftplugin/tex.vim +++ /dev/null @@ -1,3 +0,0 @@ -setlocal wrap -setlocal tw=0 -setlocal colorcolumn=0 diff --git a/vim/.vim/pack/plugins/start/vimtex b/vim/.vim/pack/plugins/start/vimtex index edbf710..995bbd7 160000 --- a/vim/.vim/pack/plugins/start/vimtex +++ b/vim/.vim/pack/plugins/start/vimtex @@ -1 +1 @@ -Subproject commit edbf71069b3b0ff3d04bf78626ab6a8b6037e064 +Subproject commit 995bbd729a6a42e92188859e0013b5476fc5ad01 diff --git a/vim/.vimrc b/vim/.vimrc index 6740250..794c49c 100644 --- a/vim/.vimrc +++ b/vim/.vimrc @@ -67,6 +67,3 @@ let g:syntastic_always_populate_loc_list = 1 let g:syntastic_auto_loc_list = 1 let g:syntastic_check_on_open = 0 let g:syntastic_check_on_wq = 0 - -" Vimtex options -let g:vimtex_compiler_enabled = 0 -- 2.20.1 From 3f0d4eb2103d6f5e39357aede0ed945d726d42ec Mon Sep 17 00:00:00 2001 From: Mart Lubbers Date: Fri, 16 Feb 2018 08:57:23 +0100 Subject: [PATCH 09/16] updates --- dirs.sh | 2 +- email/.config/msmtp/config | 2 +- newsbeuter/.config/newsbeuter/config | 1 + vim/.vim/pack/plugins/start/syntastic | 2 +- vim/.vim/pack/plugins/start/vim-clean | 2 +- vim/.vim/pack/plugins/start/vim-gnupg | 2 +- vim/.vim/pack/plugins/start/vimtex | 2 +- 7 files changed, 7 insertions(+), 6 deletions(-) create mode 100644 newsbeuter/.config/newsbeuter/config diff --git a/dirs.sh b/dirs.sh index 7dc6ca4..3139ed9 100644 --- a/dirs.sh +++ b/dirs.sh @@ -1,7 +1,7 @@ mkdir -pv ~/.config/{khal,khard,vdirsyncer,todoman,notmuch,msmtp,offlineimap,dunst,newsbeuter} mkdir -pv ~/.mutt mkdir -pv ~/.gnupg -mkdir -pv ~/.vim/{autoload,bundle,spell,pack/plugins/{opt,start}} +mkdir -pv ~/.vim/{after/ftplugin,autoload,bundle,spell,pack/plugins/{opt,start}} mkdir -pv ~/.{local/bin,config/{i3,i3status}} mkdir -pv ~/.{ncmpcpp,config/mpd} chmod 700 ~/.gnupg diff --git a/email/.config/msmtp/config b/email/.config/msmtp/config index 835767d..f172ead 100644 --- a/email/.config/msmtp/config +++ b/email/.config/msmtp/config @@ -3,7 +3,7 @@ host lubbers.email port 587 auth on tls on -tls_fingerprint 04:89:EE:5E:B3:16:43:D7:48:4C:A3:4B:1A:16:68:3F:01:61:A4:E7:6A:4D:54:28:5A:E1:AD:88:62:65:3A:CD +tls_fingerprint 3D:DB:21:1E:70:14:85:84:CF:73:08:20:AC:E6:8D:1C:65:B1:70:81:91:10:08:F3:42:6E:4C:52:5B:2A:67:ED user mart@martlubbers.net passwordeval pass mail/mart@martlubbers.net #proxy_host localhost diff --git a/newsbeuter/.config/newsbeuter/config b/newsbeuter/.config/newsbeuter/config new file mode 100644 index 0000000..fa5bda0 --- /dev/null +++ b/newsbeuter/.config/newsbeuter/config @@ -0,0 +1 @@ +auto-reload yes diff --git a/vim/.vim/pack/plugins/start/syntastic b/vim/.vim/pack/plugins/start/syntastic index 96cc251..608280c 160000 --- a/vim/.vim/pack/plugins/start/syntastic +++ b/vim/.vim/pack/plugins/start/syntastic @@ -1 +1 @@ -Subproject commit 96cc251075f3f9d290c5afd4adf1b64c1542d469 +Subproject commit 608280c9eeb8b717a5f6a19c6363fac6b8651216 diff --git a/vim/.vim/pack/plugins/start/vim-clean b/vim/.vim/pack/plugins/start/vim-clean index ab14122..5f1f0a8 160000 --- a/vim/.vim/pack/plugins/start/vim-clean +++ b/vim/.vim/pack/plugins/start/vim-clean @@ -1 +1 @@ -Subproject commit ab141221b34dd3b9026ab7061b7d8d1dcfd8df64 +Subproject commit 5f1f0a853b0a25cc3a01278ab863685941806f8e diff --git a/vim/.vim/pack/plugins/start/vim-gnupg b/vim/.vim/pack/plugins/start/vim-gnupg index 5b06978..fa3a630 160000 --- a/vim/.vim/pack/plugins/start/vim-gnupg +++ b/vim/.vim/pack/plugins/start/vim-gnupg @@ -1 +1 @@ -Subproject commit 5b069789e237ca43533a229580822772640ce301 +Subproject commit fa3a63039d1f96abeff07eaf28e1ad4697754e3c diff --git a/vim/.vim/pack/plugins/start/vimtex b/vim/.vim/pack/plugins/start/vimtex index 995bbd7..5b92b48 160000 --- a/vim/.vim/pack/plugins/start/vimtex +++ b/vim/.vim/pack/plugins/start/vimtex @@ -1 +1 @@ -Subproject commit 995bbd729a6a42e92188859e0013b5476fc5ad01 +Subproject commit 5b92b4856dcab5562e84948397d31deac27ea16b -- 2.20.1 From 0030c288b8d055c8158716a17f7ec53993e2eff5 Mon Sep 17 00:00:00 2001 From: Mart Lubbers Date: Tue, 27 Mar 2018 10:16:15 +0200 Subject: [PATCH 10/16] new tls fpr and vim spell --- email/.config/msmtp/config | 2 +- vim/.vim/spell/en.utf-8.add.spl | Bin 191 -> 210 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/email/.config/msmtp/config b/email/.config/msmtp/config index f172ead..4755b82 100644 --- a/email/.config/msmtp/config +++ b/email/.config/msmtp/config @@ -3,7 +3,7 @@ host lubbers.email port 587 auth on tls on -tls_fingerprint 3D:DB:21:1E:70:14:85:84:CF:73:08:20:AC:E6:8D:1C:65:B1:70:81:91:10:08:F3:42:6E:4C:52:5B:2A:67:ED +tls_fingerprint DD:C2:A4:24:E6:FA:6B:E3:B5:51:63:6B:F5:62:60:3B:3D:D4:A7:75:37:50:93:02:BA:FC:6A:D4:02:D1:A8:7E user mart@martlubbers.net passwordeval pass mail/mart@martlubbers.net #proxy_host localhost diff --git a/vim/.vim/spell/en.utf-8.add.spl b/vim/.vim/spell/en.utf-8.add.spl index f05f0a06ffcc431b6be1148c719aae0b7728f036..a69a5efedd2c8337833ed60224cde5b110af4f96 100644 GIT binary patch literal 210 zcmX9&!3_d242vTkjBs_(uRXy<>#!RMyV#W-{e8xORMg|7)RK_&M z9L7?{R3JZ@DH9}A3FH(rF)%SrtdJ9TEdufi7!w(bfH;pa1*jCHX5v~YZt-NG(GUOt DSN9jv -- 2.20.1 From 6cde5de091d9641a4fc470b79d2d3e528a2db157 Mon Sep 17 00:00:00 2001 From: Mart Lubbers Date: Tue, 27 Mar 2018 10:16:45 +0200 Subject: [PATCH 11/16] Update submodules --- vim/.vim/pack/plugins/start/syntastic | 2 +- vim/.vim/pack/plugins/start/vim-clean | 2 +- vim/.vim/pack/plugins/start/vimtex | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/vim/.vim/pack/plugins/start/syntastic b/vim/.vim/pack/plugins/start/syntastic index 608280c..b7b473b 160000 --- a/vim/.vim/pack/plugins/start/syntastic +++ b/vim/.vim/pack/plugins/start/syntastic @@ -1 +1 @@ -Subproject commit 608280c9eeb8b717a5f6a19c6363fac6b8651216 +Subproject commit b7b473b2688827dcd7d8c801197b8bfc31b20dc4 diff --git a/vim/.vim/pack/plugins/start/vim-clean b/vim/.vim/pack/plugins/start/vim-clean index 5f1f0a8..6dbc2c1 160000 --- a/vim/.vim/pack/plugins/start/vim-clean +++ b/vim/.vim/pack/plugins/start/vim-clean @@ -1 +1 @@ -Subproject commit 5f1f0a853b0a25cc3a01278ab863685941806f8e +Subproject commit 6dbc2c1f05d76374a609eed35d78a8a0d46dce00 diff --git a/vim/.vim/pack/plugins/start/vimtex b/vim/.vim/pack/plugins/start/vimtex index 5b92b48..17d8097 160000 --- a/vim/.vim/pack/plugins/start/vimtex +++ b/vim/.vim/pack/plugins/start/vimtex @@ -1 +1 @@ -Subproject commit 5b92b4856dcab5562e84948397d31deac27ea16b +Subproject commit 17d809706edcb277f1ee7fa5e33aff3619926fe4 -- 2.20.1 From a9ea8d5c8e5db7f4489facb3b7772a5444fe576e Mon Sep 17 00:00:00 2001 From: Mart Lubbers Date: Thu, 29 Mar 2018 10:44:47 +0200 Subject: [PATCH 12/16] Update vimtex --- vim/.vim/pack/plugins/start/vimtex | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vim/.vim/pack/plugins/start/vimtex b/vim/.vim/pack/plugins/start/vimtex index 17d8097..f42ceea 160000 --- a/vim/.vim/pack/plugins/start/vimtex +++ b/vim/.vim/pack/plugins/start/vimtex @@ -1 +1 @@ -Subproject commit 17d809706edcb277f1ee7fa5e33aff3619926fe4 +Subproject commit f42ceea9dd096bda560a6ca711a8abb7cd7b4413 -- 2.20.1 From 92b4da48579e56f47b7c7bdd10208ffc695a6883 Mon Sep 17 00:00:00 2001 From: Mart Lubbers Date: Sun, 15 Apr 2018 07:42:44 +0200 Subject: [PATCH 13/16] update email hash and spell --- email/.config/msmtp/config | 4 +--- email/.mutt/muttrc | 5 ++++- vim/.vim/spell/en.utf-8.add.spl | Bin 210 -> 204 bytes 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/email/.config/msmtp/config b/email/.config/msmtp/config index 4755b82..ee9d71f 100644 --- a/email/.config/msmtp/config +++ b/email/.config/msmtp/config @@ -18,6 +18,4 @@ tls on tls_fingerprint 1F:1D:F5:62:FC:9B:D4:BE:77:30:B1:F4:DB:24:49:F8:21:DD:6F:FC:08:1E:4A:78:0B:AC:C4:B4:FA:8E:A4:10 user mlubbers passwordeval pass science.ru.nl/mlubbers -from m.lubbers@cs.ru.nl -proxy_host localhost -proxy_port 8008 +from mart@cs.ru.nl diff --git a/email/.mutt/muttrc b/email/.mutt/muttrc index 44ab8af..b197c42 100644 --- a/email/.mutt/muttrc +++ b/email/.mutt/muttrc @@ -1,6 +1,8 @@ # Basic information set from="mart@martlubbers.net" -set use_from="yes +alternates "mart@(cs\.ru\.nl|mart@martlubbers\.net)" +set use_from=yes +set reverse_name=yes set envelope_from=yes set mbox_type=Maildir set folder=~/.mutt/mail @@ -18,6 +20,7 @@ macro attach B "firefox \"data:text/html;base64,$(base64 -w 0 <&0)\" send2-hook "~f mart@martlubbers.net" "set sendmail=\"msmtp -C /home/mrl/.config/msmtp/config -a net\"" send2-hook "~f m.lubbers@cs.ru.nl" "set sendmail=\"msmtp -C /home/mrl/.config/msmtp/config -a ru\"" send2-hook "~f m.lubbers@science.ru.nl" "set sendmail=\"msmtp -C /home/mrl/.config/msmtp/config -a ru\"" +send2-hook "~f mart@cs.ru.nl" "set sendmail=\"msmtp -C /home/mrl/.config/msmtp/config -a ru\"" #folder-hook . push "~=$" diff --git a/vim/.vim/spell/en.utf-8.add.spl b/vim/.vim/spell/en.utf-8.add.spl index a69a5efedd2c8337833ed60224cde5b110af4f96..52581d658b6a6db6f28a231c3ae0e6b93352bff4 100644 GIT binary patch literal 204 zcmXYrK@P$&3N5iW`1a^NLAm#zyrB=Kf;H|OK%Et?&_BJ$Z? z(=>Nqa6!TY8Ba_q4nbCH)CyjJ$ll>t(8e3NwywmF|JDjnP$mxm literal 210 zcmX9&!3_d242vTkjBs Date: Sun, 15 Apr 2018 07:52:50 +0200 Subject: [PATCH 14/16] started with tmux and st --- 20-keyboard.conf | 2 +- shell/.bashrc | 1 + shell/.config/tmux/config | 16 ++++++++++++++++ x/.config/i3/config | 2 +- x/.xinitrc | 3 --- 5 files changed, 19 insertions(+), 5 deletions(-) create mode 100644 shell/.config/tmux/config diff --git a/20-keyboard.conf b/20-keyboard.conf index 835dcb0..687d125 100644 --- a/20-keyboard.conf +++ b/20-keyboard.conf @@ -5,5 +5,5 @@ Section "InputClass" Option "XkbModel" "pc104" Option "XkbLayout" "dvorak,ru,us" Option "XkbVariant" ",phonetic_dvorak," - Option "XKbOptions" "compose:ralt,grp:menu_toggle,caps:super" + Option "XKbOptions" "compose:ralt,grp:menu_toggle,ctrl:swapcaps" EndSection diff --git a/shell/.bashrc b/shell/.bashrc index 29d1747..bce6795 100644 --- a/shell/.bashrc +++ b/shell/.bashrc @@ -30,6 +30,7 @@ export COLORFGBG="default;default" alias ls='ls --color=auto' alias grep='grep --color=auto' alias vi=vim +alias tmux='tmux -f ~/.config/tmux/config' set_prompt(){ last_c=$? diff --git a/shell/.config/tmux/config b/shell/.config/tmux/config new file mode 100644 index 0000000..f02f3a2 --- /dev/null +++ b/shell/.config/tmux/config @@ -0,0 +1,16 @@ +# prefix +unbind C-b +set-option -g prefix C-a +bind C-a send-prefix + +# hjkl pane traversal +bind h select-pane -L +bind j select-pane -D +bind k select-pane -U +bind l select-pane -R + +# i3 window splitting +unbind % +unbind " +bind v split-window -v +bind h split-window -h diff --git a/x/.config/i3/config b/x/.config/i3/config index 0277172..c6b06bb 100644 --- a/x/.config/i3/config +++ b/x/.config/i3/config @@ -30,7 +30,7 @@ floating_modifier $mod hide_edge_borders none # start a terminal -bindsym $mod+Return exec urxvtc +bindsym $mod+Return exec st # lock bindsym $mod+l exec xautolock -locknow diff --git a/x/.xinitrc b/x/.xinitrc index bbd42d8..dfabfa3 100755 --- a/x/.xinitrc +++ b/x/.xinitrc @@ -1,9 +1,6 @@ #!/bin/bash -urxvtd -q -o -f & xautolock -locker ~/.local/bin/lock.sh & dunst & -compton -b -~/.fehbg eval "$(gpg-agent --daemon)" xrdb -merge ~/.Xresources -- 2.20.1 From 3040d0ae9aefe3929082bfb0565e6de8910a7641 Mon Sep 17 00:00:00 2001 From: Mart Lubbers Date: Tue, 17 Apr 2018 07:42:44 +0200 Subject: [PATCH 15/16] tmux, async email --- email/.config/offlineimap/config | 4 ++++ email/.mutt/muttrc | 2 +- shell/.bashrc | 2 ++ shell/.config/tmux/config | 9 ++++++--- 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/email/.config/offlineimap/config b/email/.config/offlineimap/config index 0fd5652..1ccd752 100644 --- a/email/.config/offlineimap/config +++ b/email/.config/offlineimap/config @@ -7,6 +7,8 @@ ui = quiet [Account net] localrepository = Local remoterepository = Remote +autorefresh = 0.5 +quick = 10 postsynchook = notmuch new #proxy = SOCKS5:localhost:8008 @@ -22,6 +24,8 @@ remotehost = lubbers.email remoteuser = mart@martlubbers.net ssl = yes sslcacertfile = /etc/ssl/certs/ca-certificates.crt +keepalive = 60 +holdconnectionopen = yes [mbnames] enabled = yes diff --git a/email/.mutt/muttrc b/email/.mutt/muttrc index b197c42..5b4c18c 100644 --- a/email/.mutt/muttrc +++ b/email/.mutt/muttrc @@ -15,7 +15,7 @@ source ~/.mutt/mailboxes # Receiving, sending and searching set sendmail="/home/mrl/.mutt/checkattach.sh msmtp -C /home/mrl/.config/msmtp/config" set send_charset="us-ascii:utf-8" -macro index,pager $ "offlineimap &" "Force refresh" +macro index,pager $ "/home/mrl/.mutt/force_sync.sh" "Force refresh" macro attach B "firefox \"data:text/html;base64,$(base64 -w 0 <&0)\"" send2-hook "~f mart@martlubbers.net" "set sendmail=\"msmtp -C /home/mrl/.config/msmtp/config -a net\"" send2-hook "~f m.lubbers@cs.ru.nl" "set sendmail=\"msmtp -C /home/mrl/.config/msmtp/config -a ru\"" diff --git a/shell/.bashrc b/shell/.bashrc index bce6795..6e186aa 100644 --- a/shell/.bashrc +++ b/shell/.bashrc @@ -32,6 +32,8 @@ alias grep='grep --color=auto' alias vi=vim alias tmux='tmux -f ~/.config/tmux/config' +. /etc/bash_completion + set_prompt(){ last_c=$? PS1='\u@\h' diff --git a/shell/.config/tmux/config b/shell/.config/tmux/config index f02f3a2..7bf6ba8 100644 --- a/shell/.config/tmux/config +++ b/shell/.config/tmux/config @@ -11,6 +11,9 @@ bind l select-pane -R # i3 window splitting unbind % -unbind " -bind v split-window -v -bind h split-window -h +unbind '"' +bind V split-window -v +bind H split-window -h + +# Start not at index 0 but at one for windows +set -g base-index 1 -- 2.20.1 From 66cf3fcac342839c2cbcfb4726a3c8b02b1e3afb Mon Sep 17 00:00:00 2001 From: Mart Lubbers Date: Tue, 17 Apr 2018 07:46:35 +0200 Subject: [PATCH 16/16] add force_sync script --- email/.mutt/force_sync.sh | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100755 email/.mutt/force_sync.sh diff --git a/email/.mutt/force_sync.sh b/email/.mutt/force_sync.sh new file mode 100755 index 0000000..e08a3ac --- /dev/null +++ b/email/.mutt/force_sync.sh @@ -0,0 +1,7 @@ +#!/bin/sh +if pidof -x offlineimap +then + kill -10 "$(pidof -x offlineimap)" +else + offlineimap -u quiet -o +fi -- 2.20.1