Merge? Merge! Merge.
This commit is contained in:
commit
5d63526f97
GPG Key ID:
E0959FEA8B550539
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
|
@ -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"
|
||||
|
|
@ -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"
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
mailboxes `find ~/.mail/nullpointer -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
|
||||
|
|
|
|||
|
|
@ -0,0 +1 @@
|
|||
George Rawlinson
|
||||
118
mail/.mbsyncrc
118
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
|
||||
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`
|
||||
|
|
@ -61,62 +63,62 @@ Group rawlinson
|
|||
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
|
||||
#
|
||||
# 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 nullpointer-remote
|
||||
Account nullpointer
|
||||
IMAPStore archlinux-remote
|
||||
Account archlinux
|
||||
|
||||
# local storage
|
||||
MaildirStore nullpointer-local
|
||||
Path ~/.mail/nullpointer/ # must append slash to specify directory
|
||||
Inbox ~/.mail/nullpointer/INBOX # place inbox inside mail dir
|
||||
MaildirStore archlinux-local
|
||||
Path ~/.mail/archlinux/ # must append slash to specify directory
|
||||
Inbox ~/.mail/archlinux/INBOX # place inbox inside mail dir
|
||||
|
||||
# folders
|
||||
Channel nullpointer-inbox
|
||||
Master :nullpointer-remote:INBOX
|
||||
Slave :nullpointer-local:INBOX
|
||||
Channel archlinux-inbox
|
||||
Far :archlinux-remote:INBOX
|
||||
Near :archlinux-local:INBOX
|
||||
|
||||
Channel nullpointer-archive
|
||||
Master :nullpointer-remote:Archive
|
||||
Slave :nullpointer-local:Archive
|
||||
Channel archlinux-archive
|
||||
Far :archlinux-remote:Archive
|
||||
Near :archlinux-local:Archive
|
||||
|
||||
Channel nullpointer-drafts
|
||||
Master :nullpointer-remote:Drafts
|
||||
Slave :nullpointer-local:Drafts
|
||||
Channel archlinux-drafts
|
||||
Far :archlinux-remote:Drafts
|
||||
Near :archlinux-local:Drafts
|
||||
|
||||
Channel nullpointer-junk
|
||||
Master :nullpointer-remote:Junk
|
||||
Slave :nullpointer-local:Junk
|
||||
Channel archlinux-junk
|
||||
Far :archlinux-remote:Junk
|
||||
Near :archlinux-local:Junk
|
||||
|
||||
Channel nullpointer-sent
|
||||
Master :nullpointer-remote:Sent
|
||||
Slave :nullpointer-local:Sent
|
||||
Channel archlinux-sent
|
||||
Far :archlinux-remote:Sent
|
||||
Near :archlinux-local:Sent
|
||||
|
||||
Channel nullpointer-trash
|
||||
Master :nullpointer-remote:Trash
|
||||
Slave :nullpointer-local:Trash
|
||||
Channel archlinux-trash
|
||||
Far :archlinux-remote:Trash
|
||||
Near :archlinux-local:Trash
|
||||
|
||||
# all folders except above
|
||||
Channel nullpointer-folders
|
||||
Master :nullpointer-remote:
|
||||
Slave :nullpointer-local:
|
||||
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 nullpointer`
|
||||
Group nullpointer
|
||||
Channel nullpointer-trash
|
||||
Channel nullpointer-inbox
|
||||
Channel nullpointer-archive
|
||||
Channel nullpointer-drafts
|
||||
Channel nullpointer-junk
|
||||
Channel nullpointer-sent
|
||||
Channel nullpointer-folders
|
||||
|
||||
# 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
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
#
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
@ -0,0 +1,9 @@
|
|||
#
|
||||
# environment variables
|
||||
#
|
||||
|
||||
export EDITOR="vim"
|
||||
|
||||
# locale
|
||||
export LANG='en_NZ.UTF-8'
|
||||
export LC_ALL='en_NZ.UTF-8'
|
||||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue