Merge branch 'dev' into thesis
git: fix gitignore for ~/.local mail: fix globbing in subdirectories nvim.cmp: fix deprecated functions
This commit is contained in:
commit
7b561eee06
@ -55,7 +55,7 @@ end
|
||||
|
||||
-- nvim-cmp supports additional completion capabilities
|
||||
local capabilities = vim.lsp.protocol.make_client_capabilities()
|
||||
capabilities = require("cmp_nvim_lsp").update_capabilities(capabilities)
|
||||
capabilities = require("cmp_nvim_lsp").default_capabilities(capabilities)
|
||||
|
||||
local servers = { "clangd", "sumneko_lua", "texlab" }
|
||||
lsp_installer.setup {
|
||||
|
14
.gitignore
vendored
14
.gitignore
vendored
@ -4,22 +4,28 @@
|
||||
!/.xprofile
|
||||
!/.zshenv
|
||||
|
||||
!/.local
|
||||
!/.local/bin/
|
||||
!/local/src/
|
||||
!/.local/state/
|
||||
!/.local/src/
|
||||
/.local/lib/
|
||||
/.local/include/
|
||||
/.local/share/
|
||||
/.local/state/
|
||||
|
||||
!/.config/
|
||||
/.config/dconf/
|
||||
/.config/font-manager/
|
||||
/.config/fontconfig/
|
||||
/.config/gnupg/
|
||||
/.config/gnupg/*
|
||||
!/.config/gnupg/gpg-agent.conf
|
||||
/.config/libreoffice/
|
||||
/.config/mpd/
|
||||
/.config/mpd/*
|
||||
!/.config/mpd/mpd.conf
|
||||
/.config/mutt/.mailsynclastrun
|
||||
/.config/nvim/plugin/
|
||||
/.config/pulse/
|
||||
/.config/transmission-daemon/*
|
||||
/.config/transmission-daemon/settings.json
|
||||
/.config/zsh/.zcompdump
|
||||
|
||||
/**/*.log
|
||||
|
@ -40,7 +40,7 @@ messageinfo() {
|
||||
syncandnotify() {
|
||||
acc="$(echo "$account" | sed "s/.*\///")"
|
||||
mbsync "$acc"
|
||||
new="$(find "${XDG_DATA_HOME:-$HOME/.local/share}"/mail/$acc/*/new/ -type f -newer "${XDG_CONFIG_HOME:-$HOME/.config}/mutt/.mailsynclastrun" | grep -iv "trash" 2>/dev/null)"
|
||||
new="$(find "${XDG_DATA_HOME:-$HOME/.local/share}"/mail/$acc -path */new/* -type f -newer "${XDG_STATE_HOME:-$HOME/.local/state}/mailsynclastrun" | grep -iv "trash" 2>/dev/null)"
|
||||
newcount=$(echo "$new" | sed '/^\s*$/d' | wc -l)
|
||||
if [ "$newcount" -gt "0" ]; then
|
||||
for file in $new; do
|
||||
@ -66,4 +66,4 @@ wait
|
||||
notmuch new 2>/dev/null
|
||||
|
||||
#Create a touch file that indicates the time of the last run of mailsync
|
||||
touch "${XDG_CONFIG_HOME:-$HOME/.config}/mutt/.mailsynclastrun"
|
||||
touch "${XDG_STATE_HOME:-$HOME/.local/state}/mailsynclastrun"
|
||||
|
@ -13,7 +13,7 @@
|
||||
unread=""
|
||||
for acc in $(ls "${XDG_DATA_HOME:-$HOME/.local/share}"/mail/)
|
||||
do
|
||||
new="$(find "${XDG_DATA_HOME:-$HOME/.local/share}"/mail/$acc/*/new/ -type f | grep -iv "trash" | wc -l 2>/dev/null)"
|
||||
new="$(find "${XDG_DATA_HOME:-$HOME/.local/share}"/mail/$acc -path */new/* -type f | grep -iv "trash" | wc -l 2>/dev/null)"
|
||||
if [ $new -gt 0 ]; then
|
||||
box=""
|
||||
[ -n "$(echo "$acc" | sed -n '/@centrale/p')" ] && box=""
|
||||
@ -23,6 +23,6 @@ do
|
||||
unread="$unread/$box$new"
|
||||
fi
|
||||
done
|
||||
[ -n "$unread" ] && unread="($(echo "$unread" | cut -c 2-))" || exit
|
||||
[ -n "$unread" ] && unread="$(echo "$unread" | cut -c 2-)" || exit
|
||||
|
||||
printf " %s%s " "$unread" "$icon"
|
||||
|
Reference in New Issue
Block a user