Merge branch 'main' of tangled.sh:ocbwoy3.dev/nix

scripts/dev/setup-gentoo-symlinks.sh

@@ -0,0 +1,32 @@
+#!/bin/bash
+
+DOTFILES_DIR="/home/ocbwoy3/config/config"
+
+# fastfetch
+ln -sfn "${DOTFILES_DIR}/fastfetch" "${HOME}/.config/fastfetch"
+
+# dunst
+ln -sfn "${DOTFILES_DIR}/dunst" "${HOME}/.config/dunst"
+
+# hypr
+ln -sfn "${DOTFILES_DIR}/hypr" "${HOME}/.config/hypr"
+
+# xdg-desktop-portal
+ln -sfn "${DOTFILES_DIR}/xdg-desktop-portal" "${HOME}/.config/xdg-desktop-portal"
+
+# ghostty
+ln -sfn "${DOTFILES_DIR}/ghostty" "${HOME}/.config/ghostty"
+
+# wlogout
+ln -sfn "${DOTFILES_DIR}/wlogout" "${HOME}/.config/wlogout"
+
+# qt5ct
+ln -sfn "${DOTFILES_DIR}/qt5ct" "${HOME}/.config/qt5ct"
+
+# wofi
+ln -sfn "${DOTFILES_DIR}/wofi" "${HOME}/.config/wofi"
+
+# dotfile font
+ln -sfn "${DOTFILES_DIR}/dotfile_deps/DotfilesFont.otf" "${HOME}/.local/share/fonts/DotfilesFont.otf"
+
+echo "symlinked this that"

scripts/gentoo-init.sh

@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+if [[ "$(hostname)" == "gentoo" ]]; then
+    notify-send "Hyprland" "Init gentoo stuff"
+    hyprctl dispatch exec hyprpaper
+    hyprctl dispatch exec pipewire
+    hyprctl dispatch exec pipewire-pulse
+    hyprctl dispatch exec wireplumber
+fi

scripts/hot-reload.sh

@@ -2,13 +2,24 @@
 
 pkill -9 waybar > /dev/null
 
-hyprctl dispatch exec "GTK_THEME=Adwaita LC_TIME=lv_LV.UTF-8 waybar -c ~/config/config/waybar/config -s ~/config/config/waybar/style.css" > /dev/null &
+hyprctl dispatch exec "GTK_THEME=Adwaita waybar -c ~/config/config/waybar/config -s ~/config/config/waybar/style.css" > /dev/null &
 hyprctl reload > /dev/null &
 
 ROBLOX_PID="$(pidof sober)"
+HYPRPAPER_PID="$(pidof hyprpaper)"
 
 # echo ${#ROBLOX_PID}
 
 if [ ${#ROBLOX_PID} -lt 1 ]; then
-	trap "rm /tmp/.regretevator_state" EXIT > /dev/null
+    trap "rm /tmp/.regretevator_state" EXIT > /dev/null
+fi
+
+# shit
+
+if [[ "$(hostname)" == "gentoo" ]]; then
+    if [ ${#HYPRPAPER_PID} -lt 1 ]; then
+        hyprctl dispatch exec hyprpaper
+        sleep 1
+        bash ~/config/scripts/load-wallpaper.sh
+    fi
 fi

scripts/load-wallpaper.sh

@@ -6,5 +6,14 @@ rm -r ~/.cache/wal
 
 # wal -stn -a 90 -i $HOME/wallpaper/$WALLPAPER
 
-swww img $WALLPAPER --transition-fps 120 --transition-duration 2 -t wipe &
-bash ~/dotfiles/scripts/hot-reload.sh
+if [[ "$(hostname)" == "gentoo" ]]; then
+    hyprctl hyprpaper unload all
+    hyprctl hyprpaper preload $WALLPAPER
+    hyprctl hyprpaper wallpaper ,$WALLPAPER
+fi
+
+if [[ "$(hostname)" != "gentoo" ]]; then
+    swww img $WALLPAPER --transition-fps 120 --transition-duration 2 -t wipe &
+fi
+
+# bash ~/config/scripts/hot-reload.sh

scripts/select-wallpaper.sh

@@ -6,7 +6,7 @@ if [ ${#WALLPAPER} -gt 0 ] ; then
 
 	rm -f $HOME/.cache/.wallpaper
 
-	echo "$HOME/Pictures/Wallpapers/$WALLPAPER" >> $HOME/.cache/.wallpaper
+	echo "$HOME/Pictures/Wallpapers/$WALLPAPER" > $HOME/.cache/.wallpaper
 
 	rm -rf $HOME/.cache/wal
 
@@ -14,7 +14,21 @@ if [ ${#WALLPAPER} -gt 0 ] ; then
 
 	# wal -stn -a 90 -i $HOME/wallpaper/$WALLPAPER
 
-	swww img $HOME/Pictures/Wallpapers/$WALLPAPER --transition-fps 300 --transition-duration 2 --transition-type simple --transition-step 3 &
+	if [[ "$(hostname)" != "gentoo" ]]; then
+		swww img $HOME/Pictures/Wallpapers/$WALLPAPER --transition-fps 300 --transition-duration 2 --transition-type simple --transition-step 3 &
+	fi
+
+	if [[ "$(hostname)" == "gentoo" ]]; then
+		HYPRPAPER_PID="$(pidof hyprpaper)"
+		if [ ${#HYPRPAPER_PID} -lt 1 ]; then
+			hyprctl dispatch exec hyprpaper
+			sleep 1
+		fi
+		hyprctl hyprpaper unload all
+		hyprctl hyprpaper preload $HOME/Pictures/Wallpapers/$WALLPAPER
+		hyprctl hyprpaper wallpaper ,$HOME/Pictures/Wallpapers/$WALLPAPER
+	fi
+
 	# bash ~/dotfiles/scripts/hot-reload.sh
 
 else

scripts/xdg.sh

@@ -2,6 +2,8 @@
 
 sleep 1
 
+# notify-send "ocbwoy3" "ran xdg setup"
+
 # kill all possible running xdg-desktop-portals
 kill -9 $(pidof xdg-desktop-portal-hyprland)
 kill -9 $(pidof xdg-desktop-portal-gnome)
@@ -13,9 +15,13 @@ kill -9 $(pidof xdg-desktop-portal)
 sleep 1
 
 # start xdg-desktop-portal-hyprland
-/usr/lib/xdg-desktop-portal-hyprland &
+hyprctl dispatch exec /usr/lib/xdg-desktop-portal-hyprland &
 sleep 2
 
+# notify-send "ocbwoy3" "xdph"
+
 # start xdg-desktop-portal
-/usr/lib/xdg-desktop-portal &
+hyprctl dispatch exec /usr/lib/xdg-desktop-portal &
 sleep 1
+
+# notify-send "ocbwoy3" "xdp"