From c94b5c084a07c28fcefabb4daa7f83d4a0749c06 Mon Sep 17 00:00:00 2001 From: Mart Lubbers Date: Mon, 21 Jan 2019 13:08:04 +0100 Subject: [PATCH] last xdg fixes --- email/.config/mutt/muttrc | 2 +- shell/.bashrc | 9 ++++++--- shell/.local/bin/backup.sh | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/email/.config/mutt/muttrc b/email/.config/mutt/muttrc index 4312542..6da670c 100644 --- a/email/.config/mutt/muttrc +++ b/email/.config/mutt/muttrc @@ -15,7 +15,7 @@ source ~/.local/share/offlineimap/mailboxes # Receiving, sending and searching set sendmail="checkattach.sh msmtp -a net" set send_charset="us-ascii:utf-8" -macro index,pager $ "/home/mrl/.config/mutt/force_sync.sh" "Force refresh" +macro index,pager $ "sync_mail.sh" "Force refresh" macro attach B "firefox \"data:text/html;base64,$(base64 -w 0 <&0)\"" # Set the correct msmtp account for the different addresses diff --git a/shell/.bashrc b/shell/.bashrc index 27d574a..3cb3c7c 100644 --- a/shell/.bashrc +++ b/shell/.bashrc @@ -12,7 +12,11 @@ export BROWSER=firefox export PAGER=more export SUDO_ASKPASS=/usr/lib/ssh/ssh-askpass -export NOTMUCH_CONFIG=~/.config/notmuch/config + +# XDG fixes +export NOTMUCH_CONFIG="${XDG_CONFIG_HOME:-$HOME/.config}"/notmuch/config +export PASSWORD_STORE_DIR="${XDG_DATA_HOME:-$HOME/.local/share}"/pass +export TMUX_TMPDIR="$XDG_RUNTIME_DIR" export CLEAN_HOME=/opt/clean @@ -27,8 +31,7 @@ alias ls='ls --color=auto' alias grep='grep --color=auto' alias vi=vim alias latexmk='make -f ~/.local/bin/latex.mk' -export TMUX_TMPDIR="$XDG_RUNTIME_DIR" -alias tmux='tmux -f ~/.config/tmux/config' +alias tmux="tmux -f \"${XDG_CONFIG_HOME:-$HOME/.config}/tmux/config\"" alias shutdown="echo \"Are you sure? I\'m Ygdrassil\" && read && shutdown" . /etc/bash_completion diff --git a/shell/.local/bin/backup.sh b/shell/.local/bin/backup.sh index cd4ebe5..e9d4903 100755 --- a/shell/.local/bin/backup.sh +++ b/shell/.local/bin/backup.sh @@ -22,7 +22,7 @@ elif mount -U "$1" then mkdir -p /mnt/backupdrive/home/mrl /mnt/backupdrive/mnt/data &&\ rsync --delete --bwlimit=20M --exclude 'minidlna/*' --exclude 'transmission/ipt/*' -va /mnt/data/ /mnt/backupdrive/mnt/data > /home/mrl/backup.log &&\ - rsync --delete --bwlimit=20M --exclude 'VirtualBox VMs' -va /home/mrl/ /mnt/backupdrive/home/mrl >> /home/mrl/backup.log &&\ + rsync --delete --bwlimit=20M --exclude '.local/share' --exclude '.cache' --exclude 'VirtualBox VMs' -va /home/mrl/ /mnt/backupdrive/home/mrl >> /home/mrl/backup.log &&\ umount /mnt/backupdrive &&\ cat<