diff --git a/.config/mbsync/config b/.config/mbsync/config index 0b14d53..38741eb 100644 --- a/.config/mbsync/config +++ b/.config/mbsync/config @@ -75,29 +75,3 @@ SyncState * MaxMessages 0 ExpireUnread no # End Profile - -# Centrale -IMAPStore david.julien@centrale-marseille.fr-remote -Host imaps.centrale-marseille.fr -Port 993 -User djulien -PassCmd "pass centrale-marseille.fr/djulien" -AuthMechs LOGIN -SSLType IMAPS -CertificateFile /etc/ssl/certs/ca-certificates.crt - -MaildirStore david.julien@centrale-marseille.fr-local -Subfolders Verbatim -Path /home/swytch/.local/share/mail/david.julien@centrale-marseille.fr/ -Inbox /home/swytch/.local/share/mail/david.julien@centrale-marseille.fr/INBOX - -Channel david.julien@centrale-marseille.fr -Expunge Both -Far :david.julien@centrale-marseille.fr-remote: -Near :david.julien@centrale-marseille.fr-local: -Patterns * !"[Gmail]/All Mail" -Create Both -SyncState * -MaxMessages 0 -ExpireUnread no -# End Profile diff --git a/.config/msmtp/config b/.config/msmtp/config index 438caed..25ea415 100644 --- a/.config/msmtp/config +++ b/.config/msmtp/config @@ -30,15 +30,3 @@ auth on tls on tls_trust_file /etc/ssl/certs/ca-certificates.crt logfile /home/swytch/.config/msmtp/msmtp.log - -account david.julien@centrale-marseille.fr -host smtp.centrale-marseille.fr -port 587 -from david.julien@centrale-marseille.fr -user djulien -passwordeval "pass centrale-marseille.fr/djulien" -auth on -tls on -tls_trust_file /etc/ssl/certs/ca-certificates.crt -logfile /home/swytch/.config/msmtp/msmtp.log - diff --git a/.config/neomutt/accounts/2-david.julien@etu.univ-lyon1.fr.muttrc b/.config/neomutt/accounts/2-david.julien@etu.univ-lyon1.fr.muttrc deleted file mode 100644 index 9351c4d..0000000 --- a/.config/neomutt/accounts/2-david.julien@etu.univ-lyon1.fr.muttrc +++ /dev/null @@ -1,42 +0,0 @@ -# vim: filetype=neomuttrc -# muttrc file for account david.julien@etu.univ-lyon1.fr -set realname = "David JULIEN" -set from = "david.julien@etu.univ-lyon1.fr" -set sendmail = "msmtp -a david.julien@etu.univ-lyon1.fr" -alias me david.julien -set folder = "/home/swytch/.local/share/mail/david.julien@etu.univ-lyon1.fr" -set header_cache = /home/swytch/.cache -eomutt/david.julien@etu.univ-lyon1.fr/headers -set message_cachedir = /home/swytch/.cache -eomutt/david.julien@etu.univ-lyon1.fr/bodies -set mbox_type = Maildir - - -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 * -unset signature -unmacro index o -macro index o "mw -y david.julien@etu.univ-lyon1.fr" "run mbsync to sync david.julien@etu.univ-lyon1.fr" - -mailboxes "=Sent Items" "=Drafts" "=Trash" "=INBOX" -set record = "+Sent Items" -macro index,pager gs "=Sent Items" "go to sent" -macro index,pager Ms ";=Sent Items" "move mail to sent" -macro index,pager Cs ";=Sent Items" "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" diff --git a/.config/neomutt/accounts/4-david.julien@centrale-marseille.fr.muttrc b/.config/neomutt/accounts/4-david.julien@centrale-marseille.fr.muttrc deleted file mode 100644 index 287f743..0000000 --- a/.config/neomutt/accounts/4-david.julien@centrale-marseille.fr.muttrc +++ /dev/null @@ -1,46 +0,0 @@ -# vim: filetype=neomuttrc -# muttrc file for account david.julien@centrale-marseille.fr -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 = "$XDG_DATA_HOME/mail/david.julien@centrale-marseille.fr" -set header_cache = "$XDG_CACHE_HOME/neomutt/david.julien@centrale-marseille.fr/headers" -set message_cachedir = "$XDG_CACHE_HOME/neomutt/david.julien@centrale-marseille.fr/bodies" -set mbox_type = Maildir - -set crypt_autosign = no -set pgp_self_encrypt = yes -set pgp_default_key = "0x9F46CD164AE1E813" - -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/neomutt/accounts/centrale.signature" -unmacro index o -macro index o "mailsync" "run mbsync to sync david.julien@centrale-marseille.fr" - -mailboxes "=Sent" "=Drafts" "=INBOX" "=Trash" "=Fanfare" -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 gf "=Fanfare" "go to fanfare" -macro index,pager Mf ";=Fanfare" "move mail to fanfare" -macro index,pager Cf ";=Fanfare" "copy mail to fanfare" diff --git a/.local/bin/statusbar/sb-internet b/.local/bin/statusbar/sb-internet index a5c4744..cca7db7 100755 --- a/.local/bin/statusbar/sb-internet +++ b/.local/bin/statusbar/sb-internet @@ -15,12 +15,12 @@ eth="$(cat /sys/class/net/eno1/operstate)" ssid="$(wpa_cli status | grep -i ^ssid | sed -e 's/.*=//')" state="$(wpa_cli status | grep -i ^wpa_state | sed -e 's/.*=//')" case "$state" in - COMPLETED) str="$(printf " %s" $ssid)" ;; + COMPLETED) str="$(printf " %s" $ssid)" ;; INTERFACE_DISABLED) str="WIFI DOWN" ;; *) str="$(printf "NO WIFI")";; esac if [ "up" = "$eth" ]; then - str="$(printf "%s /  " "$str")" + str="$(printf "%s /  " "$str")" fi vpn="$(pidof openvpn)" [ -n "$vpn" ] && str="$(printf "() %s" "$str")" diff --git a/.local/bin/statusbar/sb-mailbox b/.local/bin/statusbar/sb-mailbox index 7b88170..754a4c1 100755 --- a/.local/bin/statusbar/sb-mailbox +++ b/.local/bin/statusbar/sb-mailbox @@ -16,11 +16,10 @@ do new="$(find "${XDG_DATA_HOME:-$HOME/.local/share}"/mail/$acc -path */new/* -type f | grep -iv -e "trash" -e "drafts" | wc -l 2>/dev/null)" if [ $new -gt 0 ]; then box="" - [ -n "$(echo "$acc" | sed -n '/@centrale/p')" ] && box="" [ -n "$(echo "$acc" | sed -n '/@univ/p')" ] && box="" [ -n "$(echo "$acc" | sed -n '/@mailo/p')" ] && box="" [ -n "$(echo "$acc" | sed -n '/@posteo/p')" ] && box="" - unread="$unread/$box$new" + unread="$unread/$box $new" fi done [ -n "$unread" ] && unread="$(echo "$unread" | cut -c 2-)" || exit diff --git a/.local/bin/statusbar/sb-volume b/.local/bin/statusbar/sb-volume index d33e85c..23f43c5 100755 --- a/.local/bin/statusbar/sb-volume +++ b/.local/bin/statusbar/sb-volume @@ -9,17 +9,24 @@ # @description : volume block for dwmblocks ###################################################################### +<<<<<<< HEAD level="$(wpctl get-volume @DEFAULT_AUDIO_SINK@ | awk -F" " '{print $2*100}')" muted="$(wpctl get-volume @DEFAULT_AUDIO_SINK@ | awk -F" " '{print $3}')" +======= +>>>>>>> dev [ "[MUTED]" = "$muted" ] && echo " 婢 --- " && exit -if [ "$level" -gt "70" ]; then - icon="墳" -elif [ "$level" -lt "30" ]; then - icon="奄" +if [ "1" = $(pulsemixer --get-mute) ]; then + icon="婢" else - icon="奔" + if [ "$vol" -gt "70" ]; then + icon="墳" + elif [ "$vol" -lt "30" ]; then + icon="奄" + else + icon="奔" + fi fi printf " %s %3d%% " $icon $level