Merge? Merge! Merge.

git/.config/git/config

@@ -32,10 +32,23 @@
 	gpgsign = true
 
 [sendemail]
-	smtpserver = smtp.nullpointer.io
+	smtpserver = smtp.little.kiwi
 	smtpuser = george@rawlinson.net.nz
 	smtpencryption = tls
 	smtpserverport = 587
 	annotate = true
 [format]
 	signoff = true
+
+# use git-delta for diff/log
+[delta]
+	navigate = true
+
+[interactive]
+	diffFilter = delta --color-only
+
+[pager]
+	diff = delta
+	log = delta
+	reflog = delta
+	show = delta

mail/.config/neomutt/accounts/archlinux

@@ -0,0 +1,27 @@
+# clear previously defined mailboxes
+#unmailboxes *
+
+# clear previously defined headers
+unmy_hdr *
+
+set mbox = "+archlinux/Archive"
+set postponed = "+archlinux/Drafts"
+set trash = "+archlinux/Trash"
+set record = "+archlinux/Sent"
+
+set realname = "George Rawlinson"
+set from = "grawlinson@archlinux.org"
+set signature = "~/.config/neomutt/signature"
+
+# smtp settings
+set smtp_pass = `pass mail/grawlinson@archlinux.org`
+set smtp_url = smtps://$from@mail.archlinux.org
+
+# archlinux specific macros
+macro index A "<save-message>+archlinux/Archive<enter>" "move message to the archive"
+macro index S "<save-message>+archlinux/Junk<enter>" "mark message as spam"
+macro index D "<save-message>+archlinux/Trash<enter>" "move message to the trash"
+# tag macros
+macro index \Ca "<tag-prefix-cond><save-message>+archlinux/Archive<enter>" "move tagged messages to archive"
+macro index \Cs "<tag-prefix-cond><save-message>+archlinux/Junk<enter>" "move tagged messages to spam"
+macro index \Cd "<tag-prefix-cond><save-message>+archlinux/Trash<enter>" "move tagged messages to trash"

mail/.config/neomutt/accounts/nullpointer

@@ -1,26 +0,0 @@
-# clear previously defined mailboxes
-#unmailboxes *
-
-# clear previously defined headers
-unmy_hdr *
-
-set mbox = "+nullpointer/Archive"
-set postponed = "+nullpointer/Drafts"
-set trash = "+nullpointer/Trash"
-set record = "+nullpointer/Sent"
-
-set realname = "George Rawlinson"
-set from = "george@nullpointer.io"
-
-# smtp settings
-set smtp_pass = `pass mail/george@nullpointer.io`
-set smtp_url = smtp://$from@smtp.nullpointer.io:587
-
-# nullpointer specific macros
-macro index A "<save-message>+nullpointer/Archive<enter>" "move message to the archive"
-macro index S "<save-message>+nullpointer/Junk<enter>" "mark message as spam"
-macro index D "<save-message>+nullpointer/Trash<enter>" "move message to the trash"
-# tag macros
-macro index \Ca "<tag-prefix-cond><save-message>+nullpointer/Archive<enter>" "move tagged messages to archive"
-macro index \Cs "<tag-prefix-cond><save-message>+nullpointer/Junk<enter>" "move tagged messages to spam"
-macro index \Cd "<tag-prefix-cond><save-message>+nullpointer/Trash<enter>" "move tagged messages to trash"

mail/.config/neomutt/accounts/rawlinson

@@ -11,10 +11,11 @@ set record = "+rawlinson/Sent"
 
 set realname = "George Rawlinson"
 set from = "george@rawlinson.net.nz"
+set signature = "~/.config/neomutt/signature"
 
 # smtp settings
 set smtp_pass = `pass mail/george@rawlinson.net.nz`
-set smtp_url = smtp://$from@smtp.nullpointer.io:587
+set smtp_url = smtps://$from@smtp.little.kiwi
 
 # rawlinson specific macros
 macro index A "<save-message>+rawlinson/Archive<enter>" "move message to the archive"

mail/.config/neomutt/hooks

@@ -1,5 +1,6 @@
 # folder hooks for different accounts
 folder-hook rawlinson/*   source ~/.config/neomutt/accounts/rawlinson
-folder-hook nullpointer/* source ~/.config/neomutt/accounts/nullpointer
+folder-hook archlinux/*   source ~/.config/neomutt/accounts/archlinux
+#folder-hook accountname/* source ~/.config/neomutt/accounts/accountname
 
 source ~/.config/neomutt/accounts/rawlinson # default account

mail/.config/neomutt/mailboxes

@@ -1,6 +1,7 @@
-named-mailboxes ":: rawlinson" ~/.config/neomutt/div_rw
+named-mailboxes ":: rawlinson" "+rawlinson/INBOX"
 mailboxes `find ~/.mail/rawlinson -type d -name cur | sort | sed -e 's:/cur/*$::' -e 's/ /\\ /g' | tr '\n' ' '`
-named-mailboxes ":: nullpointer" ~/.config/neomutt/div_np
+named-mailboxes ":: archlinux" "+archlinux/INBOX"
-mailboxes `find ~/.mail/nullpointer -type d -name cur | sort | sed -e 's:/cur/*$::' -e 's/ /\\ /g' | tr '\n' ' '`
+mailboxes `find ~/.mail/archlinux -type d -name cur | sort | sed -e 's:/cur/*$::' -e 's/ /\\ /g' | tr '\n' ' '`
+#mailboxes `find ~/.mail/accountname -type d -name cur | sort | sed -e 's:/cur/*$::' -e 's/ /\\ /g' | tr '\n' ' '`
 
 # vim: syntax=muttrc

mail/.config/neomutt/signature

@@ -0,0 +1 @@
+George Rawlinson

mail/.mbsyncrc

@@ -3,9 +3,11 @@ Create Both
 Expunge Both
 SyncState *
 
-# rawlinson
+#
+# george@rawlinson.net.nz
+#
 IMAPAccount rawlinson
-    Host imap.nullpointer.io
+    Host imap.little.kiwi
     User george@rawlinson.net.nz
     PassCmd "pass mail/george@rawlinson.net.nz" # get password from pass
     AuthMechs LOGIN
@@ -22,33 +24,33 @@ MaildirStore rawlinson-local
 
 # folders
 Channel rawlinson-inbox
-    Master :rawlinson-remote:INBOX
+    Far :rawlinson-remote:INBOX
-    Slave :rawlinson-local:INBOX
+    Near :rawlinson-local:INBOX
 
 Channel rawlinson-archive
-    Master :rawlinson-remote:Archive
+    Far :rawlinson-remote:Archive
-    Slave :rawlinson-local:Archive
+    Near :rawlinson-local:Archive
 
 Channel rawlinson-drafts
-    Master :rawlinson-remote:Drafts
+    Far :rawlinson-remote:Drafts
-    Slave :rawlinson-local:Drafts
+    Near :rawlinson-local:Drafts
 
 Channel rawlinson-junk
-    Master :rawlinson-remote:Junk
+    Far :rawlinson-remote:Junk
-    Slave :rawlinson-local:Junk
+    Near :rawlinson-local:Junk
 
 Channel rawlinson-sent
-    Master :rawlinson-remote:Sent
+    Far :rawlinson-remote:Sent
-    Slave :rawlinson-local:Sent
+    Near :rawlinson-local:Sent
 
 Channel rawlinson-trash
-    Master :rawlinson-remote:Trash
+    Far :rawlinson-remote:Trash
-    Slave :rawlinson-local:Trash
+    Near :rawlinson-local:Trash
 
 # all folders except above
 Channel rawlinson-folders
-    Master :rawlinson-remote:
+    Far :rawlinson-remote:
-    Slave :rawlinson-local:
+    Near :rawlinson-local:
     Patterns * !INBOX !Archive !Drafts !Junk !Sent !Trash
 
 # group all channels, so they can be sync'd with one command `mbsync rawlinson`
@@ -61,62 +63,62 @@ Group rawlinson
     Channel rawlinson-sent
     Channel rawlinson-folders
 
-
+#
-# nullpointer
+# grawlinson@archlinux.org
-IMAPAccount nullpointer
+#
-    Host imap.nullpointer.io
+IMAPAccount archlinux
-    User george@nullpointer.io
+    Host mail.archlinux.org
-    PassCmd "pass mail/george@nullpointer.io" # get password from pass
+    User grawlinson
+    PassCmd "pass mail/grawlinson@archlinux.org" # get password from pass
     AuthMechs LOGIN
     SSLType IMAPS
 
 # remote storage
-IMAPStore nullpointer-remote
+IMAPStore archlinux-remote
-    Account nullpointer
+    Account archlinux
 
 # local storage
-MaildirStore nullpointer-local
+MaildirStore archlinux-local
-    Path ~/.mail/nullpointer/ # must append slash to specify directory
+    Path ~/.mail/archlinux/ # must append slash to specify directory
-    Inbox ~/.mail/nullpointer/INBOX # place inbox inside mail dir
+    Inbox ~/.mail/archlinux/INBOX # place inbox inside mail dir
 
 # folders
-Channel nullpointer-inbox
+Channel archlinux-inbox
-    Master :nullpointer-remote:INBOX
+    Far :archlinux-remote:INBOX
-    Slave :nullpointer-local:INBOX
+    Near :archlinux-local:INBOX
 
-Channel nullpointer-archive
+Channel archlinux-archive
-    Master :nullpointer-remote:Archive
+    Far :archlinux-remote:Archive
-    Slave :nullpointer-local:Archive
+    Near :archlinux-local:Archive
 
-Channel nullpointer-drafts
+Channel archlinux-drafts
-    Master :nullpointer-remote:Drafts
+    Far :archlinux-remote:Drafts
-    Slave :nullpointer-local:Drafts
+    Near :archlinux-local:Drafts
 
-Channel nullpointer-junk
+Channel archlinux-junk
-    Master :nullpointer-remote:Junk
+    Far :archlinux-remote:Junk
-    Slave :nullpointer-local:Junk
+    Near :archlinux-local:Junk
 
-Channel nullpointer-sent
+Channel archlinux-sent
-    Master :nullpointer-remote:Sent
+    Far :archlinux-remote:Sent
-    Slave :nullpointer-local:Sent
+    Near :archlinux-local:Sent
 
-Channel nullpointer-trash
+Channel archlinux-trash
-    Master :nullpointer-remote:Trash
+    Far :archlinux-remote:Trash
-    Slave :nullpointer-local:Trash
+    Near :archlinux-local:Trash
 
 # all folders except above
-Channel nullpointer-folders
+Channel archlinux-folders
-    Master :nullpointer-remote:
+    Far :archlinux-remote:
-    Slave :nullpointer-local:
+    Near :archlinux-local:
     Patterns * !INBOX !Archive !Drafts !Junk !Sent !Trash
 
-# group all channels, so they can be sync'd with one command `mbsync nullpointer`
+# group all channels, so they can be sync'd with one command `mbsync archlinux`
-Group nullpointer
+Group archlinux
-    Channel nullpointer-trash
+    Channel archlinux-trash
-    Channel nullpointer-inbox
+    Channel archlinux-inbox
-    Channel nullpointer-archive
+    Channel archlinux-archive
-    Channel nullpointer-drafts
+    Channel archlinux-drafts
-    Channel nullpointer-junk
+    Channel archlinux-junk
-    Channel nullpointer-sent
+    Channel archlinux-sent
-    Channel nullpointer-folders
+    Channel archlinux-folders
-

mail/.notmuch-config

@@ -11,7 +11,7 @@
 # configured here named ".notmuch".
 #
 [database]
-path=/home/george/.mail
+path=.mail
 
 # User configuration
 #
@@ -31,7 +31,7 @@ path=/home/george/.mail
 [user]
 name=George Rawlinson
 primary_email=george@rawlinson.net.nz
-other_email=george@nullpointer.io;
+other_email=george@nullpointer.io;grawlinson@archlinux.org
 
 # Configuration for "notmuch new"
 #

zsh/.config/zsh/source/colours.zsh

@@ -0,0 +1,10 @@
+#
+# colours
+#
+
+# generate themed colours (solarized-dark)
+if command -v vivid &> /dev/null; then
+  export LS_COLORS="$(vivid generate solarized-dark)"
+fi
+
+# vim: ft=zsh expandtab tabstop=2 shiftwidth=2

zsh/.config/zsh/source/environnment.zsh

@@ -0,0 +1,9 @@
+#
+# environment variables
+#
+
+export EDITOR="vim"
+
+# locale
+export LANG='en_NZ.UTF-8'
+export LC_ALL='en_NZ.UTF-8'

zsh/.config/zsh/zshrc.local

@@ -2,6 +2,11 @@
 # local zsh file
 #
 
+# PKGBUILD checker
+if command -v shellcheck &> /dev/null; then
+  alias pbcheck='SHELLCHECK_OPTS="-e SC2034 -e SC2164 -e SC2154 -e SC2148" shellcheck'
+fi
+
 # weechat
 if command -v weechat &> /dev/null; then
   # Conform to XDG base directory specifications
@@ -28,6 +33,7 @@ fi
 # rust/cargo
 if command -v cargo &> /dev/null; then
   # Add cargo binary directory to $PATH
+  # this assumes CARGO_HOME is unset
   path+=("$HOME/.cargo/bin")
 fi
 
@@ -63,15 +69,6 @@ if command -v npm &> /dev/null; then
   export MANPATH
 fi
 
-# go
-if command -v go &> /dev/null; then
-  # Export $GOPATH
-  export GOPATH="$HOME/Code/go"
-
-  # Add Go binary directory to $PATH
-  path+=("$GOPATH/bin")
-fi
-
 # finally, export $PATH
 export PATH