diff --git a/.gitignore b/.gitignore index da71ff0..32c75bf 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,3 @@ hypr/.config/hypr/env +hypr/.config/hypr/env.conf +hypr/.config/hypr/env.sh diff --git a/hypr/.config/hypr/env.conf.template b/hypr/.config/hypr/env.conf.template new file mode 100644 index 0000000..2069314 --- /dev/null +++ b/hypr/.config/hypr/env.conf.template @@ -0,0 +1 @@ +$HYPR_MONITOR_SETUP = ~/.config/hypr/modules/monitor_setup_0_auto.conf diff --git a/hypr/.config/hypr/env.sh.template b/hypr/.config/hypr/env.sh.template new file mode 100755 index 0000000..c8ea9ab --- /dev/null +++ b/hypr/.config/hypr/env.sh.template @@ -0,0 +1,5 @@ +# export HYPR_MONITOR_SETUP=~/.config/hypr/modules/monitor_setup_buntes_monster.conf +export HYPR_WALLPAPER_LINK_SOURCE="$HOME/nextcloud/Photos/Wallpapers" +export HYPR_WALLPAPER_LINK="$HOME/.config/wpaperd/wallpapers/linked" + +ln -sf $HYPR_WALLPAPER_PATH HYPR_WALLPAPER_LINK diff --git a/hypr/.config/hypr/env_template b/hypr/.config/hypr/env_template deleted file mode 100644 index ab7d5b3..0000000 --- a/hypr/.config/hypr/env_template +++ /dev/null @@ -1,3 +0,0 @@ -MONITOR_SETUP=".config/hypr/modules/monitor_setup_0_auto.conf" - -env = HYPR_WALLPAPER_PATH,~/nextcloud/Photos/Wallpapers/ diff --git a/hypr/.config/hypr/hyprland.conf b/hypr/.config/hypr/hyprland.conf index cb693c6..5bef9dd 100755 --- a/hypr/.config/hypr/hyprland.conf +++ b/hypr/.config/hypr/hyprland.conf @@ -16,6 +16,8 @@ # Create your files separately and then link them to this file like this: # source = ~/.config/hypr/myColors.conf +source = ~/.config/hypr/env.conf +exec = bash ~/.config/hypr/env ################ @@ -27,7 +29,6 @@ enable_color_management = true # See https://wiki.hypr.land/Configuring/Monitors/ # monitor=,preferred,auto,auto -source = ~/.config/hypr/env source = $HYPR_MONITOR_SETUP # source = ~/.config/hypr/modules/monitor_setup_buntes_monster.conf @@ -57,12 +58,13 @@ $menu = wofi --show drun # Autostart necessary processes (like notifications daemons, status bars, etc.) # Or execute your favorite apps at launch like this: +# exec = bash ~/.config/wpaperd/link_wallpapers.sh exec-once = waybar & # exec-one = hyprpaper & exec-once = wpaperd & exec-once = swaync & exec-once = hypridle & -exec = nextcloud & +exec-once = nextcloud & exec-once = sh ~/.config/hypr/scripts/portal-host-override.sh exec-once = dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP XDG_SESSION_DESKTOP XDG_SESSION_TYPE exec-once = systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP XDG_SESSION_DESKTOP XDG_SESSION_TYPE diff --git a/hypr/.config/hypr/modules/monitor_setup_archtop.conf b/hypr/.config/hypr/modules/monitor_setup_archtop.conf new file mode 100644 index 0000000..98c7d02 --- /dev/null +++ b/hypr/.config/hypr/modules/monitor_setup_archtop.conf @@ -0,0 +1 @@ +monitor=,preferred,auto,1.0 diff --git a/hypr/.config/hypr/scripts/ensure-env.sh b/hypr/.config/hypr/scripts/ensure-env.sh index 5f87743..cac9b8f 100755 --- a/hypr/.config/hypr/scripts/ensure-env.sh +++ b/hypr/.config/hypr/scripts/ensure-env.sh @@ -3,7 +3,18 @@ set -eu # Exit immediately if a command exits with a non-zero status, and treat unset variables as an error. -if [ ! -f "hypr/.config/hypr/env" ]; then - cp "hypr/.config/hypr/env_template" "hypr/.config/hypr/env" - echo "Created hypr/.config/hypr/env from template." +CONF_SOURCE="hypr/.config/hypr/env_template" +CONF_TARGET="hypr/.config/hypr/env" +SH_SOURCE="hypr/.config/hypr/env_template" +SH_TARGET="hypr/.config/hypr/env" + + +if [ ! -f "$CONF_TARGET" ]; then + cp "$CONF_SOURCE" "$CONF_TARGET" + echo "Created $CONF_TARGET from template $CONF_SOURCE" fi + +if [ ! -f "$SH_TARGET" ]; then + cp "$SH_SOURCE" "$SH_TARGET" + echo "Created $SH_TARGET from template $SH_SOURCE" +15 fi diff --git a/hypr/.config/wpaperd/config.toml b/hypr/.config/wpaperd/config.toml index 5df5cc4..b595a97 100755 --- a/hypr/.config/wpaperd/config.toml +++ b/hypr/.config/wpaperd/config.toml @@ -1,5 +1,5 @@ [default] -path = $HYPR_WALLPAPER_PATH +path = "~/.config/wpaperd/wallpapers/linked" mode = "center" #recursive = true #sorting = "random" diff --git a/hypr/.config/wpaperd/wallpapers/hypr.png b/hypr/.config/wpaperd/wallpapers/hypr.png new file mode 100644 index 0000000..9553b3f Binary files /dev/null and b/hypr/.config/wpaperd/wallpapers/hypr.png differ diff --git a/hypr/.config/wpaperd/wallpapers/linked b/hypr/.config/wpaperd/wallpapers/linked new file mode 120000 index 0000000..009a2bb --- /dev/null +++ b/hypr/.config/wpaperd/wallpapers/linked @@ -0,0 +1 @@ +/home/mathias/nextcloud/Photos/Wallpapers \ No newline at end of file