commit 6b3599cd5d55af2565299460d89158defd8b771c
parent 86832d8c810dcebb39b918ca0cc885d3547d1523
Author: Anders Damsgaard Christensen <adc@geo.au.dk>
Date: Wed, 26 Oct 2016 08:01:36 -0700
Merge branch 'master' of github.com:anders-dc/dotfiles
Diffstat:
4 files changed, 55 insertions(+), 10 deletions(-)
diff --git a/.vimrc b/.vimrc
@@ -365,6 +365,9 @@ nmap <Leader>w :w<CR>
" Quit
nmap <Leader>q :q<CR>
+" Native (fast) buffer switching
+nnoremap ,b :ls<CR>:buffer<Space>
+
" Close buffer
nmap <leader>Q :bd<CR>
@@ -477,6 +480,9 @@ nmap <leader>FA zM
" Use home row keys as Esc
inoremap jk <Esc>
+" Improve navigation on wrapped lines
+nnoremap j gj
+nnoremap k gk
map <leader>E <Plug>(easymotion-prefix)
diff --git a/.weechat/irc.conf b/.weechat/irc.conf
@@ -289,3 +289,39 @@ gitter.default_msg_kick
gitter.default_msg_part
gitter.default_msg_quit
gitter.notify
+slack-taku.addresses = "takuglacier.irc.slack.com/6667"
+slack-taku.proxy
+slack-taku.ipv6
+slack-taku.ssl = on
+slack-taku.ssl_cert
+slack-taku.ssl_priorities
+slack-taku.ssl_dhkey_size
+slack-taku.ssl_fingerprint
+slack-taku.ssl_verify
+slack-taku.password = "${sec.data.slack-taku_password}"
+slack-taku.capabilities
+slack-taku.sasl_mechanism
+slack-taku.sasl_username = "${sec.data.slack-taku_username}"
+slack-taku.sasl_password = "${sec.data.slack-taku_password}"
+slack-taku.sasl_timeout
+slack-taku.autoconnect = on
+slack-taku.autoreconnect
+slack-taku.autoreconnect_delay
+slack-taku.nicks = "anders.damsgaard"
+slack-taku.username = "${sec.data.slack-taku_username}"
+slack-taku.realname
+slack-taku.local_hostname
+slack-taku.command
+slack-taku.command_delay
+slack-taku.autojoin
+slack-taku.autorejoin
+slack-taku.autorejoin_delay
+slack-taku.connection_timeout
+slack-taku.anti_flood_prio_high
+slack-taku.anti_flood_prio_low
+slack-taku.away_check
+slack-taku.away_check_max_nicks
+slack-taku.default_msg_kick
+slack-taku.default_msg_part
+slack-taku.default_msg_quit
+slack-taku.notify
diff --git a/.weechat/plugins.conf b/.weechat/plugins.conf
@@ -36,7 +36,7 @@ perl.highmon.nick_prefix = "<"
perl.highmon.nick_suffix = ">"
perl.highmon.output = "buffer"
perl.highmon.short_names = "off"
-perl.pushover.blacklist = ""
+perl.pushover.blacklist = "#twitter_damsgaardanders"
perl.pushover.enabled = "on"
perl.pushover.nma_apikey = ""
perl.pushover.only_if_away = "off"
diff --git a/.weechat/sec.conf b/.weechat/sec.conf
@@ -10,12 +10,15 @@ salt = on
[data]
__passphrase__ = on
-freenode_username = "5DE3179B295E9132CAF0B82419F2823DEA49C8DB77036891D6DFFF0691173B227D98F87425AD64841A243E87"
-gitterpass = "3B20A5455383A2CA4BCD0C94D319981DD74D7F31016A273D7A205A2AAF4CED5C6B16FF21BEF836516F86103224A58BC1300B93E46FA06E410A9B6CE34F88FC2DEB173B366581021F7DEA41EE7416EC69D4"
-pushapikey = "A30F195AE38E120032282EC65B5472247C9BED302B65E067CEA4FECB359EFFB6565CE83A62206D4B628A7ED2421709EE2015299BCE68C776D4BBFF9E47031FA94FD195D2B32F32"
-slack-sigma-stanford_password = "834D48E935949766D74AB3F3124C92FCF8B50241ED72E9AF459BADAC809F2F839BFCA1900DB6267073F540870889115523AEFC73D20F8D6BAA4A937B34AEDC35FFA62F65A08E5CC47A7236ED"
-pushoverkey = "66A0278CCAEA5093D94BE7BC9E72725FBF09FFA44F168854E2A24ED203B9CDD8D16FB5767BE60298FFF4A5B0A341D32DBAF4B2927A32F40526DBE95DDD0F266A4404061D824F98"
-bitlbee_password = "BDC07880BFAA28C380D6ED7C73A41F39942C7E6318F16D9DEB31D2AF2334A26D5EEB04E3789107125736566D0FD913AC1B2372EC96E097BD864A6B7F4FBE"
-pushuserkey = "340D9A5C401C2489788E7980B26B5A219C2C71AA6424031902AD50324AD6F0F7A68C70172D3629BF5FE032F4FFB1EF14F5CC7F7DA839810745FC609668F7E36EE16CC7D4C39EC7"
-freenode_password = "72B7AA55A39C5DF933166F875F1B901F6E5F0C7563D2552B7DAC539C9CCE6113E97D1D8B677B7D630E82890E749C7D9A5AE4935BE097E8999A61B829B3C407"
-slack-sigma-stanford_username = "11561EC5084FDDE75BC9C91C7754129DD1C28530C3328D0DDBE7EDFFDEB0C331A10494AF85E0982AFE633B1009988CF5DFD43759E076D88E40"
+freenode_username = "F1A94392BFC1D9863FD866166BF6991A4B03FCB2912201BCC6AD75341CF45F79895845646680250CA8D86CD3"
+gitterpass = "F47CD14BEA231FA4CA57CAFFCCBF26A68A33FFA7778450F4BD4EB619C7A4DD32C84FA49C328A3159FCF2AA9348DA84AF8C25540F80C8B703EC5952E7D53B37B5D4B5EB77DE83150060928E77D4FFD0CDEF"
+takuglacierpass = "2DE68A94CBEF0EADBCA276A04B50B961530315E221D5FA9D1A477D83E1CEECB7B28A4C3103EBDD21F955F6C44069FECF9DFEA8783DE39DF0F5A70C16509E6651DA01C95B8152D4A556"
+pushapikey = "F8716BDA34366E12595B039BF28D3E9B73C576FA605DA998DB6E7F9C8F0E1CC52B66DDF434E7BEBDA2FE5C6C4C032D5EB351E37CE288EF9CAE820ABC612E0EC015E7680B4BCB6E"
+slack-sigma-stanford_password = "D985A8D17417F98F45CF5583137EA466B7A14536D0D36CC1A6175BCAA0E1DC3BD0792E519EA9F0E19E5D215701FFCCD0B619D0D61DCD2700C15AAB879936E1FAB1A012330939537F1CC63B65"
+pushoverkey = "9230DF09FCB6012C602582283A4FE88876D6D98CC5A25C6122D5CA6A76E445BB6DBA7F077E8E9D43095F0537C9F034B39C0D4F379EE21235461688F2D8E19FD7D1074E58184615"
+bitlbee_password = "9A392D6BC76A6D6EDCC56F167B9724C23FF1AC5CFD51285E0D36C61634C3FCA70FF7F4F9B954C84A6749CAA25D8988444D890B7C47DB5FAB5644849305E3"
+pushuserkey = "09F9BF9B052D4C4D92E1B7F7BADFAD536BF63A255604FA750438B56C13C19F32AEF6FA9A5FF30190D22D5ECF6C6B81C760B19E842DCAEB18037C089A06F756E1D577BEFE5B5BEF"
+freenode_password = "343D96DA4B1B6A74446A606559DF5324A34A81AB150001398F96B3CA72BE74D6950E89351A1FB56678916AD004D1B140F0EC2F3014A50F257DA5C2BA7AFCE7"
+slack-taku_username = "C2CB96DC4EE1DA9FD9B280F01159973763083B72EBFEDDA3019E13E72C494DFEAC714129CEE2FFDE31911EBCBB659985E0CB8D16821DFC769A"
+slack-sigma-stanford_username = "FCABEB95A7C59E948C5332DD7467A8377CA059EE1DE64D028B01288113FD9AFC9559EAAE09C2BD56DFDB65AC32ACDBE080A92F99471DA9D843"
+slack-taku_password = "0733086C7260CB3976233A98B63CCBE5AC5A866BB651C496C514ED5EB21B083F61777614DD8A4B25D97C1123A97FC8AFE8713B7CCDC3B71B8924BA116D779230ACE84D908371B247F8"