From: Mart Lubbers Date: Tue, 11 Oct 2016 15:45:27 +0000 (+0200) Subject: com X-Git-Url: https://git.martlubbers.net/?a=commitdiff_plain;h=24f79ae54474da832222c3910a7ca9d4f9abe3ae;p=dotfiles.git com --- diff --git a/email/.mutt/muttrc b/email/.mutt/muttrc index 00dfdeb..1ab871e 100644 --- a/email/.mutt/muttrc +++ b/email/.mutt/muttrc @@ -66,7 +66,7 @@ set tilde set quote_regexp="^( {0,4}[>|:#%]| {0,4}[a-z0-9]+[>|]+)+" # Address book -set query_command= "khard email --search '%s'" +set query_command= "khard email --parsable '%s'" bind editor complete-query bind editor ^T complete macro index,pager A \ diff --git a/music/.config/mpd/mpd.conf b/music/.config/mpd/mpd.conf index 711acaf..85a4202 100644 --- a/music/.config/mpd/mpd.conf +++ b/music/.config/mpd/mpd.conf @@ -11,7 +11,7 @@ user "mrl" group "mrl" bind_to_address "any" -auto_update "yes" +#auto_update "yes" follow_outside_symlinks "yes" follow_inside_symlinks "yes" diff --git a/shell/.bashrc b/shell/.bashrc index b0f0fd4..962f332 100644 --- a/shell/.bashrc +++ b/shell/.bashrc @@ -10,7 +10,7 @@ export TERMINAL=urxvtc export EDITOR=vim export TERM=screen export BROWSER=firefox -export PAGER=more +export PAGER=less export SUDO_ASKPASS=/usr/lib/ssh/ssh-askpass export NOTMUCH_CONFIG=~/.config/notmuch/config diff --git a/x/.config/i3status/config b/x/.config/i3status/config index 3067d41..04d3a4a 100644 --- a/x/.config/i3status/config +++ b/x/.config/i3status/config @@ -4,6 +4,7 @@ general { } order += "wireless wlp2s0" +order += "ethernet enp5s0" order += "volume master" order += "disk /" order += "battery 0" @@ -24,6 +25,10 @@ wireless wlp2s0 { format_up = "W: (%quality at %essid) %ip" format_down = "W: down" } +ethernet enp5s0 { + format_up = "E: %ip" + format_down = "E: down" +} volume master { format = "♪: %volume" diff --git a/x/.local/bin/scr b/x/.local/bin/scr index dfe5edd..5197c21 100755 --- a/x/.local/bin/scr +++ b/x/.local/bin/scr @@ -3,4 +3,4 @@ URL="scr/$(date +%F_%H-%M-%S).png" import -window root $CROP png:- | \ ssh ygdrassil ssh martlubbers.net "cat \> public_html/$URL" -echo "https://martlubbers.net/$URL" | xclip -f | xargs -I{} notify-send {} +echo "http://martlubbers.net/$URL" | xclip -f | xargs -I{} notify-send {} diff --git a/x/.xinitrc b/x/.xinitrc index b757c66..90bcd2f 100755 --- a/x/.xinitrc +++ b/x/.xinitrc @@ -1,5 +1,6 @@ #!/bin/bash eval "$(gpg-agent --daemon)" +xrdb -merge ~/.Xresources exec i3