Working on migrating to neomutt
This commit is contained in:
parent
5b8e176a85
commit
a73d63c6d8
14 changed files with 153 additions and 191 deletions
129
config-home.yaml
129
config-home.yaml
|
@ -19,6 +19,12 @@ dotfiles:
|
|||
d_mpv:
|
||||
dst: ~/.config/mpv
|
||||
src: .config/mpv
|
||||
d_neomutt:
|
||||
dst: ~/.config/neomutt
|
||||
src: .config/neomutt
|
||||
d_goimapnotify:
|
||||
dst: ~/.config/imapnotify
|
||||
src: .config/imapnotify
|
||||
f_init.vim:
|
||||
dst: ~/.config/nvim/init.vim
|
||||
src: .config/nvim/init.vim
|
||||
|
@ -45,6 +51,9 @@ dotfiles:
|
|||
f_abcde.conf:
|
||||
dst: ~/.abcde.conf
|
||||
src: .abcde.conf
|
||||
f_mbsyncrc:
|
||||
dst: ~/.mbsyncrc
|
||||
src: .mbsyncrc
|
||||
f_alacritty.yml:
|
||||
dst: ~/.config/alacritty/alacritty.yml
|
||||
src: .config/alacritty/alacritty.yml
|
||||
|
@ -114,9 +123,6 @@ dotfiles:
|
|||
f_tmux.conf:
|
||||
dst: ~/.tmux.conf
|
||||
src: .tmux.conf
|
||||
f_yay_config.json:
|
||||
dst: ~/.config/yay/config.json
|
||||
src: .config/yay/config.json
|
||||
f_youtube-dl_config:
|
||||
dst: ~/.config/youtube-dl/config
|
||||
src: .config/youtube-dl/config
|
||||
|
@ -147,59 +153,14 @@ dotfiles:
|
|||
f_hushlogin:
|
||||
src: .hushlogin
|
||||
dst: ~/.hushlogin
|
||||
f_paru.conf:
|
||||
src: .config/paru/paru.conf
|
||||
dst: ~/.config/paru/paru.conf
|
||||
profiles:
|
||||
Base:
|
||||
base:
|
||||
dotfiles:
|
||||
- d_systemd
|
||||
Media:
|
||||
dotfiles:
|
||||
- f_beets_config
|
||||
- f_beets_whitelist
|
||||
- f_abcde.conf
|
||||
- d_mpv
|
||||
- f_youtube-dl_config
|
||||
- f_mpd.conf
|
||||
- f_ncmpcpp_bindings
|
||||
- f_ncmpcpp.conf
|
||||
- f_libra_config
|
||||
- f_mpdscribble.conf
|
||||
- f_mpdris2.conf
|
||||
Sway:
|
||||
dotfiles:
|
||||
- d_sway
|
||||
- d_waybar
|
||||
- d_wofi
|
||||
- f_mako_config
|
||||
- f_redshift.conf
|
||||
- f_zathurarc
|
||||
- f_mimeo_associations.txt
|
||||
- f_tdesktop_lang.strings
|
||||
- f_fonts.conf
|
||||
- f_zprofile
|
||||
Pacman:
|
||||
dotfiles:
|
||||
- f_yay_config.json
|
||||
- f_makepkg.conf
|
||||
Mirkwood:
|
||||
include:
|
||||
- Base
|
||||
- Terminal
|
||||
- Media
|
||||
- Sway
|
||||
- Pacman
|
||||
Moria:
|
||||
include:
|
||||
- Terminal
|
||||
- Media
|
||||
- Pacman
|
||||
Gondor:
|
||||
include:
|
||||
- Terminal
|
||||
- Pacman
|
||||
mko-laptop:
|
||||
include:
|
||||
- Terminal
|
||||
Terminal:
|
||||
terminal:
|
||||
dotfiles:
|
||||
- f_nvimpager
|
||||
- f_hushlogin
|
||||
|
@ -220,14 +181,70 @@ profiles:
|
|||
- f_coc-settings.json
|
||||
- f_gitconfig
|
||||
- f_alacritty.yml
|
||||
email:
|
||||
dotfiles:
|
||||
- d_neomutt
|
||||
- d_goimapnotify
|
||||
- f_mbsyncrc
|
||||
media:
|
||||
dotfiles:
|
||||
- f_beets_config
|
||||
- f_beets_whitelist
|
||||
- f_abcde.conf
|
||||
- d_mpv
|
||||
- f_youtube-dl_config
|
||||
- f_mpd.conf
|
||||
- f_ncmpcpp_bindings
|
||||
- f_ncmpcpp.conf
|
||||
- f_libra_config
|
||||
- f_mpdscribble.conf
|
||||
- f_mpdris2.conf
|
||||
sway:
|
||||
dotfiles:
|
||||
- d_sway
|
||||
- d_waybar
|
||||
- d_wofi
|
||||
- f_mako_config
|
||||
- f_redshift.conf
|
||||
- f_zathurarc
|
||||
- f_mimeo_associations.txt
|
||||
- f_tdesktop_lang.strings
|
||||
- f_fonts.conf
|
||||
- f_zprofile
|
||||
Pacman:
|
||||
dotfiles:
|
||||
- f_makepkg.conf
|
||||
- f_paru.conf
|
||||
Mirkwood:
|
||||
include:
|
||||
- base
|
||||
- terminal
|
||||
- email
|
||||
- media
|
||||
- sway
|
||||
- Pacman
|
||||
dotfiles:
|
||||
- f_paru.conf
|
||||
Moria:
|
||||
include:
|
||||
- terminal
|
||||
- media
|
||||
- Pacman
|
||||
Gondor:
|
||||
include:
|
||||
- terminal
|
||||
- Pacman
|
||||
mko-laptop:
|
||||
include:
|
||||
- terminal
|
||||
AnittaPC:
|
||||
include:
|
||||
- Terminal
|
||||
- terminal
|
||||
- Pacman
|
||||
TakamakiPC:
|
||||
include:
|
||||
- Terminal
|
||||
- terminal
|
||||
- Pacman
|
||||
localhost:
|
||||
include:
|
||||
- Terminal
|
||||
- terminal
|
||||
|
|
1
config.yaml
Symbolic link
1
config.yaml
Symbolic link
|
@ -0,0 +1 @@
|
|||
config-home.yaml
|
13
home/.config/imapnotify/admin@korhonen.cc.conf
Normal file
13
home/.config/imapnotify/admin@korhonen.cc.conf
Normal 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
13
home/.config/imapnotify/marko@korhonen.cc.conf
Normal 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" ]
|
||||
}
|
|
@ -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"
|
|
@ -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
|
|
@ -1,6 +1,6 @@
|
|||
# vim: filetype=muttrc
|
||||
# vim: filetype=neomuttrc
|
||||
|
||||
set my_email = "marko.korhonen@metropolia.fi"
|
||||
set my_email = "marko@korhonen.cc"
|
||||
set from = $my_email
|
||||
set sendmail = "/usr/bin/msmtp -a $my_email"
|
||||
set realname = "Marko Korhonen"
|
|
@ -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
|
|
@ -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>'
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
# vim: filetype=muttrc
|
||||
# vim: filetype=neomuttrc
|
||||
|
||||
set sidebar_visible = yes
|
||||
set sidebar_indent_string = ' '
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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 *
|
||||
|
|
|
@ -14,7 +14,7 @@ export PASS_IPMI="$PASS_IPMI"
|
|||
export PASS_MQTT="$PASS_MQTT"
|
||||
|
||||
export PASS_EMAIL_MARKO="$PASS_EMAIL_MARKO"
|
||||
export PASS_EMAIL_ADMIN="$PASS_EMAIL_MARKO"
|
||||
export PASS_EMAIL_ADMIN="$PASS_EMAIL_ADMIN"
|
||||
|
||||
export ME_FULLNAME="$ME_FULLNAME"
|
||||
export ME_ADDRESS="$ME_ADDRESS"
|
||||
|
|
Loading…
Reference in a new issue