Merge branch 'dev' into logos

mail: remove unused accounts
status: fix icons
This commit is contained in:
David JULIEN 2022-11-01 17:43:57 +01:00
commit 630c540a2c
7 changed files with 15 additions and 135 deletions

View File

@ -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

View File

@ -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

View File

@ -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 <david.julien@etu.univ-lyon1.fr>
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 "<shell-escape>mw -y david.julien@etu.univ-lyon1.fr<enter>" "run mbsync to sync david.julien@etu.univ-lyon1.fr"
mailboxes "=Sent Items" "=Drafts" "=Trash" "=INBOX"
set record = "+Sent Items"
macro index,pager gs "<change-folder>=Sent Items<enter>" "go to sent"
macro index,pager Ms ";<save-message>=Sent Items<enter>" "move mail to sent"
macro index,pager Cs ";<copy-message>=Sent Items<enter>" "copy mail to sent"
set postponed = "+Drafts"
macro index,pager gd "<change-folder>=Drafts<enter>" "go to drafts"
macro index,pager Md ";<save-message>=Drafts<enter>" "move mail to drafts"
macro index,pager Cd ";<copy-message>=Drafts<enter>" "copy mail to drafts"
macro index,pager gt "<change-folder>=Trash<enter>" "go to trash"
macro index,pager Mt ";<save-message>=Trash<enter>" "move mail to trash"
macro index,pager Ct ";<copy-message>=Trash<enter>" "copy mail to trash"
set trash = "+Trash"
macro index,pager gi "<change-folder>=INBOX<enter>" "go to inbox"
macro index,pager Mi ";<save-message>=INBOX<enter>" "move mail to inbox"
macro index,pager Ci ";<copy-message>=INBOX<enter>" "copy mail to inbox"
set spoolfile = "+INBOX"

View File

@ -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 <david.julien@centrale-marseille.fr>
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 "<shell-escape>mailsync<enter>" "run mbsync to sync david.julien@centrale-marseille.fr"
mailboxes "=Sent" "=Drafts" "=INBOX" "=Trash" "=Fanfare"
set record = "+Sent"
macro index,pager gs "<change-folder>=Sent<enter>" "go to sent"
macro index,pager Ms ";<save-message>=Sent<enter>" "move mail to sent"
macro index,pager Cs ";<copy-message>=Sent<enter>" "copy mail to sent"
set postponed = "+Drafts"
macro index,pager gd "<change-folder>=Drafts<enter>" "go to drafts"
macro index,pager Md ";<save-message>=Drafts<enter>" "move mail to drafts"
macro index,pager Cd ";<copy-message>=Drafts<enter>" "copy mail to drafts"
macro index,pager gt "<change-folder>=Trash<enter>" "go to trash"
macro index,pager Mt ";<save-message>=Trash<enter>" "move mail to trash"
macro index,pager Ct ";<copy-message>=Trash<enter>" "copy mail to trash"
set trash = "+Trash"
macro index,pager gi "<change-folder>=INBOX<enter>" "go to inbox"
macro index,pager Mi ";<save-message>=INBOX<enter>" "move mail to inbox"
macro index,pager Ci ";<copy-message>=INBOX<enter>" "copy mail to inbox"
set spoolfile = "+INBOX"
macro index,pager gf "<change-folder>=Fanfare<enter>" "go to fanfare"
macro index,pager Mf ";<save-message>=Fanfare<enter>" "move mail to fanfare"
macro index,pager Cf ";<copy-message>=Fanfare<enter>" "copy mail to fanfare"

View File

@ -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")"

View File

@ -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

View File

@ -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