diff options
| m--------- | .config/mpv/script_modules/mpvSockets | 0 | ||||
| -rw-r--r-- | .config/mpv/scripts/modules.lua | 4 | ||||
| m--------- | .config/mpv/scripts/mpvSockets | 0 | ||||
| -rwxr-xr-x | .config/wal/postrun | 2 | ||||
| -rw-r--r-- | .gitmodules | 4 | ||||
| -rwxr-xr-x | .local/bin/setbg | 11 |
6 files changed, 14 insertions, 7 deletions
diff --git a/.config/mpv/script_modules/mpvSockets b/.config/mpv/script_modules/mpvSockets new file mode 160000 +Subproject be9b7ca84456466e54331bab59441ac207659c1 diff --git a/.config/mpv/scripts/modules.lua b/.config/mpv/scripts/modules.lua index 37b69b3..703f372 100644 --- a/.config/mpv/scripts/modules.lua +++ b/.config/mpv/scripts/modules.lua @@ -1,3 +1,3 @@ -local mpv_scripts_dir_path = os.getenv("HOME") .. "/.config/mpv/scripts/" -function load(relative_path) dofile(mpv_scripts_dir_path .. relative_path) end +local mpv_config_dir_path = require("mp").command_native({"expand-path", "~~/"}) +function load(relative_path) dofile(mpv_config_dir_path .. "/script_modules/" .. relative_path) end load("mpvSockets/mpvSockets.lua") diff --git a/.config/mpv/scripts/mpvSockets b/.config/mpv/scripts/mpvSockets deleted file mode 160000 -Subproject 8415a08d99a46213c918613cfe1e088071018db diff --git a/.config/wal/postrun b/.config/wal/postrun index 74d551b..85d9e3f 100755 --- a/.config/wal/postrun +++ b/.config/wal/postrun @@ -4,6 +4,8 @@ source "${HOME}/.cache/wal/colors.sh" mkdir -p "${HOME}/.config/dunst" mkdir -p "${HOME}/.config/zathura" +mv -n "${HOME}/.config/dunst/dunstrc" "${HOME}/.config/dunst/dunstrc.bak" +mv -n "${HOME}/.config/zathura/zathurarc" "${HOME}/.config/zathura/zathurarc.bak" ln -sf "${HOME}/.cache/wal/dunstrc" "${HOME}/.config/dunst/dunstrc" ln -sf "${HOME}/.cache/wal/zathurarc" "${HOME}/.config/zathura/zathurarc" diff --git a/.gitmodules b/.gitmodules index 4f7c5dd..c8bf5fa 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ -[submodule ".config/mpv/scripts/mpvSockets"] - path = .config/mpv/scripts/mpvSockets +[submodule ".config/mpv/script_modules/mpvSockets"] + path = .config/mpv/script_modules/mpvSockets url = https://github.com/wis/mpvSockets.git diff --git a/.local/bin/setbg b/.local/bin/setbg index 8112bcd..7f997b7 100755 --- a/.local/bin/setbg +++ b/.local/bin/setbg @@ -17,8 +17,13 @@ case "$(file --mime-type -b "$trueloc")" in esac # If pywal is installed, use it. -command -v wal >/dev/null 2>&1 && - wal -i "$trueloc" -o "${XDG_CONFIG_HOME:-$HOME/.config}/wal/postrun" >/dev/null 2>&1 && - pidof dwm >/dev/null && xdotool key super+F12 +if command -v wal >/dev/null 2>&1 ; then + wal -i "$(readlink -f $bgloc)" -o "${XDG_CONFIG_HOME:-$HOME/.config}/wal/postrun" >/dev/null 2>&1 && + pidof dwm >/dev/null && xdotool key super+F12 +# If pywal is removed, return config files to normal. +else + [ -f "${XDG_CONFIG_HOME:-$HOME/.config}/dunst/dunstrc.bak" ] && unlink "${XDG_CONFIG_HOME:-$HOME/.config}/dunst/dunstrc" && mv "${XDG_CONFIG_HOME:-$HOME/.config}/dunst/dunstrc.bak" "${XDG_CONFIG_HOME:-$HOME/.config}/dunst/dunstrc" + [ -f "${XDG_CONFIG_HOME:-$HOME/.config}/zathura/zathurarc.bak" ] && unlink "${XDG_CONFIG_HOME:-$HOME/.config}/zathura/zathurarc" && mv "${XDG_CONFIG_HOME:-$HOME/.config}/zathura/zathurarc.bak" "${XDG_CONFIG_HOME:-$HOME/.config}/zathura/zathurarc" +fi xwallpaper --zoom "$bgloc" |