Merging

README.org

@@ -1,6 +1,6 @@
 * Dotfiles
 
-I run OS X on my laptop and [[http://nixos.org][NixOS]] GNU/Linux on my desktop.
+I run macOS on my laptop and [[http://nixos.org][NixOS]] GNU/Linux on my desktop.
 
 After ~15 years with Vim &
 [[https://tmux.github.io/][Tmux]]/[[https://www.gnu.org/software/screen/][GNU
@@ -12,7 +12,7 @@ Screen]], I've mostly switched to
 
 If you
 - like Vim's modal UI
-- like Lisp better than Vimscript (yes, I know about neovim)
+- like Lisp better than Vimscript
 - want a huge, ancient hacker community & ecosystem
 
 then I suggest checking out Emacs & Spacemacs. Emacs really is a
@@ -25,8 +25,7 @@ great operating system, and now it has a great editor!
    [[http://www.djcbsoftware.nl/code/mu/mu4e.html][mu4e]] via
    [[https://www.fastmail.com/][Fastmail]]
 -  Terminal: [[http://www.emacswiki.org/emacs/MultiTerm][multiterm]] &
-   [[http://www.iterm2.com][iTerm 2]] (OS X) &
-   [[https://github.com/jwilm/alacritty][alacritty]] (Linux)
+   [[https://github.com/jwilm/alacritty][alacritty]] (Linux & macOS)
 -  Shell:
    [[http://www.gnu.org/software/emacs/manual/html_mono/eshell.html][EShell]]
    & [[http://www.fishshell.com][Fish]]
@@ -36,8 +35,7 @@ great operating system, and now it has a great editor!
 -  IRC & IM & chat: [[https://weechat.org/][WeeChat]] & [[https://bitlbee.org/][Bitlbee]] & [[https://github.com/the-kenny/weechat.el][weechat.el]]
 -  Notes & to-do lists & bookmarks & spreadsheets & journal & everything, really:
    [[http://orgmode.org][Org mode]]
--  Window Manager: [[http://www.alfredapp.com][Alfred]] (OS
-   X) & [[https://i3wm.org/][i3]] (or [[http://xmonad.org][xmonad]], depending on the month..) (Linux)
+-  Window Manager: [[http://www.alfredapp.com][Alfred]] (macOS) & [[https://i3wm.org/][i3]] (or [[http://xmonad.org][xmonad]], depending on the month..) (Linux)
 -  Sync: [[https://syncthing.net][Syncthing]]
 -  RSS Reader: [[https://feedly.com/][Feedly]] & [[https://github.com/skeeto/elfeed][Elfeed]]
 

alacritty.yml

@@ -113,7 +113,7 @@ font:
 
   # Point size
   # size: 11.0
-  size: 8.0
+  size: 14.0
 
   # Offset is the extra space around each character. `offset.y` can be thought of
   # as modifying the line spacing, and `offset.x` as modifying the letter spacing.
@@ -233,7 +233,7 @@ visual_bell:
 #
 # Window opacity as a floating point number from `0.0` to `1.0`.
 # The value `0.0` is completely transparent and `1.0` is opaque.
-background_opacity: 1.0
+background_opacity: 0.95
 
 # Mouse bindings
 #

bin/old_visimeet

@@ -1,4 +0,0 @@
-#!/bin/sh
-export IGVERBOSE=3
-[ -s /opt/visimeet/visimeet ] && /opt/visimeet/visimeet --nologin &
-[ -s /Applications/Visimeet\ Old.app/Contents/MacOS/visimeet ] && /Applications/Visimeet\ Old\.app/Contents/MacOS/visimeet --nologin --remote-debugging-port=1234 &

bin/renew_weechat_cert.sh

@@ -0,0 +1,7 @@
+#/bin/bash
+
+cat /var/lib/acme/dustinswan.com/key.pem \
+    /var/lib/acme/dustinswan.com/fullchain.pem > \
+    /home/dustinswan/.weechat/ssl/relay.pem
+
+chown dustinswan.users /home/dustinswan/.weechat/ssl/relay.pem

bin/visimeet

@@ -2,4 +2,4 @@
 export IGVERBOSE=3
 rm -rf ~/Library/Application\ Support/IOCOM/visimeet/dswan.iocom.com
 [ -s /opt/visimeet/visimeet ] && /opt/visimeet/visimeet --nologin &
-[ -s /Applications/Visimeet\ New.app/Contents/MacOS/visimeet ] && /Applications/Visimeet\ New.app/Contents/MacOS/visimeet --nologin --remote-debugging-port=1234 &
+[ -s /Applications/Visimeet.app/Contents/MacOS/visimeet ] && /Applications/Visimeet.app/Contents/MacOS/visimeet --nologin --remote-debugging-port=1234 &

fishfile

@@ -4,4 +4,3 @@ fisherman/get
 fisherman/getopts
 fisherman/imgcat
 fisherman/last_job_id
-fisherman/vibrant

khal.conf

@@ -1,6 +1,6 @@
 [calendars]
 [[Fastmail]]
-path = ~/Calendars/
+path = ~/Calendars/*
 type = discover
 
 [locale]

symlinks.sh

@@ -14,7 +14,7 @@ mkdir ~/.gnupg; ln -sf ~/dotfiles/gpg-agent.conf ~/.gnupg/gpg-agent.conf
 mkdir ~/.ssh; ln -sf ~/dotfiles/ssh/config ~/.ssh/config
 mkdir -p ~/.config/khard; ln -sf ~/dotfiles/khard.conf ~/.config/khard/khard.conf
 mkdir -p ~/.config/qutebrowser; ln -sf ~/dotfiles/qutebrowser.py ~/.config/qutebrowser/config.py
-mkdir -p ~/.config/alacritty; ln -sf ~/dotfiles/alacritty.yml ~/.config/alacritty/alacritty.py
+mkdir -p ~/.config/alacritty.yml; ln -sf ~/dotfiles/alacritty.yml ~/.config/alacritty/alacritty.yml
 mkdir -p ~/.config/rtv; ln -sf ~/dotfiles/rtv.cfg ~/.config/rtv/rtv.cfg
 mkdir -p ~/.newsboat; ln -sf ~/dotfiles/newsboat ~/.newsboat/config
 ln -sf ~/dotfiles/mailcap ~/.mailcap