diff --git a/config-home.yaml b/config-home.yaml index 959260f..e34b03a 100644 --- a/config-home.yaml +++ b/config-home.yaml @@ -19,12 +19,18 @@ 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 d_nvim_config: actions: - - vim-plug + - vim-plug dst: ~/.config/nvim/conf.d src: .config/nvim/conf.d f_coc-settings.json: @@ -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,87 +153,98 @@ 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: + - d_systemd + terminal: 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: + - f_nvimpager + - f_hushlogin + - f_ripgrep_ignore + - f_ranger_commands.py + - f_rtv.cfg + - f_mailcap + - d_zsh + - f_zshrc + - f_tmux.conf + - f_gitconfig + - f_ranger.conf + - f_ssh.conf + - f_authorized_keys + - d_scripts + - d_nvim_config + - f_init.vim + - f_coc-settings.json + - f_gitconfig + - f_alacritty.yml + email: 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 + - 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_yay_config.json - - f_makepkg.conf + - f_makepkg.conf + - f_paru.conf Mirkwood: include: - - Base - - Terminal - - Media - - Sway - - Pacman + - base + - terminal + - email + - media + - sway + - Pacman + dotfiles: + - f_paru.conf Moria: include: - - Terminal - - Media - - Pacman + - terminal + - media + - Pacman Gondor: include: - - Terminal - - Pacman + - terminal + - Pacman mko-laptop: include: - - Terminal - Terminal: - dotfiles: - - f_nvimpager - - f_hushlogin - - f_ripgrep_ignore - - f_ranger_commands.py - - f_rtv.cfg - - f_mailcap - - d_zsh - - f_zshrc - - f_tmux.conf - - f_gitconfig - - f_ranger.conf - - f_ssh.conf - - f_authorized_keys - - d_scripts - - d_nvim_config - - f_init.vim - - f_coc-settings.json - - f_gitconfig - - f_alacritty.yml + - terminal AnittaPC: include: - - Terminal - - Pacman + - terminal + - Pacman TakamakiPC: include: - - Terminal - - Pacman + - terminal + - Pacman localhost: include: - - Terminal + - terminal diff --git a/config.yaml b/config.yaml new file mode 120000 index 0000000..6524534 --- /dev/null +++ b/config.yaml @@ -0,0 +1 @@ +config-home.yaml \ No newline at end of file diff --git a/home/.config/imapnotify/admin@korhonen.cc.conf b/home/.config/imapnotify/admin@korhonen.cc.conf new file mode 100644 index 0000000..cecd8ba --- /dev/null +++ b/home/.config/imapnotify/admin@korhonen.cc.conf @@ -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" ] +} diff --git a/home/.config/imapnotify/marko@korhonen.cc.conf b/home/.config/imapnotify/marko@korhonen.cc.conf new file mode 100644 index 0000000..4572d3d --- /dev/null +++ b/home/.config/imapnotify/marko@korhonen.cc.conf @@ -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" ] +} diff --git a/home/.config/neomutt/accounts/marko.korhonen@reekynet.com b/home/.config/neomutt/accounts/admin@korhonen.cc similarity index 87% rename from home/.config/neomutt/accounts/marko.korhonen@reekynet.com rename to home/.config/neomutt/accounts/admin@korhonen.cc index 8b9d02b..4bea53a 100644 --- a/home/.config/neomutt/accounts/marko.korhonen@reekynet.com +++ b/home/.config/neomutt/accounts/admin@korhonen.cc @@ -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" diff --git a/home/.config/neomutt/accounts/admin@reekynet.com b/home/.config/neomutt/accounts/admin@reekynet.com deleted file mode 100644 index 45503ef..0000000 --- a/home/.config/neomutt/accounts/admin@reekynet.com +++ /dev/null @@ -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 diff --git a/home/.config/neomutt/accounts/marko.korhonen@metropolia.fi b/home/.config/neomutt/accounts/marko@korhonen.cc similarity index 74% rename from home/.config/neomutt/accounts/marko.korhonen@metropolia.fi rename to home/.config/neomutt/accounts/marko@korhonen.cc index f6c3442..514d359 100644 --- a/home/.config/neomutt/accounts/marko.korhonen@metropolia.fi +++ b/home/.config/neomutt/accounts/marko@korhonen.cc @@ -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 diff --git a/home/.config/neomutt/accounts/reekymarko@reekynet.com b/home/.config/neomutt/accounts/reekymarko@reekynet.com deleted file mode 100644 index 9d578a8..0000000 --- a/home/.config/neomutt/accounts/reekymarko@reekynet.com +++ /dev/null @@ -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 diff --git a/home/.config/neomutt/neomuttrc b/home/.config/neomutt/neomuttrc index 85ff9e1..7402072 100644 --- a/home/.config/neomutt/neomuttrc +++ b/home/.config/neomutt/neomuttrc @@ -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 'source ~/.config/neomutt/accounts/reekymarko@reekynet.com!' -macro index 'source ~/.config/neomutt/accounts/marko.korhonen@reekynet.com!' -macro index 'source ~/.config/neomutt/accounts/admin@reekynet.com!' -macro index 'source ~/.config/neomutt/accounts/marko.korhonen@metropolia.fi!' +macro index 'source ~/.config/neomutt/accounts/marko@korhonen.cc!' +macro index 'source ~/.config/neomutt/accounts/admin@korhonen.cc!' diff --git a/home/.config/neomutt/sidebar b/home/.config/neomutt/sidebar index 616d505..48b1252 100644 --- a/home/.config/neomutt/sidebar +++ b/home/.config/neomutt/sidebar @@ -1,4 +1,4 @@ -# vim: filetype=muttrc +# vim: filetype=neomuttrc set sidebar_visible = yes set sidebar_indent_string = ' ' diff --git a/home/.config/zsh/01-env.zsh b/home/.config/zsh/01-env.zsh index 6bb9c62..8e509d7 100644 --- a/home/.config/zsh/01-env.zsh +++ b/home/.config/zsh/01-env.zsh @@ -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 diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index 1b1b60a..6fa5d6b 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -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 diff --git a/home/.mbsyncrc b/home/.mbsyncrc index 5f83b78..b9e97e8 100644 --- a/home/.mbsyncrc +++ b/home/.mbsyncrc @@ -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 * diff --git a/secrets/secrets.sh b/secrets/secrets.sh index 3f866ad..a33dac0 100755 --- a/secrets/secrets.sh +++ b/secrets/secrets.sh @@ -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"