commit 178aa7f83574ed29c2d4c6221ef9ba5931029646 parent 097bb441357dc78bf2bfe02ca7416dda235f98e8 Author: Anders Damsgaard Christensen <adc@geo.au.dk> Date: Wed, 4 Jan 2017 12:35:37 -0800 Merge branch 'master' of github.com:anders-dc/dotfiles Diffstat:
| M | .i3/config | | | 8 | ++++---- |
| M | .weechat/sec.conf | | | 24 | ++++++++++++------------ |
| M | bin/i3status-mpc.sh | | | 5 | +++-- |
3 files changed, 19 insertions(+), 18 deletions(-)
diff --git a/.i3/config b/.i3/config @@ -111,10 +111,10 @@ bindsym XF86KbdBrightnessDown exec --no-startup-id /home/ad/bin/kbd_backlight.sh bindsym XF86KbdBrightnessUp exec --no-startup-id /home/ad/bin/kbd_backlight.sh up # mpd control -bindsym $mod+Shift+p exec --no-startup-id mpc toggle && killall -SIGUSR1 i3status -bindsym $mod+Shift+n exec --no-startup-id mpc next && killall -SIGUSR1 i3status -bindsym $mod+Shift+b exec --no-startup-id mpc prev && killall -SIGUSR1 i3status -bindsym $mod+Shift+s exec --no-startup-id mpc stop && killall -SIGUSR1 i3status +bindsym $mod+Shift+p exec --no-startup-id mpc -h bigquake.ucsd.edu toggle && killall -SIGUSR1 i3status +bindsym $mod+Shift+n exec --no-startup-id mpc -h bigquake.ucsd.edu next && killall -SIGUSR1 i3status +bindsym $mod+Shift+b exec --no-startup-id mpc -h bigquake.ucsd.edu prev && killall -SIGUSR1 i3status +bindsym $mod+Shift+s exec --no-startup-id mpc -h bigquake.ucsd.edu stop && killall -SIGUSR1 i3status # Light X colors #bindsym $mod+Shift+w exec --no-startup-id /home/ad/bin/solarized-light.sh diff --git a/.weechat/sec.conf b/.weechat/sec.conf @@ -10,15 +10,15 @@ salt = on [data] __passphrase__ = on -freenode_username = "CB6DBE2FFFB98CA509ADE8E276061726326E5CE71FFF105F8DDB784EBE76B7CA0A91DAEE25144C6C00569F9E" -gitterpass = "E9F86748D89439984831EC29E2891E5AC55EFFDE51A4EC2B60409AB672A60C2587FD09A5C949CDA4980BEFF242E249135AA63DB9CDB9BB6F406E0569349017087A2A9CAFE2F2FB7CCAF07E46B1CEE12DB7" -takuglacierpass = "5A17E14CF13084D0A166A800271E748A810128EC6487CEEC67C6DCB749FEACB92A858920F31266616BF7E20072EBC7E7E4749C0FF80DD3A88B78C5EFBAE06FD739C0B4CF75D6F93DE5" -pushapikey = "DE2DBD0D67B3780288EDC957BF6B3E895B8C3B00D324A8D8C5BBBCA23E8B862060A5993A1DAA94220152D545207EEBDD9FF23F47D3953C496BFAC3E8B36B554EE70E3CADA92704" -slack-sigma-stanford_password = "AC1A82B263D4FD2EB62C1666C64D517DC4C2E24F41CEAF96496497A696D024231DD1760B4BC202D72F889FF95C7D4474D98AB7F885F84DC27319EDFD314277410151A12A04C82A218494496F" -pushoverkey = "3ED5C19E83328C8CD0C54AAA6D00ECA9310A5E7632CA717F5B5C5F518B03F99DD041462D7AF90840C3FC6E339309FFD31E4ACC84509C03FB9173D87FBC40B84F2C7475EF1E63EC" -bitlbee_password = "1ED583003FB59A59FC015B093B5DC4226688A1E02CDD0B4B7027AB796870144E57CA378FB795EF898BA22B242DB01C70BF5121AE4AFDE5860B1A2D6AC8C3" -pushuserkey = "D7BA57B547BA6B689AF5897E5F249F4BFEB3A8AFCF898811192ABFEBFF3EABE9F42EB51C818E9975B063A5B17AC818A9CBE74D54062696B86BAFD575571DB7E1F3B8D8BEBF298B" -freenode_password = "159571C28ADD7CB8B5EEDBC38AEA6447527B2DEEC9D5953ED15381DBDE714E6F3785F3EDC82B4A3A466E0DEB222F9EAF5DAAF9390AB4DBEF0721394772512E" -slack-taku_username = "46B3D49AD81B3FA915B0B46AC13D4BB1691859D79C1C80533A4775F60E34D0C9DF7B194096438DA2BF29EC72E739FAF0E0C18D5D096293029B" -slack-sigma-stanford_username = "E6E39D52B23664833DCC736F96F3781A90B21B625A7434E74AAC927B6354FE663BD8DC2554A8F33D53BD47B7DB9C248CAEE807E555B4E9977C" -slack-taku_password = "550B73D3525348F43C0460F1A4E6A2A85079A09859DB1D3F96C300383D227EDFA9F35072C8D2ABC380EA6E33E423A64AF9CEF5D4665A9E3631871A607BAADC3A6548125FDD90E32A78" +freenode_username = "2058E11776CCD8A899FE58894F6B1646B0C3C550B54B067C31D63F3E13EFC6A15FFCA7C77D1C91F47050DB95" +gitterpass = "E5D59A852E1C4A5D800949E5D5A17BB76CD1553349C9BFD33A7B5A020D28DF47A12B1E28A9EB4BC3684E08F7A513DD00E988A90F377B58B5806C6883A51E06CC571ED50146897714FF9A604F721C2DDA0B" +takuglacierpass = "4332DEFE815A84F942872BB556B4633BE7E5264DC9A0A19FAA83DA6685B1EE9A65F8D358BF2882E8E65DC15BDB9EB3AD2F8D98EBCEA1FE6D6A0755D3E714F3097EB59DF1254F6343FF" +pushapikey = "15E559C27D427337871A6E927B3A921DA6C5F8FDDD81425515C998EAE179B4730BA01DC7005FB4BFB45FB12E40AE9DBE08DA77491EB5FBD825B5E56D72A1985B9D52885C393FA7" +slack-sigma-stanford_password = "67C7935ABB1DD078A981719173A97EE8CCE5E4FDB639EA75B3CA48B9AB658797AE91D2511B5BAF446591F4AA06BA866AC60DDD509652B66FCCC6B887504E80D77CBC166A475639655A05067D" +pushoverkey = "1F4C04CF437F8A911583EAFA8BA71948AC806629AA38B75E15388B57A35A92ADB09CCB0F8589EFFEFFD071294A8C70A46037166DDEC87CDE5391DC3A4284A2C9A309EA78CA515B" +bitlbee_password = "7EC5DD81EAA606B83E37FD1709DF1DFFC905CB44230A31F03E68E5D4C9010F430C514543CB108144D5932B6D2C28EA3E6A39D982A160D2585AE8791A5CFF" +pushuserkey = "6303510A973C0D7B85C0A2E30365D43D160169E3891FBD33455B49EE2EF8156CA8E0FA366981E875BCE4D38127E0161CBCA0F4135780300BBD9E1A9BB154ADBB24E315AE848F5D" +freenode_password = "69E535C6FE0F25C1748EF4F7F603E74D067F0597D530DDA0B2D29B22AC8C18B2878EA7A1C0CE46BA098290D4FE28644AEC9F2122FD96E03C277AF97288C545" +slack-taku_username = "7F663902A3B8CBCF75557042E01B089889EC56E76743B76125F7D772E6E8CFE3C8B14A96866A309856971832139AF95448C25CDB7090CA5391" +slack-sigma-stanford_username = "DE886D10444EE8068BDD1A10101D890008E923008F462268C0026C03DFA3A83ED1C0550FF37470666A633AFE3A62F7DA9A9A712114300233AA" +slack-taku_password = "6BB1D40BA86EA1A5DB3EBBA577DDD4D297C437D16CEAEB02C24E700CC162EAAB0566374593CA2684C20C563430F08BC500C0BE0ACF91451B1FB13E20272C3A543B995C1CCE0B6942D8" diff --git a/bin/i3status-mpc.sh b/bin/i3status-mpc.sh @@ -1,13 +1,14 @@ #!/bin/bash mpdcolor="#81a2be" +host=bigquake.ucsd.edu i3status --config ~/.i3/status | (read line && echo $line && read line && echo $line && while : do read line dat="" - if [[ -n $(mpc | grep playing) ]] + if [[ -n $(mpc -h $host | grep playing) ]] then - dat="$(mpc current -f '[%artist%]'): $(mpc current -f '[%title%]')" + dat="$(mpc current -h $host -f '[%artist%]'): $(mpc current -h $host -f '[%title%]')" fi newmails=$(find ~/Mail/*/INBOX/new -type f | wc -l) kbdlayout=$(cat ~/.kbd-layout)