FunctionalHacker/dotfiles
FunctionalHacker/dotfiles
2
0
Fork 0
Code Issues 1 Pull requests 1 Releases Activity

Working on migrating to neomutt

Browse source
This commit is contained in:
Marko Korhonen 2020-11-21 15:37:58 +02:00
parent 4f1b4b54d3
commit 4bdd1ca610
14 changed files with 153 additions and 191 deletions
Download patch file Download diff file Expand all files Collapse all files

13
home/.config/imapnotify/admin@korhonen.cc.conf Normal file
View file

@ -0,0 +1,13 @@
{
"host": "imap.migadu.com",
"port": 993,
"tls": true,
"tlsOptions": {
"rejectUnauthorized": true
},
"username": "admin@korhonen.cc",
"password": "{{@@ env['PASS_EMAIL_ADMIN'] @@}}",
"onNewMail": "mbsync admin@korhonen.cc",
"onNewMailPost": "",
"boxes": [ "INBOX" ]
}

13
home/.config/imapnotify/marko@korhonen.cc.conf Normal file
View file

@ -0,0 +1,13 @@
{
"host": "imap.migadu.com",
"port": 993,
"tls": true,
"tlsOptions": {
"rejectUnauthorized": true
},
"username": "marko@korhonen.cc",
"password": "{{@@ env['PASS_EMAIL_MARKO'] @@}}",
"onNewMail": "mbsync marko@korhonen.cc",
"onNewMailPost": "",
"boxes": [ "INBOX" ]
}

4
home/.config/neomutt/accounts/marko.korhonen@reekynet.com → home/.config/neomutt/accounts/admin@korhonen.cc
View file

@ -1,6 +1,6 @@
# vim: filetype=muttrc
# vim: filetype=neomuttrc
set my_email = "marko.korhonen@reekynet.com"
set my_email = "admin@korhonen.cc"
set from = $my_email
set sendmail = "/usr/bin/msmtp -a $my_email"
set realname = "Marko Korhonen"

14
home/.config/neomutt/accounts/admin@reekynet.com
View file

@ -1,14 +0,0 @@
# vim: filetype=muttrc
set my_email = "admin@reekynet.com"
set from = $my_email
set sendmail = "/usr/bin/msmtp -a $my_email"
set realname = "ReekyNET Admin"
set status_format = "-%r-Mutt: $my_email %f [Msgs:%?M?%M/?%m%?n? New:%n?%?o? Old:%o?%?d? Del:%d?%?F? Flag:%F?%?t? Tag:%t?%?p? Post:%p?%?b? Inc:%b?%?l? %l?]---(%s/%S)-%>-(%P)---"
set mbox_type = Maildir
set folder = "~/.mail/$my_email"
set mbox = "+INBOX"
set record = "+INBOX"
set postponed = "+Drafts"
set spoolfile = "+INBOX"
mailboxes = +INBOX

8
home/.config/neomutt/accounts/marko.korhonen@metropolia.fi → home/.config/neomutt/accounts/marko@korhonen.cc
View file

@ -1,8 +1,8 @@
# vim: filetype=muttrc
# vim: filetype=neomuttrc
set my_email = "marko.korhonen@metropolia.fi"
set from = $my_email
set sendmail = "/usr/bin/msmtp -a $my_email"
set my_email = "marko@korhonen.cc"
set from = $my_email
set sendmail = "/usr/bin/msmtp -a $my_email"
set realname = "Marko Korhonen"
set status_format = "-%r-Mutt: $my_email %f [Msgs:%?M?%M/?%m%?n? New:%n?%?o? Old:%o?%?d? Del:%d?%?F? Flag:%F?%?t? Tag:%t?%?p? Post:%p?%?b? Inc:%b?%?l? %l?]---(%s/%S)-%>-(%P)---"
set mbox_type = Maildir

15
home/.config/neomutt/accounts/reekymarko@reekynet.com
View file

@ -1,15 +0,0 @@
# vim: filetype=muttrc
# Incoming mail from maildir
set my_email = "reekymarko@reekynet.com"
set from = $my_email
set sendmail = "/usr/bin/msmtp -a $my_email"
set realname = "Marko Korhonen"
set status_format = "-%r-Mutt: $my_email %f [Msgs:%?M?%M/?%m%?n? New:%n?%?o? Old:%o?%?d? Del:%d?%?F? Flag:%F?%?t? Tag:%t?%?p? Post:%p?%?b? Inc:%b?%?l? %l?]---(%s/%S)-%>-(%P)---"
set mbox_type = Maildir
set folder = ~/.mail/$my_email
set mbox = +INBOX
set record = +Sent
set postponed = +Drafts
set spoolfile = +INBOX
mailboxes = +INBOX

10
home/.config/neomutt/neomuttrc
View file

@ -1,4 +1,4 @@
# vim: filetype=muttrc
# vim: filetype=neomuttrc
set sendmail = "/usr/bin/msmtp"
set mbox_type = Maildir
@ -7,9 +7,7 @@ set spoolfile = +Personal/INBOX
source ~/.config/neomutt/appearance
source ~/.config/neomutt/sidebar
source ~/.config/neomutt/accounts/reekymarko@reekynet.com
source ~/.config/neomutt/accounts/marko@korhonen.cc
macro index <f2> '<sync-mailbox><enter-command>source ~/.config/neomutt/accounts/reekymarko@reekynet.com<enter><change-folder>!<enter>'
macro index <f3> '<sync-mailbox><enter-command>source ~/.config/neomutt/accounts/marko.korhonen@reekynet.com<enter><change-folder>!<enter>'
macro index <f4> '<sync-mailbox><enter-command>source ~/.config/neomutt/accounts/admin@reekynet.com<enter><change-folder>!<enter>'
macro index <f5> '<sync-mailbox><enter-command>source ~/.config/neomutt/accounts/marko.korhonen@metropolia.fi<enter><change-folder>!<enter>'
macro index <f2> '<sync-mailbox><enter-command>source ~/.config/neomutt/accounts/marko@korhonen.cc<enter><change-folder>!<enter>'
macro index <f3> '<sync-mailbox><enter-command>source ~/.config/neomutt/accounts/admin@korhonen.cc<enter><change-folder>!<enter>'

2
home/.config/neomutt/sidebar
View file

@ -1,4 +1,4 @@
# vim: filetype=muttrc
# vim: filetype=neomuttrc
set sidebar_visible = yes
set sidebar_indent_string = ' '

4
home/.config/zsh/01-env.zsh
View file

@ -27,8 +27,8 @@ export FZF_CTRL_T_OPTS='--preview "/usr/bin/cat {} | nvimpager -c "'
# use lesspipe with less
export LESSOPEN="|lesspipe.sh %s"
# dotdrop repository location
export DOTREPO="$HOME/Git/dotfiles"
# dotfile repository location
export DOTREPO="$HOME/git/dotfiles"
# nvim ftw!
export EDITOR=nvim

6
home/.config/zsh/03-aliases.zsh
View file

@ -117,8 +117,8 @@ cpufreq() { watch -n 1 eval "cat /proc/cpuinfo | grep MHz" }
# dotdrop
updatesecrets() { bash $DOTREPO/secrets/secrets.sh; chmod 600 $DOTREPO/secrets/secrets }
dotdrop() { source $DOTREPO/secrets/secrets && $DOTREPO/dotdrop/dotdrop.sh --cfg=$DOTREPO/config-home.yaml $@ }
sdotdrop() { source $DOTREPO/secrets/secrets && sudo -E $DOTREPO/dotdrop/dotdrop.sh --cfg=$DOTREPO/config-root.yaml $@ }
dotdrop() { source $DOTREPO/secrets/secrets && $DOTREPO/dotdrop.sh --cfg=$DOTREPO/config-home.yaml $@ }
sdotdrop() { source $DOTREPO/secrets/secrets && sudo -E $DOTREPO/dotdrop.sh --cfg=$DOTREPO/config-root.yaml $@ }
compdef _dotdrop-completion.zsh sdotdrop
alias dotgit='git -C $DOTREPO'
dotsync() { cd $DOTREPO && gpull && ga && gc && gpush && cd $OLDPWD }
@ -156,7 +156,7 @@ update() {
}
docker-update() {
for dir in $HOME/Git/dotfiles/docker/*; do
for dir in $HOME/git/dotfiles/docker/*; do
cd $dir
docker-compose pull
docker-compose up -d

99
home/.mbsyncrc
View file

@ -1,99 +1,48 @@
### reekymarko@reekynet.com #####################################
IMAPAccount reekymarko@reekynet.com
### marko@korhonen.cc #####################################
IMAPAccount marko@korhonen.cc
Host imap.migadu.com
User reekymarko@reekynet.com
PassCmd "pass email/reekymarko@reekynet.com | head -n 1"
User marko@korhonen.cc
Pass "{{@@ env['PASS_EMAIL_MARKO'] @@}}"
SSLType IMAPS
Port 993
CertificateFile /etc/ssl/certs/ca-certificates.crt
IMAPStore reekymarko@reekynet.com-remote
Account reekymarko@reekynet.com
IMAPStore marko@korhonen.cc-remote
Account marko@korhonen.cc
MaildirStore reekymarko@reekynet.com-local
MaildirStore marko@korhonen.cc-local
Subfolders Verbatim
Path ~/.mail/reekymarko@reekynet.com/
Inbox ~/.mail/reekymarko@reekynet.com/INBOX
Path ~/.mail/marko@korhonen.cc/
Inbox ~/.mail/marko@korhonen.cc/INBOX
Channel reekymarko@reekynet.com
Master :reekymarko@reekynet.com-remote:
Slave :reekymarko@reekynet.com-local:
Channel marko@korhonen.cc
Master :marko@korhonen.cc-remote:
Slave :marko@korhonen.cc-local:
Create Both
Patterns *
SyncState *
#################################################################
### marko.korhonen@reekynet.com #####################################
IMAPAccount marko.korhonen@reekynet.com
### admin@korhonen.cc #####################################
IMAPAccount admin@korhonen.cc
Host imap.migadu.com
User marko.korhonen@reekynet.com
PassCmd "pass email/marko.korhonen@reekynet.com | head -n 1"
User admin@korhonen.cc
Pass "{{@@ env['PASS_EMAIL_ADMIN'] @@}}"
SSLType IMAPS
Port 993
CertificateFile /etc/ssl/certs/ca-certificates.crt
IMAPStore marko.korhonen@reekynet.com-remote
Account marko.korhonen@reekynet.com
IMAPStore admin@korhonen.cc-remote
Account admin@korhonen.cc
MaildirStore marko.korhonen@reekynet.com-local
MaildirStore admin@korhonen.cc-local
Subfolders Verbatim
Path ~/.mail/marko.korhonen@reekynet.com/
Inbox ~/.mail/marko.korhonen@reekynet.com/INBOX
Path ~/.mail/admin@korhonen.cc/
Inbox ~/.mail/admin@korhonen.cc/INBOX
Channel marko.korhonen@reekynet.com
Master :marko.korhonen@reekynet.com-remote:
Slave :marko.korhonen@reekynet.com-local:
Create Both
Patterns *
SyncState *
#################################################################
### admin@reekynet.com #####################################
IMAPAccount admin@reekynet.com
Host imap.migadu.com
User admin@reekynet.com
PassCmd "pass email/admin@reekynet.com | head -n 1"
SSLType IMAPS
Port 993
CertificateFile /etc/ssl/certs/ca-certificates.crt
IMAPStore admin@reekynet.com-remote
Account admin@reekynet.com
MaildirStore admin@reekynet.com-local
Subfolders Verbatim
Path ~/.mail/admin@reekynet.com/
Inbox ~/.mail/admin@reekynet.com/INBOX
Channel admin@reekynet.com
Master :admin@reekynet.com-remote:
Slave :admin@reekynet.com-local:
Create Both
Patterns *
SyncState *
#################################################################
### marko.korhonen@metropolia.fi #####################################
IMAPAccount marko.korhonen@metropolia.fi
Host imap.metropolia.fi
User markoak
PassCmd "pass email/marko.korhonen@metropolia.fi | head -n 1"
SSLType IMAPS
Port 993
CertificateFile /etc/ssl/certs/ca-certificates.crt
IMAPStore marko.korhonen@metropolia.fi-remote
Account marko.korhonen@metropolia.fi
MaildirStore marko.korhonen@metropolia.fi-local
Subfolders Verbatim
Path ~/.mail/marko.korhonen@metropolia.fi/
Inbox ~/.mail/marko.korhonen@metropolia.fi/INBOX
Channel marko.korhonen@metropolia.fi
Master :marko.korhonen@metropolia.fi-remote:
Slave :marko.korhonen@metropolia.fi-local:
Channel admin@korhonen.cc
Master :admin@korhonen.cc-remote:
Slave :admin@korhonen.cc-local:
Create Both
Patterns *
SyncState *