xdg-base dir

X11/xinitrc

@@ -0,0 +1,32 @@
+#!/bin/sh
+
+userresources=$XDG_CONFIG_HOME/X11/Xresources
+ERRFILE=$XDG_CACHE_HOME/X11/xsession-errors
+usermodmap=$XDG_CONFIG_HOME/X11/Xmodmap
+sysresources=/etc/X11/xinit/.Xresources
+sysmodmap=/etc/X11/xinit/.Xmodmap
+
+# merge in defaults and keymaps
+[ -f $sysresources ] && xrdb -merge $sysresources
+[ -f $sysmodmap ] && xmodmap $sysmodmap
+[ -f "$userresources" ] && xrdb -merge "$userresources"
+[ -f "$usermodmap" ] && xmodmap "$usermodmap"
+
+[ -d /etc/X11/xinit/xinitrc.d ] &&
+    for f in /etc/X11/xinit/xinitrc.d/?*.sh ; do [ -x "$f" ] && . "$f" ; done &&
+    unset f
+
+# Added xinitrc config
+systemctl --user import-environment DISPLAY &
+setxkbmap en &
+xset r rate 300 50 &
+hsetroot -cover /home/tavo/Media/Pictures/Backgrounds/71.jpg
+dwmblocks &
+clipmenud &
+ps -C dunst | grep -q dunst || dunst &
+
+while true; do
+	dwm >/dev/null 2>&1
+done
+
+exec dwm

bashrc

@@ -16,30 +16,38 @@ set -o vi                                       # vi mode
 
 # $HOME cleanup
 export \
-    LESSHISTFILE="$HOME/.local/share/lesshst" \
-    VIMINIT="source $HOME/.config/vim/vimrc" \
-    XAUTHORITY="$XDG_RUNTIME_DIR/Xauthority" \
-    HISTFILE="$XDG_STATE_HOME/bash_history" \
-    CUDA_CACHE_PATH="$XDG_CACHE_HOME"/nv \
     XDG_STATE_HOME="$HOME/.local/state" \
     XDG_CACHE_HOME="$HOME/.local/cache" \
     XDG_DATA_HOME="$HOME/.local/share" \
     XDG_CONFIG_HOME="$HOME/.config" \
+    PASSWORD_STORE_DIR="$XDG_DATA_HOME/password-store" \
+    GTK2_RC_FILES="$XDG_CONFIG_HOME/gtk-2.0/gtkrc-2.0" \
+    VIMINIT="source $XDG_CONFIG_HOME/vim/vimrc" \
+    XSERVERRC="$XDG_CONFIG_HOME/X11/xserverrc" \
+    XAUTHORITY="$XDG_RUNTIME_DIR/Xauthority" \
+    HISTFILE="$XDG_STATE_HOME/bash_history" \
+    XINITRC="$XDG_CONFIG_HOME/X11/xinitrc" \
+    LESSHISTFILE="$XDG_DATA_HOME/lesshst" \
+    WGETRC="$XDG_CONFIG_HOME/wget/wgetrc" \
+    ELECTRUMDIR="$XDG_DATA_HOME/electrum" \
+    CUDA_CACHE_PATH="$XDG_CACHE_HOME/nv" \
+    BASH_ENV="$XDG_CONFIG_HOME/bashrc" \
+    GNUPGHOME="$XDG_DATA_HOME/gnupg" \
 
 # Aliases
 alias \
-    prt="cd $HOME/Pictures/Screenshots/ && ls" \
+    prt="cd $HOME/Media/Pictures/Screenshots/ && ls" \
-    bkg="cd $HOME/Pictures/Backgrounds/ && ls" \
+    bkg="cd $HOME/Media/Pictures/Backgrounds/ && ls" \
+    vid="cd $HOME/Media/Videos/ && ls" \
+    img="cd $HOME/Media/Pictures/ && ls" \
     tmp="cd $HOME/Desktop/temp/ && ls" \
     www="cd $HOME/Desktop/www/ && ls" \
     src="cd $HOME/.local/src/ && ls" \
     doc="cd $HOME/Documents/ && ls" \
     dow="cd $HOME/Downloads/ && ls" \
-    img="cd $HOME/Pictures/ && ls" \
     prj="cd $HOME/Projects/ && ls" \
     dsk="cd $HOME/Desktop/ && ls" \
     cfg="cd $HOME/.config/ && ls" \
-    vid="cd $HOME/Videos/ && ls" \
     mus="cd $HOME/Music/ && ls" \
     ent="cd /mnt/Entr/ && ls" \
     fzf-edit-script="fzf_nav /home/$(whoami)/.config/scripts" \

dunst/dunstrc

@@ -2,7 +2,7 @@
     monitor = 0
     follow = none
 
-    width = (200, 600)
+    width = (200, 300)
     height = 200
     origin = top-right
     offset = 36x48

scripts/dmenu-otp

@@ -2,7 +2,7 @@
 # OTP script for 'pass'
 
 # Ask for password name in vault
-password=$(find ~/.password-store/ -type f -name '*.gpg' | sed 's/.*\/\(.*\)\.gpg$/\1/' | dmenu -i -p "OTP:")
+password=$(find $XDG_DATA_HOME/password-store/ -type f -name '*.gpg' | sed 's/.*\/\(.*\)\.gpg$/\1/' | dmenu -i -p "OTP:")
 
 # Exit if none chosen
 [ -z "$password" ] && exit

scripts/dmenu-pass

@@ -2,7 +2,7 @@
 # Script for 'pass'
 
 # Ask for password name in vault
-password=$(find ~/.password-store/ -type f -name '*.gpg' |
+password=$(find $XDG_DATA_HOME/password-store/ -type f -name '*.gpg' |
 	sed 's/.*\/\(.*\)\.gpg$/\1/' | dmenu -i -p "Password:")
 
 # Exit if none chosen

scripts/sxiv-bkg

@@ -3,7 +3,7 @@
 # Will display background chooser
 # and set it using hsetroot
 
-img=$(find ~/Pictures/Backgrounds/* | shuf | sxiv -itoq | tail -1)
+img=$(find ~/Media/Pictures/Backgrounds/* | shuf | sxiv -itoq | tail -1)
 
 # Exit if none chosen
 [ -z "$img" ] && exit