From 82b26e9139332b78ea923c65a864f525922f031d Mon Sep 17 00:00:00 2001 From: George Rawlinson Date: Tue, 23 Mar 2021 23:29:38 +0000 Subject: [PATCH 1/9] fix(mail): remove old account --- mail/.config/neomutt/accounts/nullpointer | 26 ------- mail/.config/neomutt/accounts/rawlinson | 2 +- mail/.config/neomutt/hooks | 2 +- mail/.config/neomutt/mailboxes | 4 +- mail/.mbsyncrc | 90 ++++------------------- mail/.notmuch-config | 2 +- 6 files changed, 19 insertions(+), 107 deletions(-) delete mode 100644 mail/.config/neomutt/accounts/nullpointer diff --git a/mail/.config/neomutt/accounts/nullpointer b/mail/.config/neomutt/accounts/nullpointer deleted file mode 100644 index 279b2fc..0000000 --- a/mail/.config/neomutt/accounts/nullpointer +++ /dev/null @@ -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 "+nullpointer/Archive" "move message to the archive" -macro index S "+nullpointer/Junk" "mark message as spam" -macro index D "+nullpointer/Trash" "move message to the trash" -# tag macros -macro index \Ca "+nullpointer/Archive" "move tagged messages to archive" -macro index \Cs "+nullpointer/Junk" "move tagged messages to spam" -macro index \Cd "+nullpointer/Trash" "move tagged messages to trash" diff --git a/mail/.config/neomutt/accounts/rawlinson b/mail/.config/neomutt/accounts/rawlinson index 91ab04c..c2206f0 100644 --- a/mail/.config/neomutt/accounts/rawlinson +++ b/mail/.config/neomutt/accounts/rawlinson @@ -14,7 +14,7 @@ set from = "george@rawlinson.net.nz" # 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 "+rawlinson/Archive" "move message to the archive" diff --git a/mail/.config/neomutt/hooks b/mail/.config/neomutt/hooks index 701db83..5eb409a 100644 --- a/mail/.config/neomutt/hooks +++ b/mail/.config/neomutt/hooks @@ -1,5 +1,5 @@ # folder hooks for different accounts folder-hook rawlinson/* source ~/.config/neomutt/accounts/rawlinson -folder-hook nullpointer/* source ~/.config/neomutt/accounts/nullpointer +#folder-hook accountname/* source ~/.config/neomutt/accounts/accountname source ~/.config/neomutt/accounts/rawlinson # default account diff --git a/mail/.config/neomutt/mailboxes b/mail/.config/neomutt/mailboxes index f08cdb2..87d6374 100644 --- a/mail/.config/neomutt/mailboxes +++ b/mail/.config/neomutt/mailboxes @@ -1,6 +1,4 @@ -named-mailboxes ":: rawlinson" ~/.config/neomutt/div_rw 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 -mailboxes `find ~/.mail/nullpointer -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 diff --git a/mail/.mbsyncrc b/mail/.mbsyncrc index 5f0d7b8..e45f01a 100644 --- a/mail/.mbsyncrc +++ b/mail/.mbsyncrc @@ -5,7 +5,7 @@ SyncState * # rawlinson 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 +22,33 @@ MaildirStore rawlinson-local # folders Channel rawlinson-inbox - Master :rawlinson-remote:INBOX - Slave :rawlinson-local:INBOX + Far :rawlinson-remote:INBOX + Near :rawlinson-local:INBOX Channel rawlinson-archive - Master :rawlinson-remote:Archive - Slave :rawlinson-local:Archive + Far :rawlinson-remote:Archive + Near :rawlinson-local:Archive Channel rawlinson-drafts - Master :rawlinson-remote:Drafts - Slave :rawlinson-local:Drafts + Far :rawlinson-remote:Drafts + Near :rawlinson-local:Drafts Channel rawlinson-junk - Master :rawlinson-remote:Junk - Slave :rawlinson-local:Junk + Far :rawlinson-remote:Junk + Near :rawlinson-local:Junk Channel rawlinson-sent - Master :rawlinson-remote:Sent - Slave :rawlinson-local:Sent + Far :rawlinson-remote:Sent + Near :rawlinson-local:Sent Channel rawlinson-trash - Master :rawlinson-remote:Trash - Slave :rawlinson-local:Trash + Far :rawlinson-remote:Trash + Near :rawlinson-local:Trash # all folders except above Channel rawlinson-folders - Master :rawlinson-remote: - Slave :rawlinson-local: + Far :rawlinson-remote: + Near :rawlinson-local: Patterns * !INBOX !Archive !Drafts !Junk !Sent !Trash # group all channels, so they can be sync'd with one command `mbsync rawlinson` @@ -60,63 +60,3 @@ Group rawlinson Channel rawlinson-junk Channel rawlinson-sent Channel rawlinson-folders - - -# nullpointer -IMAPAccount nullpointer - Host imap.nullpointer.io - User george@nullpointer.io - PassCmd "pass mail/george@nullpointer.io" # get password from pass - AuthMechs LOGIN - SSLType IMAPS - -# remote storage -IMAPStore nullpointer-remote - Account nullpointer - -# local storage -MaildirStore nullpointer-local - Path ~/.mail/nullpointer/ # must append slash to specify directory - Inbox ~/.mail/nullpointer/INBOX # place inbox inside mail dir - -# folders -Channel nullpointer-inbox - Master :nullpointer-remote:INBOX - Slave :nullpointer-local:INBOX - -Channel nullpointer-archive - Master :nullpointer-remote:Archive - Slave :nullpointer-local:Archive - -Channel nullpointer-drafts - Master :nullpointer-remote:Drafts - Slave :nullpointer-local:Drafts - -Channel nullpointer-junk - Master :nullpointer-remote:Junk - Slave :nullpointer-local:Junk - -Channel nullpointer-sent - Master :nullpointer-remote:Sent - Slave :nullpointer-local:Sent - -Channel nullpointer-trash - Master :nullpointer-remote:Trash - Slave :nullpointer-local:Trash - -# all folders except above -Channel nullpointer-folders - Master :nullpointer-remote: - Slave :nullpointer-local: - Patterns * !INBOX !Archive !Drafts !Junk !Sent !Trash - -# group all channels, so they can be sync'd with one command `mbsync nullpointer` -Group nullpointer - Channel nullpointer-trash - Channel nullpointer-inbox - Channel nullpointer-archive - Channel nullpointer-drafts - Channel nullpointer-junk - Channel nullpointer-sent - Channel nullpointer-folders - diff --git a/mail/.notmuch-config b/mail/.notmuch-config index 08b194c..a586583 100644 --- a/mail/.notmuch-config +++ b/mail/.notmuch-config @@ -11,7 +11,7 @@ # configured here named ".notmuch". # [database] -path=/home/george/.mail +path=.mail # User configuration # From acee48c2fa66651e8e314e59434e44ef98e90b42 Mon Sep 17 00:00:00 2001 From: George Rawlinson Date: Wed, 24 Mar 2021 07:17:01 +0000 Subject: [PATCH 2/9] sh: remove $GOPATH due to go 1.16 --- zsh/.config/zsh/zshrc.local | 9 --------- 1 file changed, 9 deletions(-) diff --git a/zsh/.config/zsh/zshrc.local b/zsh/.config/zsh/zshrc.local index 87a30a6..2ace15f 100644 --- a/zsh/.config/zsh/zshrc.local +++ b/zsh/.config/zsh/zshrc.local @@ -63,15 +63,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 From f4023ec9a1e8ff68c9d7fbb0f9c24acebc1c8767 Mon Sep 17 00:00:00 2001 From: George Rawlinson Date: Thu, 13 May 2021 23:48:58 +0000 Subject: [PATCH 3/9] fix(git): updated smtp server --- git/.config/git/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git/.config/git/config b/git/.config/git/config index c2cdaaf..4a66128 100644 --- a/git/.config/git/config +++ b/git/.config/git/config @@ -32,7 +32,7 @@ gpgsign = true [sendemail] - smtpserver = smtp.nullpointer.io + smtpserver = smtp.little.kiwi smtpuser = george@rawlinson.net.nz smtpencryption = tls smtpserverport = 587 From 76c927597b95cc8a5e2c26eba091f1072a2f1026 Mon Sep 17 00:00:00 2001 From: George Rawlinson Date: Thu, 8 Jul 2021 15:10:47 +0000 Subject: [PATCH 4/9] feat(mail): add archlinux config --- mail/.config/neomutt/accounts/archlinux | 27 +++++++++++ mail/.config/neomutt/accounts/rawlinson | 1 + mail/.config/neomutt/{div_np => div_al} | 0 mail/.config/neomutt/hooks | 1 + mail/.config/neomutt/mailboxes | 3 ++ mail/.config/neomutt/signature | 1 + mail/.mbsyncrc | 64 ++++++++++++++++++++++++- mail/.notmuch-config | 2 +- 8 files changed, 97 insertions(+), 2 deletions(-) create mode 100644 mail/.config/neomutt/accounts/archlinux rename mail/.config/neomutt/{div_np => div_al} (100%) create mode 100644 mail/.config/neomutt/signature diff --git a/mail/.config/neomutt/accounts/archlinux b/mail/.config/neomutt/accounts/archlinux new file mode 100644 index 0000000..13cbd49 --- /dev/null +++ b/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 "+archlinux/Archive" "move message to the archive" +macro index S "+archlinux/Junk" "mark message as spam" +macro index D "+archlinux/Trash" "move message to the trash" +# tag macros +macro index \Ca "+archlinux/Archive" "move tagged messages to archive" +macro index \Cs "+archlinux/Junk" "move tagged messages to spam" +macro index \Cd "+archlinux/Trash" "move tagged messages to trash" diff --git a/mail/.config/neomutt/accounts/rawlinson b/mail/.config/neomutt/accounts/rawlinson index c2206f0..350bf62 100644 --- a/mail/.config/neomutt/accounts/rawlinson +++ b/mail/.config/neomutt/accounts/rawlinson @@ -11,6 +11,7 @@ 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` diff --git a/mail/.config/neomutt/div_np b/mail/.config/neomutt/div_al similarity index 100% rename from mail/.config/neomutt/div_np rename to mail/.config/neomutt/div_al diff --git a/mail/.config/neomutt/hooks b/mail/.config/neomutt/hooks index 5eb409a..2839452 100644 --- a/mail/.config/neomutt/hooks +++ b/mail/.config/neomutt/hooks @@ -1,5 +1,6 @@ # folder hooks for different accounts folder-hook rawlinson/* source ~/.config/neomutt/accounts/rawlinson +folder-hook archlinux/* source ~/.config/neomutt/accounts/archlinux #folder-hook accountname/* source ~/.config/neomutt/accounts/accountname source ~/.config/neomutt/accounts/rawlinson # default account diff --git a/mail/.config/neomutt/mailboxes b/mail/.config/neomutt/mailboxes index 87d6374..e345a11 100644 --- a/mail/.config/neomutt/mailboxes +++ b/mail/.config/neomutt/mailboxes @@ -1,4 +1,7 @@ +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 ":: archlinux" "+archlinux/INBOX" +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 diff --git a/mail/.config/neomutt/signature b/mail/.config/neomutt/signature new file mode 100644 index 0000000..16932e0 --- /dev/null +++ b/mail/.config/neomutt/signature @@ -0,0 +1 @@ +George Rawlinson diff --git a/mail/.mbsyncrc b/mail/.mbsyncrc index e45f01a..6b3d6fe 100644 --- a/mail/.mbsyncrc +++ b/mail/.mbsyncrc @@ -3,7 +3,9 @@ Create Both Expunge Both SyncState * -# rawlinson +# +# george@rawlinson.net.nz +# IMAPAccount rawlinson Host imap.little.kiwi User george@rawlinson.net.nz @@ -60,3 +62,63 @@ Group rawlinson Channel rawlinson-junk Channel rawlinson-sent Channel rawlinson-folders + +# +# grawlinson@archlinux.org +# +IMAPAccount archlinux + Host mail.archlinux.org + User grawlinson + PassCmd "pass mail/grawlinson@archlinux.org" # get password from pass + AuthMechs LOGIN + SSLType IMAPS + +# remote storage +IMAPStore archlinux-remote + Account archlinux + +# local storage +MaildirStore archlinux-local + Path ~/.mail/archlinux/ # must append slash to specify directory + Inbox ~/.mail/archlinux/INBOX # place inbox inside mail dir + +# folders +Channel archlinux-inbox + Far :archlinux-remote:INBOX + Near :archlinux-local:INBOX + +Channel archlinux-archive + Far :archlinux-remote:Archive + Near :archlinux-local:Archive + +Channel archlinux-drafts + Far :archlinux-remote:Drafts + Near :archlinux-local:Drafts + +Channel archlinux-junk + Far :archlinux-remote:Junk + Near :archlinux-local:Junk + +Channel archlinux-sent + Far :archlinux-remote:Sent + Near :archlinux-local:Sent + +Channel archlinux-trash + Far :archlinux-remote:Trash + Near :archlinux-local:Trash + +# all folders except above +Channel archlinux-folders + Far :archlinux-remote: + Near :archlinux-local: + Patterns * !INBOX !Archive !Drafts !Junk !Sent !Trash + +# group all channels, so they can be sync'd with one command `mbsync archlinux` +Group archlinux + Channel archlinux-trash + Channel archlinux-inbox + Channel archlinux-archive + Channel archlinux-drafts + Channel archlinux-junk + Channel archlinux-sent + Channel archlinux-folders diff --git a/mail/.notmuch-config b/mail/.notmuch-config index a586583..1f5e964 100644 --- a/mail/.notmuch-config +++ b/mail/.notmuch-config @@ -31,7 +31,7 @@ path=.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" # From 51ba87a4268b5776ba706c9947cd2fd51b122dec Mon Sep 17 00:00:00 2001 From: George Rawlinson Date: Thu, 8 Jul 2021 17:51:49 +0000 Subject: [PATCH 5/9] feat(zsh): add pbcheck alias --- zsh/.config/zsh/zshrc.local | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/zsh/.config/zsh/zshrc.local b/zsh/.config/zsh/zshrc.local index 2ace15f..20585e8 100644 --- a/zsh/.config/zsh/zshrc.local +++ b/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 From e8fecf3d6d0e711ee6f90cc3343452330431cfb4 Mon Sep 17 00:00:00 2001 From: George Rawlinson Date: Thu, 8 Jul 2021 17:52:15 +0000 Subject: [PATCH 6/9] chore(zsh): whitespace stuff \o/ --- zsh/.config/zsh/zshrc.local | 1 + 1 file changed, 1 insertion(+) diff --git a/zsh/.config/zsh/zshrc.local b/zsh/.config/zsh/zshrc.local index 20585e8..4a1082e 100644 --- a/zsh/.config/zsh/zshrc.local +++ b/zsh/.config/zsh/zshrc.local @@ -33,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 From 68d0452536f5a251d14b27f740a27ec6573e5dba Mon Sep 17 00:00:00 2001 From: George Rawlinson Date: Thu, 8 Jul 2021 17:52:38 +0000 Subject: [PATCH 7/9] feat(zsh): add environment variables * LANG * LC_ALL * EDITOR --- zsh/.config/zsh/source/environnment.zsh | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 zsh/.config/zsh/source/environnment.zsh diff --git a/zsh/.config/zsh/source/environnment.zsh b/zsh/.config/zsh/source/environnment.zsh new file mode 100644 index 0000000..e0b5aa2 --- /dev/null +++ b/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' From 75b64d83167a2ff544fc3e870af9d79275da3a8f Mon Sep 17 00:00:00 2001 From: George Rawlinson Date: Thu, 8 Jul 2021 17:53:21 +0000 Subject: [PATCH 8/9] feat(zsh): use vivid to generate LS_COLORS --- zsh/.config/zsh/source/colours.zsh | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 zsh/.config/zsh/source/colours.zsh diff --git a/zsh/.config/zsh/source/colours.zsh b/zsh/.config/zsh/source/colours.zsh new file mode 100644 index 0000000..96f537f --- /dev/null +++ b/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 From ff7aab774a315191692fdfd9c3ed6d3cc65395e3 Mon Sep 17 00:00:00 2001 From: George Rawlinson Date: Thu, 8 Jul 2021 17:55:09 +0000 Subject: [PATCH 9/9] feat(git): use git-delta for diff/log viewing --- git/.config/git/config | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/git/.config/git/config b/git/.config/git/config index 4a66128..247acc2 100644 --- a/git/.config/git/config +++ b/git/.config/git/config @@ -39,3 +39,16 @@ 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