Merge branch 'master' of github.com:LukeSmithxyz/voidrice

This commit is contained in:
Luke Smith 2021-09-23 11:30:30 -04:00
commit c172efd515
No known key found for this signature in database
GPG key ID: 4C50B54A911F6252
6 changed files with 15 additions and 8 deletions

@ -0,0 +1 @@
Subproject commit be9b7ca84456466e54331bab59441ac207659c1c

View file

@ -1,3 +1,3 @@
local mpv_scripts_dir_path = os.getenv("HOME") .. "/.config/mpv/scripts/" local mpv_config_dir_path = require("mp").command_native({"expand-path", "~~/"})
function load(relative_path) dofile(mpv_scripts_dir_path .. relative_path) end function load(relative_path) dofile(mpv_config_dir_path .. "/script_modules/" .. relative_path) end
load("mpvSockets/mpvSockets.lua") load("mpvSockets/mpvSockets.lua")

@ -1 +0,0 @@
Subproject commit 8415a08d99a46213c918613cfe1e088071018db9

View file

@ -4,6 +4,8 @@ source "${HOME}/.cache/wal/colors.sh"
mkdir -p "${HOME}/.config/dunst" mkdir -p "${HOME}/.config/dunst"
mkdir -p "${HOME}/.config/zathura" 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/dunstrc" "${HOME}/.config/dunst/dunstrc"
ln -sf "${HOME}/.cache/wal/zathurarc" "${HOME}/.config/zathura/zathurarc" ln -sf "${HOME}/.cache/wal/zathurarc" "${HOME}/.config/zathura/zathurarc"

4
.gitmodules vendored
View file

@ -1,3 +1,3 @@
[submodule ".config/mpv/scripts/mpvSockets"] [submodule ".config/mpv/script_modules/mpvSockets"]
path = .config/mpv/scripts/mpvSockets path = .config/mpv/script_modules/mpvSockets
url = https://github.com/wis/mpvSockets.git url = https://github.com/wis/mpvSockets.git

View file

@ -17,8 +17,13 @@ case "$(file --mime-type -b "$trueloc")" in
esac esac
# If pywal is installed, use it. # If pywal is installed, use it.
command -v wal >/dev/null 2>&1 && if command -v wal >/dev/null 2>&1 ; then
wal -i "$trueloc" -o "${XDG_CONFIG_HOME:-$HOME/.config}/wal/postrun" >/dev/null 2>&1 && 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 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" xwallpaper --zoom "$bgloc"