diff --git a/.config/gnupg/gpg-agent.conf b/.config/gnupg/gpg-agent.conf index 8c29806..949b2b2 100644 --- a/.config/gnupg/gpg-agent.conf +++ b/.config/gnupg/gpg-agent.conf @@ -2,4 +2,4 @@ allow-preset-passphrase default-cache-ttl 604800 max-cache-ttl 604800 -pinentry-program /usr/bin/pinentry +pinentry-program /usr/bin/pinentry-gtk-2 diff --git a/.config/mbsync/config b/.config/mbsync/config index 79edeeb..244335b 100644 --- a/.config/mbsync/config +++ b/.config/mbsync/config @@ -3,7 +3,7 @@ IMAPStore david.julien@posteo.net-remote Host posteo.de Port 993 User david.julien@posteo.net -PassCmd "pass david.julien@posteo.net" +PassCmd "pass posteo.net/david.julien" AuthMechs LOGIN SSLType IMAPS CertificateFile /etc/ssl/certs/ca-certificates.crt @@ -24,26 +24,25 @@ MaxMessages 0 ExpireUnread no # End Profile - # University -IMAPStore david.julien@ens-lyon.fr-remote -Host imaps.ens-lyon.fr +IMAPStore david.julien@etu.univ-nantes.fr-remote +Host imaps.etu.univ-nantes.fr Port 993 -User djulien -PassCmd "pass ens-lyon.fr/djulien" +User E22D718J +PassCmd "pass univ-nantes.fr/E22D718J" AuthMechs LOGIN SSLType IMAPS CertificateFile /etc/ssl/certs/ca-certificates.crt -MaildirStore david.julien@ens-lyon.fr-local +MaildirStore david.julien@etu.univ-nantes.fr-local Subfolders Verbatim -Path /home/swytch/.local/share/mail/david.julien@ens-lyon.fr/ -Inbox /home/swytch/.local/share/mail/david.julien@ens-lyon.fr/INBOX +Path /home/swytch/.local/share/mail/david.julien@etu.univ-nantes.fr/ +Inbox /home/swytch/.local/share/mail/david.julien@etu.univ-nantes.fr/INBOX -Channel david.julien@ens-lyon.fr +Channel david.julien@etu.univ-nantes.fr Expunge Both -Far :david.julien@ens-lyon.fr-remote: -Near :david.julien@ens-lyon.fr-local: +Far :david.julien@etu.univ-nantes.fr-remote: +Near :david.julien@etu.univ-nantes.fr-local: Patterns * !"[Gmail]/All Mail" Create Both SyncState * @@ -56,7 +55,7 @@ IMAPStore david.julien@mailo.com-remote Host mail.mailo.com Port 993 User david.julien@mailo.com -PassCmd "pass david.julien@mailo.com" +PassCmd "pass mailo.com/david.julien" AuthMechs LOGIN SSLType IMAPS CertificateFile /etc/ssl/certs/ca-certificates.crt diff --git a/.config/msmtp/config b/.config/msmtp/config index f824934..1cfb35f 100644 --- a/.config/msmtp/config +++ b/.config/msmtp/config @@ -3,18 +3,18 @@ host posteo.de port 587 from david.julien@posteo.net user david.julien@posteo.net -passwordeval "pass david.julien@posteo.net" +passwordeval "pass posteo.net/david.julien" auth on tls on tls_trust_file /etc/ssl/certs/ca-certificates.crt logfile /home/swytch/.config/msmtp/msmtp.log -account david.julien@ens-lyon.fr -host smtp.ens-lyon.fr +account david.julien@etu.univ-nantes.fr +host smtp.etu.univ-nantes.fr port 587 -from david.julien@ens-lyon.fr -user djulien -passwordeval "pass ens-lyon.fr/djulien" +from david.julien@etu.univ-nantes.fr +user E22D718J +passwordeval "pass univ-nantes.fr/E22D718J" auth on tls on tls_trust_file /etc/ssl/certs/ca-certificates.crt @@ -25,7 +25,7 @@ host mail.mailo.com port 587 from david.julien@mailo.com user david.julien@mailo.com -passwordeval "pass david.julien@mailo.com" +passwordeval "pass mailo.com/david.julien" auth on tls on tls_trust_file /etc/ssl/certs/ca-certificates.crt diff --git a/.config/mutt/accounts/1-david.julien@posteo.net.muttrc b/.config/mutt/accounts/1-david.julien@posteo.net.muttrc index 349f1cc..ac52906 100644 --- a/.config/mutt/accounts/1-david.julien@posteo.net.muttrc +++ b/.config/mutt/accounts/1-david.julien@posteo.net.muttrc @@ -4,9 +4,9 @@ set realname = "David JULIEN" set from = "david.julien@posteo.net" set sendmail = "msmtp -a david.julien@posteo.net" alias me david.julien -set folder = "/home/swytch/.local/share/mail/david.julien@posteo.net" -set header_cache = /home/swytch/.cache/mutt/david.julien@posteo.net/headers -set message_cachedir = /home/swytch/.cache/mutt/david.julien@posteo.net/bodies +set folder = "$XDG_DATA_HOME/mail/david.julien@posteo.net" +set header_cache = "$XDG_CACHE_HOME/mutt/david.julien@posteo.net/headers" +set message_cachedir = "$XDG_CACHE_HOME/mutt/david.julien@posteo.net/bodies" set mbox_type = Maildir set crypt_autosign = yes @@ -19,7 +19,7 @@ bind index,pager C noop bind index gg first-entry unmailboxes * unalternates * -set signature="/home/swytch/.config/mutt/accounts/posteo.signature" +set signature="$XDG_CONFIG_HOME/mutt/accounts/posteo.signature" unmacro index o macro index o "mailsync" "run mbsync to sync david.julien@posteo.net" diff --git a/.config/mutt/accounts/2-david.julien@ens-lyon.fr.muttrc b/.config/mutt/accounts/2-david.julien@ens-lyon.fr.muttrc index 32d74f4..9fea223 100644 --- a/.config/mutt/accounts/2-david.julien@ens-lyon.fr.muttrc +++ b/.config/mutt/accounts/2-david.julien@ens-lyon.fr.muttrc @@ -4,9 +4,9 @@ set realname = "David JULIEN" set from = "david.julien@ens-lyon.fr" set sendmail = "msmtp -a david.julien@ens-lyon.fr" alias me david.julien -set folder = "/home/swytch/.local/share/mail/david.julien@ens-lyon.fr" -set header_cache = /home/swytch/.cache/mutt/david.julien@ens-lyon.fr/headers -set message_cachedir = /home/swytch/.cache/mutt/david.julien@ens-lyon.fr/bodies +set folder = "$XDG_DATA_HOME/mail/david.julien@ens-lyon.fr" +set header_cache = "$XDG_CACHE_HOME/mutt/david.julien@ens-lyon.fr/headers" +set message_cachedir = "$XDG_CACHE_HOME/mutt/david.julien@ens-lyon.fr/bodies" set mbox_type = Maildir set crypt_autosign = yes @@ -19,11 +19,11 @@ bind index,pager C noop bind index gg first-entry unmailboxes * unalternates * -set signature="/home/swytch/.config/mutt/accounts/ens.signature" +set signature="$XDG_CONFIG_HOME/mutt/accounts/ens.signature" unmacro index o macro index o "mailsync" "run mbsync to sync david.julien@ens-lyon.fr" -mailboxes "=Sent" "=Drafts" "=Trash" "=INBOX" "=internship" "=MOVEP" "=QEST" "=fanfare" +mailboxes "=Sent" "=Drafts" "=Trash" "=INBOX" "=thesis" "=MOVEP" "=QEST" "=fanfare" set record = "+Sent" macro index,pager gs "=Sent" "go to sent" macro index,pager Ms ";=Sent" "move mail to sent" diff --git a/.config/mutt/accounts/2-david.julien@etu.univ-nantes.fr.muttrc b/.config/mutt/accounts/2-david.julien@etu.univ-nantes.fr.muttrc new file mode 100644 index 0000000..f2c0521 --- /dev/null +++ b/.config/mutt/accounts/2-david.julien@etu.univ-nantes.fr.muttrc @@ -0,0 +1,51 @@ +# vim: filetype=neomuttrc +# muttrc file for account david.julien@etu.univ-nantes.fr +set realname = "David JULIEN" +set from = "david.julien@etu.univ-nantes.fr" +set sendmail = "msmtp -a david.julien@etu.univ-nantes.fr" +alias me david.julien +set folder = "$XDG_DATA_HOME/mail/david.julien@etu.univ-nantes.fr" +set header_cache = "$XDG_CACHE_HOME/mutt/david.julien@etu.univ-nantes.fr/headers" +set message_cachedir = "$XDG_CACHE_HOME/mutt/david.julien@etu.univ-nantes.fr/bodies" +set mbox_type = Maildir + +set crypt_autosign = yes +set pgp_sign_as = "0x70F6BD57D3BD8027" + +bind index,pager gg noop +bind index,pager g noop +bind index,pager M noop +bind index,pager C noop +bind index gg first-entry +unmailboxes * +unalternates * +set signature="$XDG_CONFIG_HOME/mutt/accounts/nantes.signature" +unmacro index o +macro index o "mailsync" "run mbsync to sync david.julien@etu.univ-nantes.fr" + +mailboxes "=Sent" "=Drafts" "=Trash" "=INBOX" "=thesis" +set record = "+Sent" +macro index,pager gs "=Sent" "go to sent" +macro index,pager Ms ";=Sent" "move mail to sent" +macro index,pager Cs ";=Sent" "copy mail to sent" +set postponed = "+Drafts" +macro index,pager gd "=Drafts" "go to drafts" +macro index,pager Md ";=Drafts" "move mail to drafts" +macro index,pager Cd ";=Drafts" "copy mail to drafts" +macro index,pager gt "=Trash" "go to trash" +macro index,pager Mt ";=Trash" "move mail to trash" +macro index,pager Ct ";=Trash" "copy mail to trash" +set trash = "+Trash" +macro index,pager gi "=INBOX" "go to inbox" +macro index,pager Mi ";=INBOX" "move mail to inbox" +macro index,pager Ci ";=INBOX" "copy mail to inbox" +set spoolfile = "+INBOX" +macro index,pager gT "=thesis" "go to thesis" +macro index,pager MT ";=thesis" "move mail to thesis" +macro index,pager CT ";=thesis" "copy mail to thesis" +macro index,pager ga "=admin" "go to admin" +macro index,pager Ma ";=admin" "move mail to admin" +macro index,pager Ca ";=admin" "copy mail to admin" +macro index,pager gl "=login" "go to login" +macro index,pager Ml ";=login" "move mail to login" +macro index,pager Cl ";=login" "copy mail to login" diff --git a/.config/mutt/accounts/3-david.julien@mailo.com.muttrc b/.config/mutt/accounts/3-david.julien@mailo.com.muttrc index e35cd6b..f9497d2 100644 --- a/.config/mutt/accounts/3-david.julien@mailo.com.muttrc +++ b/.config/mutt/accounts/3-david.julien@mailo.com.muttrc @@ -4,9 +4,9 @@ set realname = "David JULIEN" set from = "david.julien@mailo.com" set sendmail = "msmtp -a david.julien@mailo.com" alias me david.julien -set folder = "/home/swytch/.local/share/mail/david.julien@mailo.com" -set header_cache = /home/swytch/.cache/mutt/david.julien@mailo.com/headers -set message_cachedir = /home/swytch/.cache/mutt/david.julien@mailo.com/bodies +set folder = "$XDG_DATA_HOME/mail/david.julien@mailo.com" +set header_cache = "$XDG_CACHE_HOME/mutt/david.julien@mailo.com/headers" +set message_cachedir = "$XDG_CACHE_HOME/mutt/david.julien@mailo.com/bodies" set mbox_type = Maildir set crypt_autosign = yes @@ -19,7 +19,7 @@ bind index,pager C noop bind index gg first-entry unmailboxes * unalternates * -set signature="/home/swytch/.config/mutt/accounts/mailo.signature" +set signature="$XDG_CONFIG_HOME/mutt/accounts/mailo.signature" unmacro index o macro index o "mailsync" "run mbsync to sync david.julien@mailo.com" diff --git a/.config/mutt/accounts/4-david.julien@centrale-marseille.fr.muttrc b/.config/mutt/accounts/4-david.julien@centrale-marseille.fr.muttrc index 55a8192..7e6fcb1 100644 --- a/.config/mutt/accounts/4-david.julien@centrale-marseille.fr.muttrc +++ b/.config/mutt/accounts/4-david.julien@centrale-marseille.fr.muttrc @@ -4,9 +4,9 @@ set realname = "Smecta" set from = "david.julien@centrale-marseille.fr" set sendmail = "msmtp -a david.julien@centrale-marseille.fr" alias me david.julien -set folder = "/home/swytch/.local/share/mail/david.julien@centrale-marseille.fr" -set header_cache = /home/swytch/.cache/mutt/david.julien@centrale-marseille.fr/headers -set message_cachedir = /home/swytch/.cache/mutt/david.julien@centrale-marseille.fr/bodies +set folder = "$XDG_DATA_HOME/mail/david.julien@centrale-marseille.fr" +set header_cache = "$XDG_CACHE_HOME/mutt/david.julien@centrale-marseille.fr/headers" +set message_cachedir = "$XDG_CACHE_HOME/mutt/david.julien@centrale-marseille.fr/bodies" set mbox_type = Maildir set crypt_autosign = no @@ -19,7 +19,7 @@ bind index,pager C noop bind index gg first-entry unmailboxes * unalternates * -set signature="/home/swytch/.config/mutt/accounts/centrale.signature" +set signature="$XDG_CONFIG_HOME/mutt/accounts/centrale.signature" unmacro index o macro index o "mailsync" "run mbsync to sync david.julien@centrale-marseille.fr" diff --git a/.config/mutt/accounts/nantes.signature b/.config/mutt/accounts/nantes.signature new file mode 100644 index 0000000..64b56a8 --- /dev/null +++ b/.config/mutt/accounts/nantes.signature @@ -0,0 +1,7 @@ + +David JULIEN +Doctorant au LS2N (Nantes) +Équipe VELO + +Faculté de Sciences et Techniques +Bâtiment 11 - Bureau 221 diff --git a/.config/mutt/muttrc b/.config/mutt/muttrc index 71eb410..7c849b7 100644 --- a/.config/mutt/muttrc +++ b/.config/mutt/muttrc @@ -1,7 +1,7 @@ # vim: filetype=neomuttrc -source /home/swytch/.config/mutt/neomutt.muttrc -macro index,pager ip 'source /home/swytch/.config/mutt/accounts/1-david.julien@posteo.net.muttrc!;' "switch to david.julien@posteo.net" -macro index,pager is 'source /home/swytch/.config/mutt/accounts/2-david.julien@ens-lyon.fr.muttrc!;' "switch to david.julien@ens-lyon.fr" -macro index,pager im 'source /home/swytch/.config/mutt/accounts/3-david.julien@mailo.com.muttrc!;' "switch to david.julien@mailto.com" -macro index,pager ic 'source /home/swytch/.config/mutt/accounts/4-david.julien@centrale-marseille.fr.muttrc!;' "switch to david.julien@centrale-marseille.fr" -source /home/swytch/.config/mutt/accounts/2-david.julien@ens-lyon.fr.muttrc +source $XDG_CONFIG_HOME/mutt/neomutt.muttrc +macro index,pager ip 'source $XDG_CONFIG_HOME/mutt/accounts/1-david.julien@posteo.net.muttrc!;' "switch to david.julien@posteo.net" +macro index,pager is 'source $XDG_CONFIG_HOME/mutt/accounts/2-david.julien@ens-lyon.fr.muttrc!;' "switch to david.julien@ens-lyon.fr" +macro index,pager in 'source $XDG_CONFIG_HOME/mutt/accounts/2-david.julien@etu.univ-nantes.fr.muttrc!;' "switch to david.julien@etu.univ-nantes.fr" +macro index,pager im 'source $XDG_CONFIG_HOME/mutt/accounts/3-david.julien@mailo.com.muttrc!;' "switch to david.julien@mailto.com" +source $XDG_CONFIG_HOME/mutt/accounts/2-david.julien@etu.univ-nantes.fr.muttrc diff --git a/.config/mutt/neomutt.muttrc b/.config/mutt/neomutt.muttrc index cda4fb4..5b70109 100644 --- a/.config/mutt/neomutt.muttrc +++ b/.config/mutt/neomutt.muttrc @@ -9,8 +9,8 @@ set date_format="%d/%m/%y %I:%M%p" set index_format="%2C %Z %?X?A& ? %D %-15.15F %s (%-4.4c)" set sort = 'reverse-date' set smtp_authenticators = 'gssapi:login' -set my_abook = "abook --config /home/swytch/.config/abook/abookrc --datafile \ - /home/swytch/.local/share/abook/addressbook" +set my_abook = "abook --config $XDG_CONFIG_HOME/abook/abookrc --datafile \ + $XDG_DATA_HOME/abook/addressbook" set query_command = "$my_abook --mutt-query '%s'" set rfc2047_parameters = yes set sleep_time = 0 # Pause 0 seconds for informational messages diff --git a/.config/zsh/.zprofile b/.config/zsh/.zprofile index 629898e..1dd6945 100644 --- a/.config/zsh/.zprofile +++ b/.config/zsh/.zprofile @@ -35,3 +35,7 @@ export BROWSER="firefox" export IRC_CLIENT="irssi" export MAIL_CLIENT="neomutt" export MUSIC_CLIENT="ncmpcpp" + +## misc +export _JAVA_AWT_WM_NONREPARENTING=1 +export _JAVA_OPTIONS=-Djava.util.prefs.userRoot="$XDG_CONFIG_HOME"/java diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..3ef6e1e --- /dev/null +++ b/.gitignore @@ -0,0 +1,25 @@ +/* +!/.pam_environment +!/.gitignore +!/.xprofile +!/.zshenv + +!/.local/bin/ +!/local/src/ +!/.local/state/ + +!/.config/ +/.config/dconf/ +/.config/font-manager/ +/.config/fontconfig/ +/.config/gnupg/ +!/.config/gnupg/gpg-agent.conf +/.config/libreoffice/ +/.config/mpd/ +!/.config/mpd/mpd.conf +/.config/mutt/.mailsynclastrun +/.config/nvim/plugin/ +/.config/pulse/ +/.config/zsh/.zcompdump + +/**/*.log diff --git a/.local/bin/displayselect b/.local/bin/displayselect index dc7b505..aa467aa 100755 --- a/.local/bin/displayselect +++ b/.local/bin/displayselect @@ -16,7 +16,7 @@ twoscreen() { # If multi-monitor is selected and there are two screens. # version for the internal display if [ "$mirror" = "yes" ]; then external=$(echo "$screens" | dmenu -i -p "Optimize resolution for:") - internal=$(echo "$screens" | grep -v "$external") + internal=$(echo "$screens" | grep -v -w "$external") res_external=$(xrandr --query | sed -n "/^$external/,/\+/p" | \ tail -n 1 | awk '{print $1}') @@ -35,46 +35,52 @@ twoscreen() { # If multi-monitor is selected and there are two screens. --output "$internal" --auto --same-as "$external" \ --scale "$scale_x"x"$scale_y" else - default=$(printf "yes\\nno" | dmenu -i -p "Default settings?") - if [ $default = "no" ]; then - primary=$(echo "$screens" | dmenu -i -p "Select primary display:") - secondary=$(echo "$screens" | grep -v "$primary") - direction=$(printf "left\\nright" | dmenu -i -p "What side of $primary should $secondary be on?") - rotation=$(printf "normal\\nleft\\nright" | dmenu -i -p "Rotate $secondary?") - xrandr --output "$primary" --auto --scale 1.0x1.0 \ - --output "$secondary" --"$direction"-of "$primary" --auto --scale 1.2x1.2 --rotate $rotation - else - xrandr --fb 3840x1080 \ - --output "eDP1" --mode 1920x1080 --pos 1920x0\ - --output "HDMI2" --pos 0x0 - fi + primary=$(echo "$screens" | dmenu -i -p "Select primary display:") + secondary=$(echo "$screens" | grep -v -w "$primary") + direction=$(printf "left\\nright" | dmenu -i -p "What side of $primary should $secondary be on?") + rotation=$(printf "normal\\nleft\\nright" | dmenu -i -p "Rotate $secondary?") + setup fi } +default() { + primary=$(echo "$allposs" | grep -w "connected primary" | awk '{printf $1}') + secondary=$(echo "$screens" | grep -v -w "$primary") + direction="left" + rotation="normal" + setup +} + +setup() { + xrandr --output "$primary" --auto --scale 1.0x1.0 \ + --output "$secondary" --"$direction"-of "$primary" --auto +} + morescreen() { # If multi-monitor is selected and there are more than two screens. primary=$(echo "$screens" | dmenu -i -p "Select primary display:") - secondary=$(echo "$screens" | grep -v "$primary" | dmenu -i -p "Select secondary display:") + secondary=$(echo "$screens" | grep -v -w "$primary" | dmenu -i -p "Select secondary display:") direction=$(printf "left\\nright" | dmenu -i -p "What side of $primary should $secondary be on?") - tertiary=$(echo "$screens" | grep -v "$primary" | grep -v "$secondary" | dmenu -i -p "Select third display:") + tertiary=$(echo "$screens" | grep -v -w "$primary" | grep -v "$secondary" | dmenu -i -p "Select third display:") xrandr --output "$primary" --auto --output "$secondary" --"$direction"-of "$primary" --auto --output "$tertiary" --"$(printf "left\\nright" | grep -v "$direction")"-of "$primary" --auto } multimon() { # Multi-monitor handler. case "$(echo "$screens" | wc -l)" in - 1) xrandr $(echo "$allposs" | grep -v "$screens" | awk '{print "--output", $1, "--off"}' | tr '\n' ' ') ;; + 1) xrandr $(echo "$allposs" | grep -v -w "$screens" | awk '{print "--output", $1, "--off"}' | tr '\n' ' ') ;; 2) twoscreen ;; *) morescreen ;; esac ;} # Get all possible displays -allposs=$(xrandr -q | grep "connected") +allposs=$(xrandr -q | grep -w "connected") # Get all connected screens. -screens=$(echo "$allposs" | grep " connected" | awk '{print $1}') +screens=$(echo "$allposs" | awk '{print $1}') # Get user choice including multi-monitor and manual selection: -chosen=$(printf "multi-monitor\\n%s\\nmanual selection" "$screens" | dmenu -i -p "Select display arangement:") && +chosen=$(printf "default\\n\\nmulti-monitor\\n%s\\nmanual selection" "$screens" | dmenu -i -p "Select display arangement:") && case "$chosen" in + "default") default ;; "manual selection") arandr ; exit ;; "multi-monitor") multimon ;; *) xrandr --output "$chosen" --auto --scale 1.0x1.0 $(echo "$allposs" | grep -v "$chosen" | awk '{print "--output", $1, "--off"}' | tr '\n' ' ') ;; diff --git a/.local/bin/statusbar/sb-mailbox b/.local/bin/statusbar/sb-mailbox index 42ab7e0..cf94626 100755 --- a/.local/bin/statusbar/sb-mailbox +++ b/.local/bin/statusbar/sb-mailbox @@ -16,7 +16,7 @@ do new="$(find "${XDG_DATA_HOME:-$HOME/.local/share}"/mail/$acc/*/new/ -type f | grep -iv "trash" | wc -l 2>/dev/null)" if [ $new -gt 0 ]; then [ -n "$(echo "$acc" | sed -n '/@centrale/p')" ] && box="" - [ -n "$(echo "$acc" | sed -n '/@ens/p')" ] && box="" + [ -n "$(echo "$acc" | sed -n '/@etu/p')" ] && box="" [ -n "$(echo "$acc" | sed -n '/@mailo/p')" ] && box="" [ -n "$(echo "$acc" | sed -n '/@posteo/p')" ] && box="" unread="$unread/$box$new"