commit 5920813d8bcdcf5d9f16a729e6829fc72c4e12a1
parent da8f30a4b631dea73591f38596a97b1a2cd2b448
Author: Anders Damsgaard <anders@adamsgaard.dk>
Date: Fri, 30 Nov 2018 11:33:54 +0100
Merge branch 'master' of gitlab.com:admesg/dotfiles
Diffstat:
16 files changed, 111 insertions(+), 43 deletions(-)
diff --git a/init/30_macos_casks.sh b/init/30_macos_casks.sh
@@ -16,6 +16,7 @@ casks=(
bitbar
duet
firefox
+ google-cloud-sdk
julia
karabiner
mactex
diff --git a/init/30_macos_recipes.sh b/init/30_macos_recipes.sh
@@ -64,6 +64,7 @@ brews=(
proxychains-ng # torify alternative?
pwgen
qrencode # generate QR codes from command line
+ ranger # file manager
reattach-to-user-namespace # needed for tmux
rename # rename many files with convenient syntax
ripgrep # a faster grep
diff --git a/links/.commands.sh b/links/.commands.sh
@@ -93,6 +93,8 @@ alias date-eastern='TZ=US/Eastern date'
alias date-pacific='TZ=US/Pacific date'
alias date-mountain='TZ=US/Mountain date'
alias date-central='TZ=US/Central date'
+alias date-uk='TZ=Europe/London date'
+alias date-israel='TZ=Israel date'
## git
diff --git a/links/.config/gopass/config.yml b/links/.config/gopass/config.yml
@@ -0,0 +1,19 @@
+root:
+ askformore: false
+ autoclip: true
+ autoimport: true
+ autosync: true
+ check_recipient_hash: false
+ cliptimeout: 45
+ concurrency: 1
+ editrecipients: false
+ nocolor: false
+ noconfirm: true
+ nopager: false
+ notifications: true
+ path: gpgcli-gitcli-fs+file:///Users/ad/.password-store
+ recipient_hash:
+ .gpg-id: 3078423739304634414431424638353846450aa69f73cca23a9ac5c8b567dc185a756e97c982164fe25859e0d1dcc1475c80a615b2123af1f5f94c11e3e9402c3ac558f500199d95b6d3e301758586281dcd26
+ safecontent: false
+ usesymbols: false
+mounts: {}
diff --git a/links/.mailcap b/links/.mailcap
@@ -3,6 +3,7 @@ text/html; cp %s ~/.mutt/tmp.html && open ~/.mutt/tmp.html && sleep 3 && rm ~/.m
text/html; w3m -I %{charset} -T text/html; copiousoutput; needsterminal
text/plain; cat %s; copiousoutput
+text/*; vim %s; needsterminal
# MS Word documents
#application/msword; ~/.mutt/view_attachment.sh '%s' "-" '/Applications/TextEdit.app'
@@ -25,6 +26,7 @@ application/postscript; ~/.mutt/view_attachment.sh '%s' eps
# Unidentified files
application/octet-stream; ~/.mutt/view_attachment.sh '%s' "-"
+application/*; ~/.mutt/view_attachment.sh '%s' "-"
video/mp4; ~/.mutt/view_attachment.sh '%s' "-"
video/avi; ~/.mutt/view_attachment.sh '%s' "-"
diff --git a/links/.mutt/muttrc b/links/.mutt/muttrc
@@ -68,7 +68,7 @@ folder-hook noaa 'set \
# ignore own e-mail addresses from group-reply
-alternates anders@adamsgaard.dk|adamsgaard@ucsd.edu|adamsgaard@mail.ucsd.edu|andersd@risuep.net|andersdc@gmail.com|adc@geo.au.dk|anders.damsgaard@geo.au.dk|andersd@princeton.edu|andersd@exchange.Princeton.EDU|anders.damsgaard@noaa.gov|anders@geodatahub.dk|sales@geodatahub.dk|info@geodatahub.dk|support@geodatahub.dk|sysadmin@geodatahub.dk|webmaster@geodatahub.dk
+alternates anders@adamsgaard.dk|anders@andersdamsgaard.com|anders@andersdamsgaard.dk|prints@andersdamsgaard.com|prints@andersdamsgaard.dk|adamsgaard@ucsd.edu|adamsgaard@mail.ucsd.edu|andersd@risuep.net|andersdc@gmail.com|adc@geo.au.dk|anders.damsgaard@geo.au.dk|andersd@princeton.edu|andersd@exchange.Princeton.EDU|anders.damsgaard@noaa.gov|anders@geodatahub.dk|sales@geodatahub.dk|info@geodatahub.dk|support@geodatahub.dk|sysadmin@geodatahub.dk|webmaster@geodatahub.dk
# Cache files
set header_cache=~/.mutt/cache/headers
@@ -242,7 +242,7 @@ folder-hook gmail 'macro index <Esc>o "<enter-command>unset wait_key<enter><shel
folder-hook geomail 'macro index <Esc>o "<enter-command>unset wait_key<enter><shell-escape>tmux split-window -p 25 \"offlineimap -a geomail\"; tmux select-pane -l<enter><enter-command>set wait_key<enter>"'
macro index K "<enter-command>unset wait_key<enter>\
-<shell-escape>killall -9 offlineimap<enter>" "kill all offlineimap processes"
+<shell-escape>offlineimap-kill.sh<enter>" "kill all offlineimap processes"
macro index U "<limit>all\n" "show all messages (undo limit)"
diff --git a/links/.newsboat/urls b/links/.newsboat/urls
@@ -73,3 +73,47 @@ http://feeds.feedburner.com/nvidia/parallelforall "Tech"
https://blog.torproject.org/blog/feed "Tech"
http://motherboard.vice.com/rss "Tech"
http://vimcasts.org/feeds/quicktime.rss "Tech"
+http://filmlabapp.com/feed.xml "Photography"
+https://www.youtube.com/feeds/videos.xml?channel_id=UCwmhwNhFOgCpwQZ4hdWQ7EQ "YouTube Subscriptions"
+https://www.youtube.com/feeds/videos.xml?channel_id=UCaS4coxA2k1GU348UjJFi_Q "YouTube Subscriptions"
+https://www.youtube.com/feeds/videos.xml?channel_id=UCHyPdxeP9Ww0y_bMgeP1jxw "YouTube Subscriptions"
+https://www.youtube.com/feeds/videos.xml?channel_id=UCFJSxBWfYv_VCz_heG-FczA "YouTube Subscriptions"
+https://www.youtube.com/feeds/videos.xml?channel_id=UCrBxmNwqe2pBpQB7LhB7z-w "YouTube Subscriptions"
+https://www.youtube.com/feeds/videos.xml?channel_id=UCDvq7BPaphEIhBlyDN19rvQ "YouTube Subscriptions"
+https://www.youtube.com/feeds/videos.xml?channel_id=UC2Mkxf1n2TEnjuKIxf7S-DQ "YouTube Subscriptions"
+https://www.youtube.com/feeds/videos.xml?channel_id=UC8uT9cgJorJPWu7ITLGo9Ww "YouTube Subscriptions"
+https://www.youtube.com/feeds/videos.xml?channel_id=UC323QJ81e2PXPgMuCF3B5Xg "YouTube Subscriptions"
+https://www.youtube.com/feeds/videos.xml?channel_id=UCUbAIlQq6qdOCW7nURh9Qog "YouTube Subscriptions"
+https://www.youtube.com/feeds/videos.xml?channel_id=UCf98WFQLzORUfCinbycwXXQ "YouTube Subscriptions"
+https://www.youtube.com/feeds/videos.xml?channel_id=UC9DkCKm4_VDztRRyge4mCJQ "YouTube Subscriptions"
+https://www.youtube.com/feeds/videos.xml?channel_id=UCUC_2Z23y5wGOVG2X1ulCCg "YouTube Subscriptions"
+https://www.youtube.com/feeds/videos.xml?channel_id=UChgZlXub-dVuGtTq11O7yZA "YouTube Subscriptions"
+https://www.youtube.com/feeds/videos.xml?channel_id=UCLcKQhTO6i0oq10S234vWyA "YouTube Subscriptions"
+https://www.youtube.com/feeds/videos.xml?channel_id=UC2eYFnH61tmytImy1mTYvhA "YouTube Subscriptions"
+https://www.youtube.com/feeds/videos.xml?channel_id=UCrZlzcRfCKLngZnqNTmTQjw "YouTube Subscriptions"
+https://www.youtube.com/feeds/videos.xml?channel_id=UCMYTOWED2RUuRD1QWVcbdiw "YouTube Subscriptions"
+https://www.youtube.com/feeds/videos.xml?channel_id=UC99aCAfYrNqIF6st3gNeHzw "YouTube Subscriptions"
+https://www.youtube.com/feeds/videos.xml?channel_id=UCkcuvqBAZPgTJ9evx9wkzvA "YouTube Subscriptions"
+https://www.youtube.com/feeds/videos.xml?channel_id=UCTgaiv8YdmmNqI8STrpWc7w "YouTube Subscriptions"
+https://www.youtube.com/feeds/videos.xml?channel_id=UCR-I25_yEl_frEZ26I9ty-w "YouTube Subscriptions"
+https://www.youtube.com/feeds/videos.xml?channel_id=UCopwCE5bVtffQif8IFkbUuw "YouTube Subscriptions"
+https://www.youtube.com/feeds/videos.xml?channel_id=UCt7fwAhXDy3oNFTAzF2o8Pw "YouTube Subscriptions"
+https://www.youtube.com/feeds/videos.xml?channel_id=UCc-9JMcDZSh6R4OXuWX6Gag "YouTube Subscriptions"
+https://www.youtube.com/feeds/videos.xml?channel_id=UCVmgQawOcdeA9v9o0aukV7A "YouTube Subscriptions"
+https://www.youtube.com/feeds/videos.xml?channel_id=UCSFAYalJ2Q7Tm_WmLgetmeg "YouTube Subscriptions"
+https://www.youtube.com/feeds/videos.xml?channel_id=UCJgJWICGMzzvXk2wIgqxVEQ "YouTube Subscriptions"
+https://www.youtube.com/feeds/videos.xml?channel_id=UC7T8roVtC_3afWKTOGtLlBA "YouTube Subscriptions"
+https://www.youtube.com/feeds/videos.xml?channel_id=UCDkJEEIifDzR_2K2p9tnwYQ "YouTube Subscriptions"
+https://www.youtube.com/feeds/videos.xml?channel_id=UC8lJ3EM0VC4TS0jY6VJtTcw "YouTube Subscriptions"
+https://www.youtube.com/feeds/videos.xml?channel_id=UC6t7IQyBM77KVoCUPfuveOA "YouTube Subscriptions"
+https://www.youtube.com/feeds/videos.xml?channel_id=UCN1-864p2gbPiJtnRG3Oujg "YouTube Subscriptions"
+https://www.youtube.com/feeds/videos.xml?channel_id=UCfhW84xfA6gEc4hDK90rR1Q "YouTube Subscriptions"
+https://www.youtube.com/feeds/videos.xml?channel_id=UC9IuUwwE2xdjQUT_LMLONoA "YouTube Subscriptions"
+https://www.youtube.com/feeds/videos.xml?channel_id=UC4m2G6T18_JcjwxwtwKJijw "YouTube Subscriptions"
+https://www.youtube.com/feeds/videos.xml?channel_id=UCIBaDdAbGlFDeS33shmlD0A "YouTube Subscriptions"
+https://www.youtube.com/feeds/videos.xml?channel_id=UC7c8mE90qCtu11z47U0KErg "YouTube Subscriptions"
+https://www.youtube.com/feeds/videos.xml?channel_id=UC9-y-6csu5WGm29I7JiwpnA "YouTube Subscriptions"
+https://www.youtube.com/feeds/videos.xml?channel_id=UCm9BPmxgO7fW7_lOXl9-mPw "YouTube Subscriptions"
+https://www.youtube.com/feeds/videos.xml?channel_id=UCOebd74GjFKVVqMKYuhanjA "YouTube Subscriptions"
+https://www.youtube.com/feeds/videos.xml?channel_id=UCzFfuU06f327-bnI3lODUNQ "YouTube Subscriptions"
+https://www.youtube.com/feeds/videos.xml?channel_id=UCMx-iVKPpKiRPQfc39nXvXw "YouTube Subscriptions"
diff --git a/links/.signature b/links/.signature
@@ -1,6 +1,5 @@
-Anders Damsgaard, Ph.D.
-https://adamsgaard.dk
-
-PGP public key:
-https://adamsgaard.dk/ad-public-key.txt
-https://pgp.mit.edu/pks/lookup?op=get&search=0xB790F4AD1BF858FE
+Anders Damsgaard
+--
+Academia: https://adamsgaard.dk
+Photography: https://andersdamsgaard.com
+PGP public key: https://adamsgaard.dk/ad-public-key.txt
diff --git a/links/.vim/UltiSnips/tex.snippets b/links/.vim/UltiSnips/tex.snippets
@@ -24,21 +24,21 @@ snippet Fig "Insert reference to figure"
(Fig.~\ref{fig:$0})
endsnippet
-snippet sec "Insert section"
-\section{$1}%
-\label{sec:$2}
-$0
-endsnippet
+# snippet sec "Insert section"
+# \section{$1}%
+# \label{sec:$2}
+# $0
+# endsnippet
snippet Sec "Insert reference to section"
(Section~\ref{sec:$0})
endsnippet
-snippet subsec "Insert subsection"
-\subsection{$1}%
-\label{subsec:$2}
-$0
-endsnippet
+# snippet subsec "Insert subsection"
+# \subsection{$1}%
+# \label{subsec:$2}
+# $0
+# endsnippet
snippet Subsec "Insert reference to subsection"
(Section~\ref{subsec:$0})
diff --git a/links/.vim/plugin/appearance.vim b/links/.vim/plugin/appearance.vim
@@ -84,15 +84,15 @@ augroup StatuslineConfig
" right
set statusline+=%4* " set background color
- if exists('g:ale_enabled')
+ if &rtp =~ 'ale'
set statusline+=%7*%{StatuslineLinterWarnings()}%4* " ALE warnings
set statusline+=%6*%{StatuslineLinterErrors()}%4* " ALE errors
set statusline+=%{StatuslineLinterOK()} " ALE ok
- end
+ endif
set statusline+=%2* " set User2 color
- if exists('g:line_no_indicator_chars')
+ if &rtp =~ 'vim-line-no-indicator'
set statusline+=\ %{LineNoIndicator()}\ " show position w. single char
- end
+ endif
set statusline+=%3* " set User3 color
set statusline+=\ %2l:%-2c\ " line and column view
diff --git a/links/.vim/plugins.vim b/links/.vim/plugins.vim
@@ -37,7 +37,7 @@ Plug 'justinmk/vim-sneak' " move cursor s{char}{char}, use cl for sub
" """""" Text editing """"""
Plug 'tpope/vim-surround' " modify surrounding symbols
Plug 'tpope/vim-repeat' " repeat plugin bindings with .
-Plug 'tpope/vim-commentary' " comment line with gcc, motion with gc
+Plug 'tomtom/tcomment_vim' " comment line with gcc, motion with gc
Plug 'tpope/vim-abolish' " :%Subvert/facilit{y,ies}/building{,s}/g
Plug 'junegunn/vim-easy-align' " align in columns (select > return > space)
Plug 'reedes/vim-litecorrect' " autocorrect common typos
diff --git a/links/.w3m/bookmark.html b/links/.w3m/bookmark.html
@@ -25,7 +25,7 @@
</ul>
<h2>Photography</h2>
<ul>
-<!-- <li><a href="https://www.reidreviews.com/reidreviews/login.asp">Reid Reviews</a> -->
+<li><a href="https://www.reidreviews.com/reidreviews/login.asp">Reid Reviews</a>
<li><a href="http://www.fredmiranda.com/forum/board/55">Fred Miranda: Alternative Gear & Lenses</a>
<li><a href="http://www.lensworkonline.com/login.php">LensWork Online</a>
<li><a href="https://luminous-landscape.com/">Luminous Landscape</a>
@@ -47,6 +47,7 @@
</ul>
<h2>Development</h2>
<ul>
+<li><a href="https://console.cloud.google.com">Google Cloud Console</a>
<li><a href="https://gitlab.com/GeoDataHub/">Gitlab/GeoDataHub</a>
<li><a href="https://gitlab.com/groups/GeoDataHub/-/issues">Gitlab/GeoDataHub Issues</a>
<li><a href="https://github.com/">Github</a>
@@ -61,18 +62,11 @@
<h2>Local</h2>
<ul>
<li><a href="http://skoerpingskole.skoleporten.dk/sp">Skørping Skole</a>
-<!--<li><a href="https://www.plainsborolibrary.org/">Plainsboro Public Library</a>-->
-<!--<li><a href="https://parents.ww-p.org/genesis/parents?gohome=true">WW-P Genesis Parents Login</a>-->
-<!--<li><a href="http://teriyakiboy.net/catalog/alldishes.aspx">Teriyaki Boy</a>-->
<!--End of section (do not delete this comment)-->
</ul>
<h2>Academia</h2>
<ul>
<li><a href="https://scholar.google.com/">Google Scholar</a>
-<!-- <li><a href="https://princeton.summon.serialssolutions.com/#!/advanced">Princeton University Library - Articles+</a> -->
-<!-- <li><a href="https://www.princeton.edu/concur">Princeton Concur</a> -->
-<!-- <li><a href="https://aos.princeton.edu/">Atmospheric & Oceanic Sciences - Princeton University</a> -->
-<!-- <li><a href="https://ttrade.tigerapps.org/">TigerTrade</a> -->
<li><a href="https://www.library.caltech.edu/journal-title-abbreviations">Journal Title Abbreviations - Caltech Library</a>
<!--End of section (do not delete this comment)-->
</ul>
@@ -96,13 +90,7 @@
<li><a href="https://servlet.dmi.dk/byvejr/servlet/byvejr?by=9520&tabel=dag3_9&eps=true">DMI:
Skoerping 3-9d</a>
<li><a href="http://www.dmi.dk/vejr/maalinger/radar-nedboer/">DMI: Radar</a>
-<!-- <li><a href="http://f1.weather.gov/MapClick.php?lat=40.33075000000008&lon=-74.56472999999994">National Weather Service: Plainsboro, NJ</a> -->
-<!-- <li><a href="http://f1.weather.gov/MapClick.php?w0=t&w1=td&w2=wc&w3=sfcwind&w3u=3&w4=sky&w5=pop&w6=rh&w7=rain&w8=thunder&w9=snow&w10=fzg&w11=sleet&w12=fog&w13u=0&w16u=1&w17u=1&AheadHour=0&Submit=Submit&FcstType=graphical&textField1=40.3308&textField2=-74.5647&site=all&unit=0&dd=&bw=&menu=1">NWS: Hourly Weather Forecast, Plainsboro NJ (Graphical)</a> -->
-<!-- <li><a href="http://f1.weather.gov/MapClick.php?w0=t&w1=td&w2=wc&w3=sfcwind&w3u=3&w4=sky&w5=pop&w6=rh&w7=rain&w8=thunder&w9=snow&w10=fzg&w11=sleet&w12=fog&w13u=0&w16u=1&w17u=1&AheadHour=0&Submit=Submit&FcstType=digital&textField1=40.3308&textField2=-74.5647&site=all&unit=0&dd=&bw=&menu=1">NWS: Hourly Weather Forecast, Plainsboro NJ (Digital)</a> -->
-<!-- <li><a href="https://radar.weather.gov/radar.php?rid=dix&product=N0R&overlay=11101111&loop=no">NWS radar image from Mt. Holly, NJ</a> -->
-<!-- <li><a href="http://data1.gfdl.noaa.gov/fvGFS/fvGFS_products.php?Region=local&field=precip_snow_wind">GFDL fvGFS 10 day forecast (hourly precipitation)</a> -->
-<!-- <li><a href="http://www.skippysky.com.au/NorthAmerica/">SkippySky - North America</a> -->
-<li><a href="http://djlorenz.github.io/astronomy/lp2006/overlay/dark.html">Light Pollution Atlas 2006</a>
+ <li><a href="http://djlorenz.github.io/astronomy/lp2006/overlay/dark.html">Light Pollution Atlas 2006</a>
<!-- <li><a href="http://www.cleardarksky.com/c/AAAP1_NJkey.html?1">Clear Sky Chart - Princeton, NJ</a> -->
<!--End of section (do not delete this comment)-->
</ul>
diff --git a/links/.zshrc b/links/.zshrc
@@ -11,6 +11,7 @@ setopt autocd # cd into directory if called by name
setopt autopushd # make cd push the old dir to the dir stack
setopt extendedglob # globs (. is file, / is dir) see `man zshexpn`
setopt hist_ignore_dups # ignore duplicate cmds in history
+setopt histignorespace # dont store commands prefixed with space in history
setopt interactivecomments # allow in-line comments in prompt
setopt prompt_subst # perform param exp, cmd subst, arith exp in prompt
setopt share_history # import new commands from the history file
diff --git a/links/bin/ejectall b/links/bin/ejectall
@@ -2,7 +2,7 @@
for f in "/Volumes/"*; do
if [ "$f" != "/Volumes/Macintosh HD" ]; then
if [ "$f" != "/Volumes/MobileBackups" ]; then
- diskutil eject $f 2>&1 | \
+ diskutil eject "$f" 2>&1 | \
sed "s/Volume failed to eject/$(tput setaf 1)Volume failed to eject$(tput sgr0)/" |
sed "s/Unable to find disk for .*com\.apple\.TimeMachine.*//"
fi
diff --git a/links/bin/newsboat-sync b/links/bin/newsboat-sync
@@ -5,6 +5,17 @@ function info {
echo -en "$(tput setaf 2)$*$(tput sgr0)"
}
+eval "$(gpg-agent)"
+GPG_TTY=$(tty)
+export GPG_TTY
+eval "$(ssh-agent)"
+# Add ssh key if not already added
+if [ "$(uname)" = "Darwin" ]; then
+ ssh-add -l | grep -q '\.ssh/id_rsa' || ssh-add -K
+else
+ ssh-add -l | grep -q '\.ssh/id_rsa' || ssh-add
+fi
+
info "Downloading newest cache..."
rsync -aq -e 'ssh -q' ad@idkfa.ucsd.edu:~/.newsboat/cache.db ~/.newsboat/cache.db
info "done.\\n"
diff --git a/links/bin/upload b/links/bin/upload
@@ -1,8 +1,8 @@
#!/usr/bin/env bash
-host="idkfa.ucsd.edu"
-user="ad"
-# host="adamsgaard.dk"
-# user="andersdc"
+# host="idkfa.ucsd.edu"
+# user="ad"
+host="adamsgaard.dk"
+user="andersdc"
if [ "$1" = "--border" ] || [ "$1" = "-b" ]; then
uploadfile="$(mktemp)"
