commit b64bdee469be4e9767c6222ee3b84bef19569fa0
parent 924ca72ac45dc5e0148c06d503f402e4225e42f1
Author: Anders Damsgaard <anders.damsgaard@geo.au.dk>
Date: Fri, 15 Apr 2016 11:20:41 -0700
Merge branch 'master' of github.com:anders-dc/dotfiles
Diffstat:
11 files changed, 23 insertions(+), 13 deletions(-)
diff --git a/.i3/config b/.i3/config
@@ -312,3 +312,4 @@ exec --no-startup-id nm-applet
#exec --no-startup-id i3-msg 'workspace 2; exec urxvt -e tmuxinator iddqd; workspace 1; exec urxvt -e tmuxinator utility'
#exec --no-startup-id i3-msg 'workspace 1; exec urxvt -e tmuxinator utility; exec tor-browser.sh'
exec --no-startup-id i3-msg 'workspace 1; exec urxvt -e tmuxinator utility; exec torbrowser-launcher'
+exec --no-startup-id i3-msg 'workspace 1; exec bash ~/bin/export_x_info.sh; exec mpd; exec xrdb ~/.Xresources'
diff --git a/.imapfilter/riseup.lua b/.imapfilter/riseup.lua
@@ -51,11 +51,11 @@ mailboxes, folders = account:list_subscribed()
-- Get newly arrived, unread messages
--results = account.INBOX:is_new()
-
--------------------
-- Spam filtering --
--------------------
---[[all = account.INBOX:select_all()
+--all = account.INBOX:select_all()
+all = account.INBOX:is_new()
spam = Set {}
unsure = Set {}
for _, msg in ipairs(all) do
@@ -69,8 +69,8 @@ for _, msg in ipairs(all) do
end
end
spam:move_messages(account['Junk'])
-unsure:copy_messages(account['Junk/unsure'])
-]] --
+--unsure:copy_messages(account['Junk/unsure'])
+unsure:move_messages(account['Junk/unsure'])
-- Debian announcements list --
diff --git a/.mutt/muttrc b/.mutt/muttrc
@@ -128,6 +128,8 @@ macro index M "T~N<enter>;WNT~O<enter>;WO\CT~T<enter>" "Mark all messages as rea
# IMAP folders with spaces
bind editor <space> noop
macro index \ 1 "<change-folder>=riseup/INBOX/<enter>" "Go to Riseup inbox"
+macro index \ u "<change-folder>=riseup/Junk.unsure/<enter>" "Go to Riseup/Junk.unsure"
+macro index \ j "<change-folder>=riseup/Junk/<enter>" "Go to Riseup/Junk"
macro index \ ! "<change-folder>=riseup/Sent/<enter>" "Go to Riseup sent"
macro index \ 2 "<change-folder>=geomail/INBOX/<enter>" "Go to Geomail inbox"
macro index \ @ "<change-folder>=geomail/Sent/<enter>" "Go to Geomail sent"
@@ -197,14 +199,15 @@ set my_index_format_post=' (%4.4c) %?M?<%M> ?%s"'
folder-hook .*[sS]ent.* "$my_index_format_pre"t"$my_index_format_post"
folder-hook ! .*[sS]ent.* "$my_index_format_pre"F"$my_index_format_post"
-# mark as spam
+# mark as spam (S) or ham (H)
macro index,pager S "<enter-command>unset wait_key<enter>\
<pipe-entry>bogofilter -l -s<enter>\
<enter-command>set wait_key<enter>\
<save-message>=Junk<enter>" "mark as spam"
macro index,pager H "<enter-command>unset wait_key<enter>\
<pipe-entry>bogofilter -l -n<enter>\
-<enter-command>set wait_key<enter>J" "mark as ham (non-spam)"
+<enter-command>set wait_key<enter>\
+<save-message>=riseup/INBOX<enter>" "mark as ham (non-spam)"
# Get mutt to display its version on startup.
push <show-version>
diff --git a/.offlineimaprc b/.offlineimaprc
@@ -199,7 +199,7 @@ nametrans = lambda folder: {'drafts': '[Gmail]/Drafts',
'archive': '[Gmail]/All Mail',
}.get(folder, folder)
#cert_fingerprint = c1a3bb1a8617af4a28ee2e0cd494533c3cd70bf8
-cert_fingerprint = fc0a6ba4bf46851bcea02c6a438de63f6811165b
+cert_fingerprint = fc0a6ba4bf46851bcea02c6a438de63f6811165b,5f9f9598bf27cce4a97762336a753b8c07878564,f0b04600b419486538ace149e3615c7d94953c87
#folderfilter = lambda folder: folder not in ['Kalender','Kontaktpersoner','Slettet post','NFIT-Import-adc-2012-09-11-04:18']
diff --git a/.tmuxinator/utility.yml b/.tmuxinator/utility.yml
@@ -25,7 +25,6 @@ windows:
panes:
- mutt
- vimpc
- #- ncmpcpp
- sphere:
layout: even-vertical
panes:
diff --git a/.vimrc b/.vimrc
@@ -467,8 +467,8 @@ map <leader>E <Plug>(easymotion-prefix)
map <leader><leader> <Plug>(easymotion-bd-f)
nmap <leader><leader> <Plug>(easymotion-overwin-f)
-" s{char}{char} to move to {char}{char}
-nmap <leader>s <Plug>(easymotion-overwin-f2)
+" s{char}{char} to move to {char}{char} (conflicts with spell)
+"nmap <leader>s <Plug>(easymotion-overwin-f2)
" Move to line
map <leader>L <Plug>(easymotion-bd-jk)
diff --git a/.xinitrc b/.xinitrc
@@ -78,6 +78,7 @@ dunst &
#eval `gnome-keyring-daemon --start --components=secrets` # possible components: gpg,pkcs11,secrets,ssh
eval $(/usr/bin/gnome-keyring-daemon --start --components=gpg,pkcs11,secrets,ssh)
export GPG_AGENT_INFO SSH_AUTH_SOCK
+#eval $(ssh-agent)
# Enable tap-to-click on touchpad
synclient TapButton1=1 TapButton2=2 TapButton3=3
@@ -116,7 +117,7 @@ fi
#/usr/bin/xscreensaver -no-splash &
# Typing breaks (optionally add +lock)
-#xwrits breaktime=5:00 typetime=55:00 +clock +breakclock +mouse &
+xwrits breaktime=5:00 typetime=55:00 +clock +breakclock +mouse &
xset dpms 300 600 900
# Automatic display configuration script
diff --git a/.zshrc b/.zshrc
@@ -95,7 +95,7 @@ alias fixdisplay='export DISPLAY=:0'
alias zshreload="source ~/.zshrc"
alias dotfiles-update="cd ~/code/dotfiles && git pull ; zshreload ; cd -"
-alias dotfiles-commit="cd ~/code/dotfiles && git commit -a -v && git push ; cd -"
+alias dotfiles-commit="cd ~/code/dotfiles && git commit -a -v ; git push ; cd -"
alias m="make"
alias mc="make clean"
diff --git a/bin/sastrugi-ssh b/bin/sastrugi-ssh
@@ -1,2 +1,3 @@
#!/bin/sh
-ssh adamsgaard@137.110.73.38
+#ssh adamsgaard@137.110.73.38
+ssh adamsgaard@sastrugi.ucsd.edu
diff --git a/debian-install.sh b/debian-install.sh
@@ -23,6 +23,7 @@ sudo apt-get install \
ipython \
latexmk \
libnotify-bin \
+ locate \
mpc \
mpd \
mplayer \
diff --git a/osx-install.sh b/osx-install.sh
@@ -31,10 +31,13 @@ brews=( \
"gnupg"\
"htop-osx"\
"imagemagick"\
+ "imapfilter"\
"libav"\
"libevent"\
"lua"\
"mobile-shell"\
+ "mpc"\
+ "mpd"\
"msmtp"\
"mutt"\
"--HEAD neovim/neovim/neovim"\
@@ -57,6 +60,7 @@ brews=( \
"tree"\
"urlview"\
"vim"\
+ "vimpc"\
"vtk --with-tcl --with-qt --with-python --with-matplotlib --with-examples"\
"w3m"\
"watch"\
