Merge pull request #34 from JaKooLit/v2.1.9

V2.1.9

15 files changed, 23 insertions, 356 deletions

diff --git a/config/hypr/configs/Settings.conf b/config/hypr/configs/Settings.conf
index 6fb6c98c..fe3ad2a6 100644
--- a/config/hypr/configs/Settings.conf
+++ b/config/hypr/configs/Settings.conf
@@ -1,13 +1,7 @@
 ## refer to Hyprland wiki for more info https://wiki.hyprland.org/Configuring/Variables
 ## JaKooLit Github - https://github.com/JaKooLit
 
-$themes = $HOME/.config/hypr/themes
-
-# Catpuccin Hyprland Themes
-source = $themes/mocha.conf
-#source = $themes/frappe.conf
-#source = $themes/latte.conf
-#source = $themes/machiato.conf
+source = $HOME/.cache/wal/colors-hyprland
 
 # blurls = waybar
 # blurls = rofi
@@ -29,20 +23,20 @@ general {
   apply_sens_to_raw=1
   gaps_in = 4
   gaps_out = 8
-  border_size = 1
+  border_size = 2
   resize_on_border = true
    
-  col.active_border = $lavender $blue $sapphire $mauve $red $flamingo 45deg 
-  col.inactive_border = $overlay1
+  col.active_border = $color0 $color2 $color4 $color6 $color8 45deg
+  col.inactive_border = $backgroundCol
 
   layout = master
 }
 
 group {
-  col.border_active = $maroon
+  col.border_active = $color15
 
 	groupbar {
-	col.active = $green
+	col.active = $color0
   }
 }
 
@@ -57,14 +51,14 @@ decoration {
   dim_strength = 0.1
 
   drop_shadow=true
-  shadow_range=4
+  shadow_range=6
   shadow_render_power = 1
-  col.shadow = $mauve
+  col.shadow = $color2
   col.shadow_inactive = 0x50000000
 
   blur {
   enabled = true	
-  size = 5
+  size = 4
   passes = 1
   ignore_opacity = true
   new_optimizations = true
diff --git a/config/hypr/scripts/DarkLight.sh b/config/hypr/scripts/DarkLight.sh
index 7cc061f1..53e1c7d5 100755
--- a/config/hypr/scripts/DarkLight.sh
+++ b/config/hypr/scripts/DarkLight.sh
@@ -42,7 +42,7 @@ path_param=$(echo $next_mode | sed 's/.*/\u&/')
 
 notify_user "$next_mode"
 #ln -sf "${waybar_config}/style/style-pywal.css" "${waybar_config}/style.css"
-ln -sf "${dunst_config}/styles/dunstrc-${next_mode}" "${dunst_config}/styles/dunstrc"
+ln -sf "${dunst_config}/styles/dunstrc-${next_mode}" "${dunst_config}/dunstrc"
 
 # Symlink for rofi theme
 if [ "$next_mode" = "dark" ]; then
diff --git a/config/hypr/scripts/Dunst.sh b/config/hypr/scripts/Dunst.sh
deleted file mode 100755
index fa8bc10d..00000000
--- a/config/hypr/scripts/Dunst.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-CONFIG="$HOME/.config/dunst/dunstrc"
-
-if [[ ! $(pidof dunst) ]]; then
-	dunst -conf ${CONFIG}
-fi
diff --git a/config/hypr/scripts/LidSwitch.sh b/config/hypr/scripts/LidSwitch.sh
deleted file mode 100755
index 76bce1f2..00000000
--- a/config/hypr/scripts/LidSwitch.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-
-if grep open /proc/acpi/button/lid/LID/state; then
-    hyprctl keyword monitor "eDP-1, preferred, auto, 1"
-else
-    if [[ `hyprctl monitors | grep "Monitor" | wc -l` != 1 ]]; then
-        hyprctl keyword monitor "eDP-1, disable"
-    fi
-fi
\ No newline at end of file
diff --git a/config/hypr/scripts/Refresh.sh b/config/hypr/scripts/Refresh.sh
index 923d4db8..3037458b 100755
--- a/config/hypr/scripts/Refresh.sh
+++ b/config/hypr/scripts/Refresh.sh
@@ -2,16 +2,17 @@
 
 SCRIPTSDIR=$HOME/.config/hypr/scripts
 
-# Kill already running process
+# Kill already running processes
 _ps=(waybar dunst rofi)
 for _prs in "${_ps[@]}"; do
-	if [[ $(pidof ${_prs}) ]]; then
-		pkill ${_prs}
-	fi
+    if pidof "${_prs}" >/dev/null; then
+        pkill "${_prs}"
+    fi
 done
 
-# Lauch notification daemon (dunst)
-${SCRIPTSDIR}/Dunst.sh &
+# relaunch apps
+dunst &
+waybar &
 
-# Lauch statusbar (waybar)
-${SCRIPTSDIR}/Waybar.sh &
+#sleep 1
+#${SCRIPTSDIR}/RainbowBorders.sh &
\ No newline at end of file
diff --git a/config/hypr/scripts/Wallpaper.sh b/config/hypr/scripts/Wallpaper.sh
index 20c367cc..d5ea4645 100755
--- a/config/hypr/scripts/Wallpaper.sh
+++ b/config/hypr/scripts/Wallpaper.sh
@@ -4,48 +4,8 @@ DIR=$HOME/Pictures/wallpapers/
 PICS=($(find ${DIR} -type f \( -name "*.jpg" -o -name "*.jpeg" -o -name "*.png" -o -name "*.gif" \)))
 RANDOMPICS=${PICS[ $RANDOM % ${#PICS[@]} ]}
 
-change_swaybg(){
-  pkill swww
-  pkill swaybg
-  swaybg -m fill -i ${RANDOMPICS}
-}
-
-change_swww(){
-  pkill swaybg
-  swww query || swww init
-  swww img ${RANDOMPICS} --transition-fps 30 --transition-type any --transition-duration 3
-}
-
-change_current(){
-  if pidof swaybg >/dev/null; then
-    change_swaybg
-  else
-    change_swww
-  fi
-}
-
-switch(){
-  if pidof swaybg >/dev/null; then
-    change_swww
-  else
-    change_swaybg
-  fi
-}
-
-case "$1" in
-	"swaybg")
-		change_swaybg
-		;;
-	"swww")
-		change_swww
-		;;
-  "s")
-		switch
-		;;
-	*)
-		change_current
-		;;
-esac
+swww query || swww init
+swww img ${RANDOMPICS} --transition-fps 30 --transition-type any --transition-duration 3
 
 exec $HOME/.config/hypr/scripts/PywalSwww.sh &
 sleep 1
diff --git a/config/hypr/scripts/WallpaperRandom.sh b/config/hypr/scripts/WallpaperRandom.sh
index ea04aa01..13bc5033 100755
--- a/config/hypr/scripts/WallpaperRandom.sh
+++ b/config/hypr/scripts/WallpaperRandom.sh
@@ -2,8 +2,6 @@
 
 # This script will randomly go through the files of a directory, setting it
 # up as the wallpaper at regular intervals
-#
-# NOTE: this script uses bash (not POSIX shell) for the RANDOM variable
 
 pywal_script=$HOME/.config/hypr/scripts/PywalSwww.sh
 pywal_refresh=$HOME/.config/hypr/scripts/Refresh.sh
diff --git a/config/hypr/scripts/WallpaperSelect.sh b/config/hypr/scripts/WallpaperSelect.sh
index 24fcae2e..d748318a 100755
--- a/config/hypr/scripts/WallpaperSelect.sh
+++ b/config/hypr/scripts/WallpaperSelect.sh
@@ -1,6 +1,7 @@
 #!/bin/bash
 # WALLPAPERS PATH
 DIR=$HOME/Pictures/wallpapers
+
 # Transition config
 FPS=30
 TYPE="simple"
diff --git a/config/hypr/scripts/Waybar.sh b/config/hypr/scripts/Waybar.sh
deleted file mode 100755
index 394f309a..00000000
--- a/config/hypr/scripts/Waybar.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-
-CONFIG="$HOME/.config/waybar/config"
-STYLE="$HOME/.config/waybar/style.css"
-
-if [[ ! $(pidof waybar) ]]; then
-	waybar --bar main-bar --log-level error --config ${CONFIG} --style ${STYLE}
-fi
diff --git a/config/hypr/scripts/WaybarStyles.sh b/config/hypr/scripts/WaybarStyles.sh
index de3a54dc..8a420f55 100755
--- a/config/hypr/scripts/WaybarStyles.sh
+++ b/config/hypr/scripts/WaybarStyles.sh
@@ -30,7 +30,7 @@ main() {
     apply_style "$choice"
 
     # Restart relevant processes
-    for process in waybar mako dunst; do
+    for process in waybar dunst; do
         if pgrep -x "$process" >/dev/null; then
             pkill "$process"
         fi
diff --git a/config/hypr/scripts/Wlogout.sh b/config/hypr/scripts/Wlogout.sh
deleted file mode 100755
index c8ce86c1..00000000
--- a/config/hypr/scripts/Wlogout.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/bash
-
-# If you have 1440p, better to use this
-#wlogout --protocol layer-shell -b 5 -T 600 -B 600 &
-
-# for 1080p
-wlogout --protocol layer-shell -b 5 -T 450 -B 450 &
-
-
-# Capture the PID of the wlogout process
-wlogout_pid=$!
-
-# Wait for up to 30 seconds for wlogout to exit gracefully
-timeout 30s tail --pid $wlogout_pid -f /dev/null
-
-# If wlogout is still running after the timeout, forcefully kill it
-if ps -p $wlogout_pid > /dev/null; then
-  kill -KILL $wlogout_pid
-fi
diff --git a/config/hypr/themes/frappe.conf b/config/hypr/themes/frappe.conf
deleted file mode 100644
index e07e4d38..00000000
--- a/config/hypr/themes/frappe.conf
+++ /dev/null
@@ -1,61 +0,0 @@
-$rosewaterAlpha = fff5e0dc
-$flamingoAlpha  = fff2cdcd
-$pinkAlpha      = fff5c2e7
-$mauveAlpha     = ffcba6f7
-$redAlpha       = fff38ba8
-$maroonAlpha    = ffeba0ac
-$peachAlpha     = fffab387
-$yellowAlpha    = fff9e2af
-$greenAlpha     = ffa6e3a1
-$tealAlpha      = ff94e2d5
-$skyAlpha       = ff89dceb
-$sapphireAlpha  = ff74c7ec
-$blueAlpha      = ff89b4fa
-$lavenderAlpha  = ffb4befe
-
-$textAlpha      = ffcdd6f4
-$subtext1Alpha  = ffbac2de
-$subtext0Alpha  = ffa6adc8
-
-$overlay2Alpha  = ff9399b2
-$overlay1Alpha  = ff7f849c
-$overlay0Alpha  = ff6c7086
-
-$surface2Alpha  = ff585b70
-$surface1Alpha  = ff45475a
-$surface0Alpha  = ff313244
-
-$baseAlpha      = ff1e1e2e
-$mantleAlpha    = ff181825
-$crustAlpha     = ff11111b
-
-$rosewater = 0xfff5e0dc
-$flamingo  = 0xfff2cdcd
-$pink      = 0xfff5c2e7
-$mauve     = 0xffcba6f7
-$red       = 0xfff38ba8
-$maroon    = 0xffeba0ac
-$peach     = 0xfffab387
-$yellow    = 0xfff9e2af
-$green     = 0xffa6e3a1
-$teal      = 0xff94e2d5
-$sky       = 0xff89dceb
-$sapphire  = 0xff74c7ec
-$blue      = 0xff89b4fa
-$lavender  = 0xffb4befe
-
-$text      = 0xffcdd6f4
-$subtext1  = 0xffbac2de
-$subtext0  = 0xffa6adc8
-
-$overlay2  = 0xff9399b2
-$overlay1  = 0xff7f849c
-$overlay0  = 0xff6c7086
-
-$surface2  = 0xff585b70
-$surface1  = 0xff45475a
-$surface0  = 0xff313244
-
-$base      = 0xff1e1e2e
-$mantle    = 0xff181825
-$crust     = 0xff11111b
diff --git a/config/hypr/themes/latte.conf b/config/hypr/themes/latte.conf
deleted file mode 100644
index e07e4d38..00000000
--- a/config/hypr/themes/latte.conf
+++ /dev/null
@@ -1,61 +0,0 @@
-$rosewaterAlpha = fff5e0dc
-$flamingoAlpha  = fff2cdcd
-$pinkAlpha      = fff5c2e7
-$mauveAlpha     = ffcba6f7
-$redAlpha       = fff38ba8
-$maroonAlpha    = ffeba0ac
-$peachAlpha     = fffab387
-$yellowAlpha    = fff9e2af
-$greenAlpha     = ffa6e3a1
-$tealAlpha      = ff94e2d5
-$skyAlpha       = ff89dceb
-$sapphireAlpha  = ff74c7ec
-$blueAlpha      = ff89b4fa
-$lavenderAlpha  = ffb4befe
-
-$textAlpha      = ffcdd6f4
-$subtext1Alpha  = ffbac2de
-$subtext0Alpha  = ffa6adc8
-
-$overlay2Alpha  = ff9399b2
-$overlay1Alpha  = ff7f849c
-$overlay0Alpha  = ff6c7086
-
-$surface2Alpha  = ff585b70
-$surface1Alpha  = ff45475a
-$surface0Alpha  = ff313244
-
-$baseAlpha      = ff1e1e2e
-$mantleAlpha    = ff181825
-$crustAlpha     = ff11111b
-
-$rosewater = 0xfff5e0dc
-$flamingo  = 0xfff2cdcd
-$pink      = 0xfff5c2e7
-$mauve     = 0xffcba6f7
-$red       = 0xfff38ba8
-$maroon    = 0xffeba0ac
-$peach     = 0xfffab387
-$yellow    = 0xfff9e2af
-$green     = 0xffa6e3a1
-$teal      = 0xff94e2d5
-$sky       = 0xff89dceb
-$sapphire  = 0xff74c7ec
-$blue      = 0xff89b4fa
-$lavender  = 0xffb4befe
-
-$text      = 0xffcdd6f4
-$subtext1  = 0xffbac2de
-$subtext0  = 0xffa6adc8
-
-$overlay2  = 0xff9399b2
-$overlay1  = 0xff7f849c
-$overlay0  = 0xff6c7086
-
-$surface2  = 0xff585b70
-$surface1  = 0xff45475a
-$surface0  = 0xff313244
-
-$base      = 0xff1e1e2e
-$mantle    = 0xff181825
-$crust     = 0xff11111b
diff --git a/config/hypr/themes/macchiato.conf b/config/hypr/themes/macchiato.conf
deleted file mode 100644
index e07e4d38..00000000
--- a/config/hypr/themes/macchiato.conf
+++ /dev/null
@@ -1,61 +0,0 @@
-$rosewaterAlpha = fff5e0dc
-$flamingoAlpha  = fff2cdcd
-$pinkAlpha      = fff5c2e7
-$mauveAlpha     = ffcba6f7
-$redAlpha       = fff38ba8
-$maroonAlpha    = ffeba0ac
-$peachAlpha     = fffab387
-$yellowAlpha    = fff9e2af
-$greenAlpha     = ffa6e3a1
-$tealAlpha      = ff94e2d5
-$skyAlpha       = ff89dceb
-$sapphireAlpha  = ff74c7ec
-$blueAlpha      = ff89b4fa
-$lavenderAlpha  = ffb4befe
-
-$textAlpha      = ffcdd6f4
-$subtext1Alpha  = ffbac2de
-$subtext0Alpha  = ffa6adc8
-
-$overlay2Alpha  = ff9399b2
-$overlay1Alpha  = ff7f849c
-$overlay0Alpha  = ff6c7086
-
-$surface2Alpha  = ff585b70
-$surface1Alpha  = ff45475a
-$surface0Alpha  = ff313244
-
-$baseAlpha      = ff1e1e2e
-$mantleAlpha    = ff181825
-$crustAlpha     = ff11111b
-
-$rosewater = 0xfff5e0dc
-$flamingo  = 0xfff2cdcd
-$pink      = 0xfff5c2e7
-$mauve     = 0xffcba6f7
-$red       = 0xfff38ba8
-$maroon    = 0xffeba0ac
-$peach     = 0xfffab387
-$yellow    = 0xfff9e2af
-$green     = 0xffa6e3a1
-$teal      = 0xff94e2d5
-$sky       = 0xff89dceb
-$sapphire  = 0xff74c7ec
-$blue      = 0xff89b4fa
-$lavender  = 0xffb4befe
-
-$text      = 0xffcdd6f4
-$subtext1  = 0xffbac2de
-$subtext0  = 0xffa6adc8
-
-$overlay2  = 0xff9399b2
-$overlay1  = 0xff7f849c
-$overlay0  = 0xff6c7086
-
-$surface2  = 0xff585b70
-$surface1  = 0xff45475a
-$surface0  = 0xff313244
-
-$base      = 0xff1e1e2e
-$mantle    = 0xff181825
-$crust     = 0xff11111b
diff --git a/config/hypr/themes/mocha.conf b/config/hypr/themes/mocha.conf
deleted file mode 100644
index e07e4d38..00000000
--- a/config/hypr/themes/mocha.conf
+++ /dev/null
@@ -1,61 +0,0 @@
-$rosewaterAlpha = fff5e0dc
-$flamingoAlpha  = fff2cdcd
-$pinkAlpha      = fff5c2e7
-$mauveAlpha     = ffcba6f7
-$redAlpha       = fff38ba8
-$maroonAlpha    = ffeba0ac
-$peachAlpha     = fffab387
-$yellowAlpha    = fff9e2af
-$greenAlpha     = ffa6e3a1
-$tealAlpha      = ff94e2d5
-$skyAlpha       = ff89dceb
-$sapphireAlpha  = ff74c7ec
-$blueAlpha      = ff89b4fa
-$lavenderAlpha  = ffb4befe
-
-$textAlpha      = ffcdd6f4
-$subtext1Alpha  = ffbac2de
-$subtext0Alpha  = ffa6adc8
-
-$overlay2Alpha  = ff9399b2
-$overlay1Alpha  = ff7f849c
-$overlay0Alpha  = ff6c7086
-
-$surface2Alpha  = ff585b70
-$surface1Alpha  = ff45475a
-$surface0Alpha  = ff313244
-
-$baseAlpha      = ff1e1e2e
-$mantleAlpha    = ff181825
-$crustAlpha     = ff11111b
-
-$rosewater = 0xfff5e0dc
-$flamingo  = 0xfff2cdcd
-$pink      = 0xfff5c2e7
-$mauve     = 0xffcba6f7
-$red       = 0xfff38ba8
-$maroon    = 0xffeba0ac
-$peach     = 0xfffab387
-$yellow    = 0xfff9e2af
-$green     = 0xffa6e3a1
-$teal      = 0xff94e2d5
-$sky       = 0xff89dceb
-$sapphire  = 0xff74c7ec
-$blue      = 0xff89b4fa
-$lavender  = 0xffb4befe
-
-$text      = 0xffcdd6f4
-$subtext1  = 0xffbac2de
-$subtext0  = 0xffa6adc8
-
-$overlay2  = 0xff9399b2
-$overlay1  = 0xff7f849c
-$overlay0  = 0xff6c7086
-
-$surface2  = 0xff585b70
-$surface1  = 0xff45475a
-$surface0  = 0xff313244
-
-$base      = 0xff1e1e2e
-$mantle    = 0xff181825
-$crust     = 0xff11111b