From: Mart Lubbers Date: Wed, 12 Apr 2017 08:36:29 +0000 (+0200) Subject: update bashrc X-Git-Url: https://git.martlubbers.net/?a=commitdiff_plain;h=39341226752423f724aee2520f93c46d5780c98a;p=dotfiles.git update bashrc --- diff --git a/.gitmodules b/.gitmodules index ecba614..b8d4866 100644 --- a/.gitmodules +++ b/.gitmodules @@ -18,4 +18,4 @@ url = https://github.com/dopefishh/vim-spl.git [submodule "vim/.vim/pack/plugins/start/vimperator.vim"] path = vim/.vim/pack/plugins/start/vimperator.vim - url = git@github.com:vimperator/vimperator.vim + url = https://github.com/vimperator/vimperator.vim diff --git a/cal/.config/vdirsyncer/config b/cal/.config/vdirsyncer/config index 4797b92..aaf9326 100644 --- a/cal/.config/vdirsyncer/config +++ b/cal/.config/vdirsyncer/config @@ -10,6 +10,7 @@ [general] # A folder where vdirsyncer can store some metadata about each pair. status_path = "~/.vdirsyncer/status/" +#default_command = "sync" # CARDDAV [pair contacts] diff --git a/pgp/.gnupg/gpg-agent.conf b/pgp/.gnupg/gpg-agent.conf index 7c2333f..c3e2eda 100644 --- a/pgp/.gnupg/gpg-agent.conf +++ b/pgp/.gnupg/gpg-agent.conf @@ -1,3 +1,3 @@ -pinentry-program /usr/bin/pinentry-qt4 +pinentry-program /usr/bin/pinentry-qt default-cache-ttl 3600 enable-ssh-support diff --git a/pkgs.sh b/pkgs.sh index b78e08a..50cc64d 100644 --- a/pkgs.sh +++ b/pkgs.sh @@ -2,7 +2,6 @@ sudo apt-get install \ bash-completion \ build-essential \ dunst \ - flashplugin-nonfree \ firefox-esr \ git \ gv \ @@ -23,7 +22,6 @@ sudo apt-get install \ suckless-tools \ unzip \ vim \ - virtualbox \ w3m \ x11-xserver-utils \ xinit \ diff --git a/shell/.bashrc b/shell/.bashrc index 73f61ae..da1cc97 100644 --- a/shell/.bashrc +++ b/shell/.bashrc @@ -16,7 +16,10 @@ export SUDO_ASKPASS=/usr/lib/ssh/ssh-askpass export NOTMUCH_CONFIG=~/.config/notmuch/config export CLEAN_HOME=/opt/clean -export PATH=~/.local/bin:$PATH:$CLEAN_HOME/lib/exe:$CLEAN_HOME/bin +export PATH=~/.local/bin:$PATH +export PATH=$PATH:$CLEAN_HOME/lib/exe:$CLEAN_HOME/bin +export PATH=$PATH:~/.local/texlive/2016/bin/x86_64-linux +export PATH=$PATH:~/projects/esp-open-sdk/xtensa-lx106-elf/bin export GTK_IM_MODULE=xim export QT_IM_MODULE=xim diff --git a/vim/.vim/pack/plugins/start/syntastic b/vim/.vim/pack/plugins/start/syntastic index 734fde7..5d9a0bc 160000 --- a/vim/.vim/pack/plugins/start/syntastic +++ b/vim/.vim/pack/plugins/start/syntastic @@ -1 +1 @@ -Subproject commit 734fde7f0b84ff3f670ab5772ed1b8b0c8c16770 +Subproject commit 5d9a0bc3877aea992292eeb6f318f4321fdef632 diff --git a/vim/.vim/pack/plugins/start/vim-clean b/vim/.vim/pack/plugins/start/vim-clean index 77ee6dd..3cedc48 160000 --- a/vim/.vim/pack/plugins/start/vim-clean +++ b/vim/.vim/pack/plugins/start/vim-clean @@ -1 +1 @@ -Subproject commit 77ee6dd09d76a75cecac4e01a348786c589e9aca +Subproject commit 3cedc48b1ef78666dc033b52ab31e21dbf47fc23 diff --git a/vim/.vim/pack/plugins/start/vim-gnupg b/vim/.vim/pack/plugins/start/vim-gnupg index 454090f..5103285 160000 --- a/vim/.vim/pack/plugins/start/vim-gnupg +++ b/vim/.vim/pack/plugins/start/vim-gnupg @@ -1 +1 @@ -Subproject commit 454090fe40bec3b62e6fd7faa91fd18750705bbb +Subproject commit 5103285d4d59cc9d2d56e6e897b8efbbb460b774 diff --git a/vim/.vim/pack/plugins/start/vim-linux-coding-style b/vim/.vim/pack/plugins/start/vim-linux-coding-style index 70f19ba..7da66c1 160000 --- a/vim/.vim/pack/plugins/start/vim-linux-coding-style +++ b/vim/.vim/pack/plugins/start/vim-linux-coding-style @@ -1 +1 @@ -Subproject commit 70f19ba894e1966e4ce836e66569623c89e9c0b9 +Subproject commit 7da66c1b34dc2976a70c9393c7e0c9f47e129e89 diff --git a/vim/.vim/pack/plugins/start/vim-praat b/vim/.vim/pack/plugins/start/vim-praat index 62116f7..99d318e 160000 --- a/vim/.vim/pack/plugins/start/vim-praat +++ b/vim/.vim/pack/plugins/start/vim-praat @@ -1 +1 @@ -Subproject commit 62116f73b3bb753e7e512c262dd4bc0928b53360 +Subproject commit 99d318ed8da0d398de6e9c7f28a4aed2152e34a0 diff --git a/vim/.vim/pack/plugins/start/vimperator.vim b/vim/.vim/pack/plugins/start/vimperator.vim index 15adb39..7223609 160000 --- a/vim/.vim/pack/plugins/start/vimperator.vim +++ b/vim/.vim/pack/plugins/start/vimperator.vim @@ -1 +1 @@ -Subproject commit 15adb395307f0d6ac99b445b42f631cc9184cbbf +Subproject commit 7223609e73ef2b2e50fd57e5ae729cae0283ef31 diff --git a/x/.Xresources b/x/.Xresources index 6496aad..9e70d6f 100644 --- a/x/.Xresources +++ b/x/.Xresources @@ -26,10 +26,10 @@ URxvt.color12: rgb:3a/53/f0 URxvt.color13: rgb:e6/28/ba URxvt.color14: rgb:1c/f5/f5 URxvt.color15: rgb:ff/ff/ff -URxvt.font: xft:DejaVu Sans Mono:style=Book:pixelsize=12 -URxvt.boldFont: xft:DejaVu Sans Mono:style=Bold:pixelsize=12 -URxvt.italicFont: xft:DejaVu Sans Mono:style=Oblique:pixelsize=12 -URxvt.boldItalicFont: xft:DejaVu Sans Mono:style=Bold Oblique:pixelsize=12 +URxvt.font: xft:DejaVu Sans Mono:style=Book:pixelsize=16 +URxvt.boldFont: xft:DejaVu Sans Mono:style=Bold:pixelsize=16 +URxvt.italicFont: xft:DejaVu Sans Mono:style=Oblique:pixelsize=16 +URxvt.boldItalicFont: xft:DejaVu Sans Mono:style=Bold Oblique:pixelsize=16 URxvt.urgentOnBell: 1 URxvt.visualBell: 1 URxvt.loginShell: 1 diff --git a/x/.config/i3status/config b/x/.config/i3status/config index 77fb7fe..4ac8370 100644 --- a/x/.config/i3status/config +++ b/x/.config/i3status/config @@ -3,7 +3,7 @@ general { interval = 3 } -order += "wireless wlan0" +order += "wireless wlp2s0" order += "ethernet eth0" #order += "keyboard" order += "volume master" @@ -22,7 +22,7 @@ battery 0 { low_threshold = 10 } -wireless wlan0 { +wireless wlp2s0 { format_up = "W: (%quality at %essid) %ip" format_down = "W: down" } @@ -34,7 +34,6 @@ ethernet eth0 { volume master { format = "♪: %volume" format_muted = "♪: muted (%volume)" - device = "hw:1" } tztime local {