Merge branch 'dev' into mercury

nvim: tweak autocompletion
scripts: fix tex files compilation
mail: add folders for ens account
status: separate states for wifi down and no ssid
This commit is contained in:
David JULIEN 2022-07-28 20:07:56 +02:00
commit 9b07e00f95
Signed by: swytch
GPG Key ID: 498590A3AA82A06F
4 changed files with 29 additions and 9 deletions

View File

@ -23,7 +23,7 @@ set signature="/home/swytch/.config/mutt/accounts/ens.signature"
unmacro index o
macro index o "<shell-escape>mailsync<enter>" "run mbsync to sync david.julien@ens-lyon.fr"
mailboxes "=Sent" "=Drafts" "=Trash" "=INBOX" "=internship" "=fanfare"
mailboxes "=Sent" "=Drafts" "=Trash" "=INBOX" "=internship" "=MOVEP" "=QEST" "=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"
@ -46,3 +46,9 @@ macro index,pager Cf ";<copy-message>=fanfare<enter>" "copy mail to fanfare"
macro index,pager gI "<change-folder>=internship<enter>" "go to internship"
macro index,pager MI ";<save-message>=internship<enter>" "move mail to internship"
macro index,pager CI ";<copy-message>=internship<enter>" "copy mail to internship"
macro index,pager gm "<change-folder>=MOVEP<enter>" "go to MOVEP"
macro index,pager Mm ";<save-message>=MOVEP<enter>" "move mail to MOVEP"
macro index,pager Cm ";<copy-message>=MOVEP<enter>" "copy mail to MOVEP"
macro index,pager gq "<change-folder>=QEST<enter>" "go to QEST"
macro index,pager Mq ";<save-message>=QEST<enter>" "move mail to QEST"
macro index,pager Cq ";<copy-message>=QEST<enter>" "copy mail to QEST"

View File

@ -48,7 +48,7 @@ local icons = {
cmp.setup {
completion = {
autocomplete = false
autocomplete = true
},
sources = {
{ name = "path" },
@ -91,21 +91,31 @@ cmp.setup {
select = true,
}),
["<Tab>"] = cmp.mapping(function(fallback)
if luasnip.expand_or_locally_jumpable() then
luasnip.expand_or_jump()
else
fallback()
end
end, { "i", "s" }),
["<S-Tab>"] = cmp.mapping(function(fallback)
if luasnip.jumpable(-1) then
luasnip.jump(-1)
else
fallback()
end
end, { "i", "s" }),
["<C-n>"] = cmp.mapping(function(fallback)
if cmp.visible() then
cmp.select_next_item()
elseif luasnip.expand_or_locally_jumpable() then
luasnip.expand_or_jump()
elseif has_words_before() then
cmp.complete()
else
fallback()
end
end, { "i", "s" }),
["<S-Tab>"] = cmp.mapping(function(fallback)
["<C-p>"] = cmp.mapping(function(fallback)
if cmp.visible() then
cmp.select_prev_item()
elseif luasnip.jumpable(-1) then
luasnip.jump(-1)
else
fallback()
end

View File

@ -31,7 +31,7 @@ shebangtest()
}
texcompile() { \
[ -e "main.tex" ] && base="main" && file="$base.tex"
[ "$base" != "notes" ] && [ -e "main.tex" ] && base="main" && file="$base.tex"
cmd="pdflatex"
case "$(head -n 1 $file)" in
*lua*) cmd="lualatex" ;;

View File

@ -13,7 +13,11 @@
# Wifi quality percentage and  icon if ethernet is connected.
ssid="$(wpa_cli status | grep -i ^ssid | sed -e 's/.*=//')"
state="$(wpa_cli status | grep -i ^wpa_state | sed -e 's/.*=//')"
[ "COMPLETED" = $state ] && str="$(printf " %s" $ssid)" || str="$(printf " ---")"
case "$state" in
COMPLETED) str="$(printf " %s" $ssid)" ;;
INTERFACE_DISABLED) str="WIFI DOWN" ;;
*) str="$(printf "NO WIFI")";;
esac
eth="$(cat /sys/class/net/enp0s31f6/operstate)"
if [ "up" = "$eth" ]; then
str="$(printf "%s /  " "$str")"