From 42ba4dc6439460cc266f0b83227450263401f05f Mon Sep 17 00:00:00 2001 From: installer Date: Thu, 20 Feb 2025 01:57:06 +0900 Subject: im getting there --- config/hypr/UserScripts/WallpaperSelect.sh | 31 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 17 deletions(-) (limited to 'config/hypr/UserScripts/WallpaperSelect.sh') diff --git a/config/hypr/UserScripts/WallpaperSelect.sh b/config/hypr/UserScripts/WallpaperSelect.sh index d75c2c15..6ea01673 100755 --- a/config/hypr/UserScripts/WallpaperSelect.sh +++ b/config/hypr/UserScripts/WallpaperSelect.sh @@ -22,9 +22,10 @@ focused_monitor=$(hyprctl monitors -j | jq -r '.[] | select(.focused) | .name') monitor_width=$(hyprctl monitors -j | jq -r --arg mon "$focused_monitor" '.[] | select(.name == $mon) | .width') scale_factor=$(hyprctl monitors -j | jq -r --arg mon "$focused_monitor" '.[] | select(.name == $mon) | .scale') -# Calculate icon size for rofi -icon_size=$(echo "scale=1; ($monitor_width * 14) / ($scale_factor * 100)" | bc) -rofi_override="element-icon{size:${icon_size}px;}" +icon_size=$(echo "scale=1; ($monitor_width * 18) / ($scale_factor * 100)" | bc) # icon size +margin=$(echo "scale=1; ($scale_factor * 120) / $scale_factor" | bc) # margin + +rofi_override="element-icon{size:${icon_size}px;margin:-${margin}px;}" # swww transition config FPS=60 @@ -74,7 +75,6 @@ swww query || swww-daemon --format xrgb main() { choice=$(menu | $rofi_command) - # Trim any potential whitespace or hidden characters choice=$(echo "$choice" | xargs) RANDOM_PIC_NAME=$(echo "$RANDOM_PIC_NAME" | xargs) @@ -94,7 +94,6 @@ main() { exit 0 fi - # Find the index of the selected file pic_index=-1 for i in "${!PICS[@]}"; do filename=$(basename "${PICS[$i]}") @@ -143,16 +142,16 @@ if [[ -n "$choice" ]]; then while read -r line; do if echo "$line" | grep -q "yes"; then - # Check if terminal exists - if ! command -v "$terminal" &>/dev/null; then - notify-send -i "$iDIR/ja.png" "Missing $terminal" "Install $terminal to enable setting of wallpaper background" - exit 1 - fi + # Check if terminal exists + if ! command -v "$terminal" &>/dev/null; then + notify-send -i "$iDIR/ja.png" "Missing $terminal" "Install $terminal to enable setting of wallpaper background" + exit 1 + fi - $terminal -e bash -c "echo 'Enter your password to set wallpaper as SDDM Background'; \ - sudo cp -r $wallpaper_current '$sddm_sequoia/backgrounds/default' && \ - notify-send -i '$iDIR/ja.png' 'SDDM' 'Background SET'" - break + $terminal -e bash -c "echo 'Enter your password to set wallpaper as SDDM Background'; \ + sudo cp -r $wallpaper_current '$sddm_sequoia/backgrounds/default' && \ + notify-send -i '$iDIR/ja.png' 'SDDM' 'Background SET'" + break elif echo "$line" | grep -q "no"; then echo "Wallpaper not set as SDDM background. Exiting." break @@ -160,6 +159,4 @@ if [[ -n "$choice" ]]; then done & fi -fi - - +fi \ No newline at end of file -- cgit v1.2.3 From b0b6f0a8b1734e45de46b36a4e806002867db161 Mon Sep 17 00:00:00 2001 From: JaKooLit Date: Thu, 20 Feb 2025 12:22:52 +0900 Subject: slight improvement wallpaper select script. update hyprland.conf in integration with nwg-displays --- config/hypr/UserScripts/WallpaperSelect.sh | 4 ++-- config/hypr/hyprland.conf | 7 +++++-- 2 files changed, 7 insertions(+), 4 deletions(-) (limited to 'config/hypr/UserScripts/WallpaperSelect.sh') diff --git a/config/hypr/UserScripts/WallpaperSelect.sh b/config/hypr/UserScripts/WallpaperSelect.sh index 6ea01673..e1a84001 100755 --- a/config/hypr/UserScripts/WallpaperSelect.sh +++ b/config/hypr/UserScripts/WallpaperSelect.sh @@ -22,8 +22,8 @@ focused_monitor=$(hyprctl monitors -j | jq -r '.[] | select(.focused) | .name') monitor_width=$(hyprctl monitors -j | jq -r --arg mon "$focused_monitor" '.[] | select(.name == $mon) | .width') scale_factor=$(hyprctl monitors -j | jq -r --arg mon "$focused_monitor" '.[] | select(.name == $mon) | .scale') -icon_size=$(echo "scale=1; ($monitor_width * 18) / ($scale_factor * 100)" | bc) # icon size -margin=$(echo "scale=1; ($scale_factor * 120) / $scale_factor" | bc) # margin +icon_size=$(echo "scale=1; ($monitor_width * 15) / ($scale_factor * 100)" | bc) # icon size +margin=$(echo "scale=1; ($scale_factor * 100) / $scale_factor" | bc) # margin rofi_override="element-icon{size:${icon_size}px;margin:-${margin}px;}" diff --git a/config/hypr/hyprland.conf b/config/hypr/hyprland.conf index fc2b781c..1469db06 100644 --- a/config/hypr/hyprland.conf +++ b/config/hypr/hyprland.conf @@ -19,7 +19,8 @@ source= $UserConfigs/Startup_Apps.conf # put your start-up packages on this file source= $UserConfigs/ENVariables.conf # Environment variables to load -source= $UserConfigs/Monitors.conf # Its all about your monitor config +#source= $UserConfigs/Monitors.conf # Its all about your monitor config (old builds) +#source= $UserConfigs/WorkspaceRules.conf # Hyprland workspaces (old dots) source= $UserConfigs/Laptops.conf # For laptop related @@ -35,4 +36,6 @@ source= $UserConfigs/UserKeybinds.conf # Put your own keybinds here source= $UserConfigs/UserSettings.conf # Main Hyprland Settings. -source= $UserConfigs/WorkspaceRules.conf # Hyprland workspaces \ No newline at end of file +# nwg displays +source= $HOME/.config/hypr/monitors.conf +source= $HOME/.config/hypr/workspaces.conf \ No newline at end of file -- cgit v1.2.3 From fa35823a36a122aeab894c93800dec720bb4f7d6 Mon Sep 17 00:00:00 2001 From: JaKooLit Date: Thu, 20 Feb 2025 17:02:22 +0900 Subject: Ok I think this is ok. Just note to myself. DO NOT CODE WHEN YOU ARE HUNGRY --- config/hypr/UserScripts/QuickEdit.sh | 16 ++++++++-------- config/hypr/UserScripts/WallpaperSelect.sh | 5 ++--- config/rofi/config-rofi-theme.rasi | 22 +++++++++------------- config/rofi/config-wallpaper.rasi | 21 +++++++++++---------- config/rofi/themes/KooL_LonerOrZ.rasi | 2 ++ config/rofi/themes/KooL_style-1.rasi | 1 + config/rofi/themes/KooL_style-10-Fancy-v2.rasi | 2 ++ config/rofi/themes/KooL_style-10-Fancy.rasi | 6 ++++++ .../rofi/themes/KooL_style-11-Win11-list-dark.rasi | 1 + .../themes/KooL_style-11-Win11-list-light.rasi | 2 +- config/rofi/themes/KooL_style-12-TOP-Docu.rasi | 3 ++- config/rofi/themes/KooL_style-13-Vertical.rasi | 1 + config/rofi/themes/KooL_style-2-Dark.rasi | 2 ++ config/rofi/themes/KooL_style-2-Light.rasi | 2 ++ config/rofi/themes/KooL_style-3-Fullscreen-v2.rasi | 8 +++++++- config/rofi/themes/KooL_style-4.rasi | 1 + config/rofi/themes/KooL_style-5.rasi | 1 + config/rofi/themes/KooL_style-6.rasi | 14 ++++++++------ config/rofi/themes/KooL_style-7.rasi | 5 +++-- config/rofi/themes/KooL_style-8.rasi | 1 + config/rofi/themes/KooL_style-9.rasi | 1 + 21 files changed, 72 insertions(+), 45 deletions(-) (limited to 'config/hypr/UserScripts/WallpaperSelect.sh') diff --git a/config/hypr/UserScripts/QuickEdit.sh b/config/hypr/UserScripts/QuickEdit.sh index 12db89b4..618ed002 100755 --- a/config/hypr/UserScripts/QuickEdit.sh +++ b/config/hypr/UserScripts/QuickEdit.sh @@ -24,8 +24,8 @@ menu() { 7. view/edit Animations 8. view/edit Laptop Keybinds 9. view/edit Default Keybinds -10. view/edit Monitors (via nwg-display) -11. view/edit Workspace Rules (nwg-display) +10. view/edit Monitors (via nwg-displays) +11. view/edit Workspace Rules (nwg-displays) EOF } @@ -38,12 +38,12 @@ main() { 1) file="$UserConfigs/ENVariables.conf" ;; 2) file="$UserConfigs/WindowRules.conf" ;; 3) file="$UserConfigs/UserKeybinds.conf" ;; - 4) file="$UserConfigs/UserKeybinds.conf" ;; - 5) file="$UserConfigs/UserSettings.conf" ;; - 6) file="$UserConfigs/Startup_Apps.conf" ;; - 7) file="$UserConfigs/UserDecorations.conf" ;; - 8) file="$UserConfigs/UserAnimations.conf" ;; - 9) file="$UserConfigs/Laptops.conf" ;; + 4) file="$UserConfigs/UserSettings.conf" ;; + 5) file="$UserConfigs/Startup_Apps.conf" ;; + 6) file="$UserConfigs/UserDecorations.conf" ;; + 7) file="$UserConfigs/UserAnimations.conf" ;; + 8) file="$UserConfigs/Laptops.conf" ;; + 9) file="$configs/Keybinds.conf" ;; 10) nwg-displays ;; 11) nwg-displays ;; *) return ;; # Do nothing for invalid choices diff --git a/config/hypr/UserScripts/WallpaperSelect.sh b/config/hypr/UserScripts/WallpaperSelect.sh index e1a84001..32f9a93b 100755 --- a/config/hypr/UserScripts/WallpaperSelect.sh +++ b/config/hypr/UserScripts/WallpaperSelect.sh @@ -22,10 +22,9 @@ focused_monitor=$(hyprctl monitors -j | jq -r '.[] | select(.focused) | .name') monitor_width=$(hyprctl monitors -j | jq -r --arg mon "$focused_monitor" '.[] | select(.name == $mon) | .width') scale_factor=$(hyprctl monitors -j | jq -r --arg mon "$focused_monitor" '.[] | select(.name == $mon) | .scale') -icon_size=$(echo "scale=1; ($monitor_width * 15) / ($scale_factor * 100)" | bc) # icon size -margin=$(echo "scale=1; ($scale_factor * 100) / $scale_factor" | bc) # margin +icon_size=$(echo "scale=1; ($monitor_width * 3) / ($scale_factor * 400)" | bc) -rofi_override="element-icon{size:${icon_size}px;margin:-${margin}px;}" +rofi_override="element-icon{size:${icon_size}%;}" # swww transition config FPS=60 diff --git a/config/rofi/config-rofi-theme.rasi b/config/rofi/config-rofi-theme.rasi index fd6034d3..f968ce62 100644 --- a/config/rofi/config-rofi-theme.rasi +++ b/config/rofi/config-rofi-theme.rasi @@ -15,31 +15,27 @@ mainbox { [ "inputbar", "listview"]; } +/* ---- Entry input ---- */ +entry { + expand: true; + placeholder: " ⬇️ Select Which Rofi Theme wanted to apply"; +} + /* ---- Listview ---- */ listview { columns: 2; lines: 7; fixed-height: false; + margin: 10px; scrollbar: true; } -/* ---- Entry input ---- */ -entry { - expand: true; - placeholder: " ⬇️ Select Which Rofi Theme wanted to apply"; -} - - /* ---- Elements ---- */ -element { - orientation: vertical; -} - element-icon { - size: 0%; + size: 0%; } element-text { horizontal-align: 0.0; + vertical-align: 0.0; margin: 5px 30px 5px 30px; } - diff --git a/config/rofi/config-wallpaper.rasi b/config/rofi/config-wallpaper.rasi index 8e920f2a..00df3f79 100644 --- a/config/rofi/config-wallpaper.rasi +++ b/config/rofi/config-wallpaper.rasi @@ -30,12 +30,10 @@ entry { listview { columns: 6; lines: 2; - spacing: 40px; - padding: 20px; + spacing: 20px; + padding: 10px; columns: 6; lines: 2; - spacing: 40px; - padding: 20px; flow: horizontal; fixed-width: true; fixed-height: true; @@ -44,19 +42,22 @@ listview { /* ---- Element ---- */ element { orientation: vertical; - border-radius: inherit; - spacing: 20px; padding: 0px; + spacing: 0px; + border-radius: 10px; + padding: 0px; + margin: 0px; } element selected.normal { - border: 0px 3px 0px 3px; - border-color: inherit; - border-radius: 2%; + background-color: transparent; } element-icon { - vertical-align: 0.5; + text-color: inherit; + size: 10%; + margin: -30px; + cursor: inherit; } element-text { diff --git a/config/rofi/themes/KooL_LonerOrZ.rasi b/config/rofi/themes/KooL_LonerOrZ.rasi index bfa17b6b..b9c7b25a 100644 --- a/config/rofi/themes/KooL_LonerOrZ.rasi +++ b/config/rofi/themes/KooL_LonerOrZ.rasi @@ -147,6 +147,7 @@ element-text { margin: 2px 0px 2px 2px; } + element normal.urgent, element alternate.urgent { background-color: @UGT; @@ -160,6 +161,7 @@ element alternate.active { text-color: @FG; } +element-text selected, element selected { background-color: @BGA; text-color: @SEL; diff --git a/config/rofi/themes/KooL_style-1.rasi b/config/rofi/themes/KooL_style-1.rasi index 9391e491..444807d8 100644 --- a/config/rofi/themes/KooL_style-1.rasi +++ b/config/rofi/themes/KooL_style-1.rasi @@ -167,6 +167,7 @@ element { cursor: pointer; } +element-text selected, element normal.normal { background-color: inherit; text-color: inherit; diff --git a/config/rofi/themes/KooL_style-10-Fancy-v2.rasi b/config/rofi/themes/KooL_style-10-Fancy-v2.rasi index 0d027c0a..1a791c0f 100644 --- a/config/rofi/themes/KooL_style-10-Fancy-v2.rasi +++ b/config/rofi/themes/KooL_style-10-Fancy-v2.rasi @@ -92,6 +92,8 @@ element normal.active { color: @active; background-color: @light-grey; } + +element-text selected, element selected.normal { border-radius: 0px; color: @black; diff --git a/config/rofi/themes/KooL_style-10-Fancy.rasi b/config/rofi/themes/KooL_style-10-Fancy.rasi index c5d1fa84..d4a56220 100644 --- a/config/rofi/themes/KooL_style-10-Fancy.rasi +++ b/config/rofi/themes/KooL_style-10-Fancy.rasi @@ -213,6 +213,12 @@ element.alternate.active { background-color: @alternate-active-background; text-color: @alternate-active-foreground; } + +element-text selected { + background-color: @selected-active-background; + text-color: @selected-active-foreground; +} + /* ---- Scrollbar ---- */ scrollbar { border: 0px; diff --git a/config/rofi/themes/KooL_style-11-Win11-list-dark.rasi b/config/rofi/themes/KooL_style-11-Win11-list-dark.rasi index 1dcadb81..a00bf33f 100644 --- a/config/rofi/themes/KooL_style-11-Win11-list-dark.rasi +++ b/config/rofi/themes/KooL_style-11-Win11-list-dark.rasi @@ -111,6 +111,7 @@ element selected active { text-color: @accent; } +element-text selected, element selected { background-color: @bg3; } diff --git a/config/rofi/themes/KooL_style-11-Win11-list-light.rasi b/config/rofi/themes/KooL_style-11-Win11-list-light.rasi index b722d44f..692f60c9 100644 --- a/config/rofi/themes/KooL_style-11-Win11-list-light.rasi +++ b/config/rofi/themes/KooL_style-11-Win11-list-light.rasi @@ -111,6 +111,7 @@ element selected active { text-color: @accent; } +element-text selected, element selected { background-color: @bg3; } @@ -146,6 +147,5 @@ textbox { padding : 10px; background-color : @bg0; text-color : @fg0; - vertical-align : 0.5; horizontal-align : 0.5; } diff --git a/config/rofi/themes/KooL_style-12-TOP-Docu.rasi b/config/rofi/themes/KooL_style-12-TOP-Docu.rasi index 0a5e0575..8a79db16 100644 --- a/config/rofi/themes/KooL_style-12-TOP-Docu.rasi +++ b/config/rofi/themes/KooL_style-12-TOP-Docu.rasi @@ -112,8 +112,9 @@ element { padding: 2px; } +element-text selected, element selected { - background-color: white/20%; + background-color: white/30%; text-color: black; } diff --git a/config/rofi/themes/KooL_style-13-Vertical.rasi b/config/rofi/themes/KooL_style-13-Vertical.rasi index 09dc4772..0a7d06f2 100644 --- a/config/rofi/themes/KooL_style-13-Vertical.rasi +++ b/config/rofi/themes/KooL_style-13-Vertical.rasi @@ -208,6 +208,7 @@ element normal.active { text-color: @foreground; } +element-text selected, element selected.normal { background-color: @active; text-color: @foreground; diff --git a/config/rofi/themes/KooL_style-2-Dark.rasi b/config/rofi/themes/KooL_style-2-Dark.rasi index 81e233e4..970e99be 100644 --- a/config/rofi/themes/KooL_style-2-Dark.rasi +++ b/config/rofi/themes/KooL_style-2-Dark.rasi @@ -131,6 +131,8 @@ element normal.active { background-color: #67FF80; text-color: black; } + +element-text selected, element selected.normal { background-color: #c19419; text-color: black; diff --git a/config/rofi/themes/KooL_style-2-Light.rasi b/config/rofi/themes/KooL_style-2-Light.rasi index 2e0b4e6e..e561cb6a 100644 --- a/config/rofi/themes/KooL_style-2-Light.rasi +++ b/config/rofi/themes/KooL_style-2-Light.rasi @@ -131,6 +131,8 @@ element normal.active { background-color: #67FF80; text-color: black; } + +element-text selected, element selected.normal { background-color: #FDD66F; text-color: black; diff --git a/config/rofi/themes/KooL_style-3-Fullscreen-v2.rasi b/config/rofi/themes/KooL_style-3-Fullscreen-v2.rasi index a26ac7ca..12d6fe05 100644 --- a/config/rofi/themes/KooL_style-3-Fullscreen-v2.rasi +++ b/config/rofi/themes/KooL_style-3-Fullscreen-v2.rasi @@ -177,7 +177,13 @@ element normal.normal { text-color: @foreground; } element selected.normal { - background-color: white / 10%; + background-color: inherit; + text-color: @foreground; +} + +element-text selected, +element selected.selected { + background-color: white/50%; text-color: @foreground; } element-icon { diff --git a/config/rofi/themes/KooL_style-4.rasi b/config/rofi/themes/KooL_style-4.rasi index b440189b..ad6a46e8 100644 --- a/config/rofi/themes/KooL_style-4.rasi +++ b/config/rofi/themes/KooL_style-4.rasi @@ -221,6 +221,7 @@ element normal.active { background-color: transparent; text-color: @active-foreground; } +element-text selected, element selected.normal { background-color: @selected-normal-background; text-color: @selected-normal-foreground; diff --git a/config/rofi/themes/KooL_style-5.rasi b/config/rofi/themes/KooL_style-5.rasi index d2a6c125..8cfa1873 100644 --- a/config/rofi/themes/KooL_style-5.rasi +++ b/config/rofi/themes/KooL_style-5.rasi @@ -206,6 +206,7 @@ element normal.active { text-color: inherit; } +element-text selected, element selected.normal { background-color: @active; text-color: inherit; diff --git a/config/rofi/themes/KooL_style-6.rasi b/config/rofi/themes/KooL_style-6.rasi index 175f6ee9..179ea884 100644 --- a/config/rofi/themes/KooL_style-6.rasi +++ b/config/rofi/themes/KooL_style-6.rasi @@ -123,12 +123,12 @@ listview { /* ---- Scrollbar ---- */ scrollbar { - border: 0px; - border-radius: 10px; - background-color: transparent; - handle-color: @active; - handle-width: 2px ; - padding: 0; + border: 0px; + border-radius: 10px; + background-color: transparent; + handle-color: @active; + handle-width: 2px ; + padding: 0; } /* ---- Dummy ---- */ dummy { @@ -174,6 +174,8 @@ element normal.urgent { background-color: @urgent; text-color: @foreground; } + +element-text selected, element normal.active { background-color: @active; text-color: @foreground; diff --git a/config/rofi/themes/KooL_style-7.rasi b/config/rofi/themes/KooL_style-7.rasi index c6e2d102..54123de2 100644 --- a/config/rofi/themes/KooL_style-7.rasi +++ b/config/rofi/themes/KooL_style-7.rasi @@ -154,14 +154,15 @@ element normal.normal { background-color: transparent; text-color: @foreground; } + +element-text selected, element selected.normal { - border-radius: 10%; + border-radius: 30px; background-color: @color11; text-color: @foreground; } element-icon { padding: 0px; - border-radius: 100%; background-color: transparent; text-color: inherit; size: 5%; diff --git a/config/rofi/themes/KooL_style-8.rasi b/config/rofi/themes/KooL_style-8.rasi index 7a264ad7..e983f470 100644 --- a/config/rofi/themes/KooL_style-8.rasi +++ b/config/rofi/themes/KooL_style-8.rasi @@ -159,6 +159,7 @@ element { text-color: @foreground; } +element-text selected, element selected.normal { background-color: @color11; text-color: @foreground; diff --git a/config/rofi/themes/KooL_style-9.rasi b/config/rofi/themes/KooL_style-9.rasi index 42f4138f..0a5b578c 100644 --- a/config/rofi/themes/KooL_style-9.rasi +++ b/config/rofi/themes/KooL_style-9.rasi @@ -177,6 +177,7 @@ element alternate.active { text-color: @FG; } +element-text selected, element selected { background-color: @BGA; text-color: @SEL; -- cgit v1.2.3 From d5b724be5325f8646d1acca8cc7979e3a190d38a Mon Sep 17 00:00:00 2001 From: JaKooLit Date: Sun, 23 Feb 2025 00:57:42 +0900 Subject: the return of the comeback... swww Transition bezier --- config/hypr/UserScripts/WallpaperEffects.sh | 2 +- config/hypr/UserScripts/WallpaperSelect.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'config/hypr/UserScripts/WallpaperSelect.sh') diff --git a/config/hypr/UserScripts/WallpaperEffects.sh b/config/hypr/UserScripts/WallpaperEffects.sh index dea97921..c98400d2 100755 --- a/config/hypr/UserScripts/WallpaperEffects.sh +++ b/config/hypr/UserScripts/WallpaperEffects.sh @@ -19,7 +19,7 @@ FPS=60 TYPE="wipe" DURATION=2 BEZIER=".43,1.19,1,.4" -SWWW_PARAMS="--transition-fps $FPS --transition-type $TYPE --transition-duration $DURATION" +SWWW_PARAMS="--transition-fps $FPS --transition-type $TYPE --transition-duration $DURATION --transition-bezier $BEZIER" # Define ImageMagick effects declare -A effects=( diff --git a/config/hypr/UserScripts/WallpaperSelect.sh b/config/hypr/UserScripts/WallpaperSelect.sh index 32f9a93b..86b7dfa2 100755 --- a/config/hypr/UserScripts/WallpaperSelect.sh +++ b/config/hypr/UserScripts/WallpaperSelect.sh @@ -31,7 +31,7 @@ FPS=60 TYPE="any" DURATION=2 BEZIER=".43,1.19,1,.4" -SWWW_PARAMS="--transition-fps $FPS --transition-type $TYPE --transition-duration $DURATION" +SWWW_PARAMS="--transition-fps $FPS --transition-type $TYPE --transition-duration $DURATION --transition-bezier $BEZIER" # Check if swaybg is running if pidof swaybg > /dev/null; then -- cgit v1.2.3 From 9df8836dc8bf17a86990bbf659105626138552cb Mon Sep 17 00:00:00 2001 From: JaKooLit Date: Sun, 23 Feb 2025 13:15:07 +0900 Subject: Not sure if important.. but whatever --- README.md | 2 +- config/hypr/UserScripts/Kool_Quick_Settings.sh | 2 +- config/hypr/UserScripts/RofiBeats.sh | 4 +-- config/hypr/UserScripts/WallpaperEffects.sh | 2 +- config/hypr/UserScripts/WallpaperSelect.sh | 2 +- config/hypr/UserScripts/Weather.py | 2 +- config/hypr/UserScripts/Weather.sh | 4 +-- config/hypr/UserScripts/ZshChangeTheme.sh | 2 +- config/hypr/hyprlock-1080p.conf | 2 +- config/hypr/hyprlock.conf | 2 +- config/hypr/initial-boot.sh | 4 +-- config/hypr/scripts/Animations.sh | 2 +- config/hypr/scripts/ClipManager.sh | 2 +- config/hypr/scripts/DarkLight.sh | 2 +- config/hypr/scripts/MonitorProfiles.sh | 4 +-- config/hypr/scripts/RofiEmoji.sh | 2 +- config/waybar/configs/[TOP] Everforest | 4 +-- copy.sh | 43 +++++++++++++------------- upgrade.sh | 10 +++--- 19 files changed, 49 insertions(+), 48 deletions(-) (limited to 'config/hypr/UserScripts/WallpaperSelect.sh') diff --git a/README.md b/README.md index b6858135..58f5e712 100644 --- a/README.md +++ b/README.md @@ -119,7 +119,7 @@ chmod +x upgrade.sh ## ⚠️⚠️⚠️ ATTENTION - BACKUPS CREATED by SCRIPT > [!CAUTION] > copy.sh, release.sh and even upgrade.sh creates a backup! -> Kindly investigate manually contents on your ~/.config +> Kindly investigate manually contents on your $HOME/.config > Delete manually all the backups which you dont need #### 🛎️ a small note on wallpapers diff --git a/config/hypr/UserScripts/Kool_Quick_Settings.sh b/config/hypr/UserScripts/Kool_Quick_Settings.sh index a6dc2885..88e26089 100755 --- a/config/hypr/UserScripts/Kool_Quick_Settings.sh +++ b/config/hypr/UserScripts/Kool_Quick_Settings.sh @@ -9,7 +9,7 @@ tty=kitty # variables configs="$HOME/.config/hypr/configs" UserConfigs="$HOME/.config/hypr/UserConfigs" -rofi_theme="~/.config/rofi/config-edit.rasi" +rofi_theme="$HOME/.config/rofi/config-edit.rasi" msg=' ⁉️ Choose what to do ⁉️' iDIR="$HOME/.config/swaync/images" scriptsDir="$HOME/.config/hypr/scripts" diff --git a/config/hypr/UserScripts/RofiBeats.sh b/config/hypr/UserScripts/RofiBeats.sh index 74a8fe54..4587e720 100755 --- a/config/hypr/UserScripts/RofiBeats.sh +++ b/config/hypr/UserScripts/RofiBeats.sh @@ -5,8 +5,8 @@ # Variables mDIR="$HOME/Music/" iDIR="$HOME/.config/swaync/icons" -rofi_theme="~/.config/rofi/config-rofi-Beats.rasi" -rofi_theme_1="~/.config/rofi/config-rofi-Beats-menu.rasi" +rofi_theme="$HOME/.config/rofi/config-rofi-Beats.rasi" +rofi_theme_1="$HOME/.config/rofi/config-rofi-Beats-menu.rasi" # Online Stations. Edit as required declare -A online_music=( diff --git a/config/hypr/UserScripts/WallpaperEffects.sh b/config/hypr/UserScripts/WallpaperEffects.sh index c98400d2..948c637c 100755 --- a/config/hypr/UserScripts/WallpaperEffects.sh +++ b/config/hypr/UserScripts/WallpaperEffects.sh @@ -8,7 +8,7 @@ wallpaper_current="$HOME/.config/hypr/wallpaper_effects/.wallpaper_current" wallpaper_output="$HOME/.config/hypr/wallpaper_effects/.wallpaper_modified" SCRIPTSDIR="$HOME/.config/hypr/scripts" focused_monitor=$(hyprctl monitors -j | jq -r '.[] | select(.focused) | .name') -rofi_theme="~/.config/rofi/config-wallpaper-effect.rasi" +rofi_theme="$HOME/.config/rofi/config-wallpaper-effect.rasi" # Directory for swaync iDIR="$HOME/.config/swaync/images" diff --git a/config/hypr/UserScripts/WallpaperSelect.sh b/config/hypr/UserScripts/WallpaperSelect.sh index 86b7dfa2..78bf8d2f 100755 --- a/config/hypr/UserScripts/WallpaperSelect.sh +++ b/config/hypr/UserScripts/WallpaperSelect.sh @@ -15,7 +15,7 @@ iDIR="$HOME/.config/swaync/images" iDIRi="$HOME/.config/swaync/icons" # variables -rofi_theme="~/.config/rofi/config-wallpaper.rasi" +rofi_theme="$HOME/.config/rofi/config-wallpaper.rasi" focused_monitor=$(hyprctl monitors -j | jq -r '.[] | select(.focused) | .name') # Get monitor width and DPI diff --git a/config/hypr/UserScripts/Weather.py b/config/hypr/UserScripts/Weather.py index b9efe4e4..a2ad98b5 100755 --- a/config/hypr/UserScripts/Weather.py +++ b/config/hypr/UserScripts/Weather.py @@ -138,7 +138,7 @@ simple_weather = ( ) try: - with open(os.path.expanduser("~/.cache/.weather_cache"), "w") as file: + with open(os.path.expanduser("$HOME/.cache/.weather_cache"), "w") as file: file.write(simple_weather) except Exception as e: print(f"Error writing to cache: {e}") diff --git a/config/hypr/UserScripts/Weather.sh b/config/hypr/UserScripts/Weather.sh index 65613fca..9bdaff4a 100755 --- a/config/hypr/UserScripts/Weather.sh +++ b/config/hypr/UserScripts/Weather.sh @@ -4,7 +4,7 @@ # Remember to add city city= -cachedir=~/.cache/rbn +cachedir="$HOME/.cache/rbn" cachefile=${0##*/}-$1 if [ ! -d $cachedir ]; then @@ -84,4 +84,4 @@ echo -e "{\"text\":\""$temperature $condition"\", \"alt\":\""${weather[0]}"\", \ cached_weather=" $temperature \n$condition ${weather[1]}" -echo -e $cached_weather > ~/.cache/.weather_cache \ No newline at end of file +echo -e $cached_weather > "$HOME/.cache/.weather_cache" \ No newline at end of file diff --git a/config/hypr/UserScripts/ZshChangeTheme.sh b/config/hypr/UserScripts/ZshChangeTheme.sh index 4ff43557..fafd7fb0 100755 --- a/config/hypr/UserScripts/ZshChangeTheme.sh +++ b/config/hypr/UserScripts/ZshChangeTheme.sh @@ -10,7 +10,7 @@ file_extension=".zsh-theme" # Variables iDIR="$HOME/.config/swaync/images" -rofi_theme="~/.config/rofi/config-zsh-theme.rasi" +rofi_theme="$HOME/.config/rofi/config-zsh-theme.rasi" themes_array=($(find -L "$themes_dir" -type f -name "*$file_extension" -exec basename {} \; | sed -e "s/$file_extension//")) diff --git a/config/hypr/hyprlock-1080p.conf b/config/hypr/hyprlock-1080p.conf index acd3258c..9fcac975 100644 --- a/config/hypr/hyprlock-1080p.conf +++ b/config/hypr/hyprlock-1080p.conf @@ -153,7 +153,7 @@ label { # see https://github.com/JaKooLit/Hyprland-Dots/wiki/TIPS#%EF%B8%8F-weather-app-related-for-waybar-and-hyprlock label { monitor = - text = cmd[update:3600000] [ -f ~/.cache/.weather_cache ] && cat ~/.cache/.weather_cache + text = cmd[update:3600000] [ -f "$HOME/.cache/.weather_cache" ] && cat "$HOME/.cache/.weather_cache" color = $color13 font_size = 16 font_family = Victor Mono Bold Oblique diff --git a/config/hypr/hyprlock.conf b/config/hypr/hyprlock.conf index 9edb3088..bfeda4ab 100644 --- a/config/hypr/hyprlock.conf +++ b/config/hypr/hyprlock.conf @@ -153,7 +153,7 @@ label { # see https://github.com/JaKooLit/Hyprland-Dots/wiki/TIPS#%EF%B8%8F-weather-app-related-for-waybar-and-hyprlock label { monitor = - text = cmd[update:3600000] [ -f ~/.cache/.weather_cache ] && cat ~/.cache/.weather_cache + text = cmd[update:3600000] [ -f "$HOME/.cache/.weather_cache" ] && cat "$HOME/.cache/.weather_cache" color = $color13 font_size = 18 font_family = Victor Mono Bold Oblique diff --git a/config/hypr/initial-boot.sh b/config/hypr/initial-boot.sh index 4d62775d..7f92ce7d 100755 --- a/config/hypr/initial-boot.sh +++ b/config/hypr/initial-boot.sh @@ -21,7 +21,7 @@ swww="swww img" effect="--transition-bezier .43,1.19,1,.4 --transition-fps 30 --transition-type grow --transition-pos 0.925,0.977 --transition-duration 2" # Check if a marker file exists. -if [ ! -f ~/.config/hypr/.initial_startup_done ]; then +if [ ! -f "$HOME/.config/hypr/.initial_startup_done" ]; then sleep 1 # Initialize wallust and wallpaper if [ -f "$wallpaper" ]; then @@ -60,7 +60,7 @@ if [ ! -f ~/.config/hypr/.initial_startup_done ]; then # Create a marker file to indicate that the script has been executed. - touch ~/.config/hypr/.initial_startup_done + touch "$HOME/.config/hypr/.initial_startup_done" exit fi diff --git a/config/hypr/scripts/Animations.sh b/config/hypr/scripts/Animations.sh index 4f49d47a..477e5cd3 100755 --- a/config/hypr/scripts/Animations.sh +++ b/config/hypr/scripts/Animations.sh @@ -12,7 +12,7 @@ iDIR="$HOME/.config/swaync/images" SCRIPTSDIR="$HOME/.config/hypr/scripts" animations_dir="$HOME/.config/hypr/animations" UserConfigs="$HOME/.config/hypr/UserConfigs" -rofi_theme="~/.config/rofi/config-Animations.rasi" +rofi_theme="$HOME/.config/rofi/config-Animations.rasi" msg='❗NOTE:❗ This will copy animations into UserAnimations.conf' # list of animation files, sorted alphabetically with numbers first animations_list=$(find -L "$animations_dir" -maxdepth 1 -type f | sed 's/.*\///' | sed 's/\.conf$//' | sort -V) diff --git a/config/hypr/scripts/ClipManager.sh b/config/hypr/scripts/ClipManager.sh index 1f82c616..9937b6f4 100755 --- a/config/hypr/scripts/ClipManager.sh +++ b/config/hypr/scripts/ClipManager.sh @@ -3,7 +3,7 @@ # Clipboard Manager. This script uses cliphist, rofi, and wl-copy. # Variables -rofi_theme="~/.config/rofi/config-clipboard.rasi" +rofi_theme="$HOME/.config/rofi/config-clipboard.rasi" msg='👀 **note** CTRL DEL = cliphist del (entry) or ALT DEL - cliphist wipe (all)' # Actions: # CTRL Del to delete an entry diff --git a/config/hypr/scripts/DarkLight.sh b/config/hypr/scripts/DarkLight.sh index 662e1954..6ce1526e 100755 --- a/config/hypr/scripts/DarkLight.sh +++ b/config/hypr/scripts/DarkLight.sh @@ -46,7 +46,7 @@ fi # Function to update theme mode for the next cycle update_theme_mode() { - echo "$next_mode" > ~/.cache/.theme_mode + echo "$next_mode" > "$HOME/.cache/.theme_mode" } # Function to notify user diff --git a/config/hypr/scripts/MonitorProfiles.sh b/config/hypr/scripts/MonitorProfiles.sh index ebab0144..ab124335 100755 --- a/config/hypr/scripts/MonitorProfiles.sh +++ b/config/hypr/scripts/MonitorProfiles.sh @@ -12,8 +12,8 @@ iDIR="$HOME/.config/swaync/images" SCRIPTSDIR="$HOME/.config/hypr/scripts" monitor_dir="$HOME/.config/hypr/Monitor_Profiles" target="$HOME/.config/hypr/monitors.conf" -rofi_theme="~/.config/rofi/config-Monitors.rasi" -msg='❗NOTE:❗ This will overwrite ~/.config/hypr/monitors.conf' +rofi_theme="$HOME/.config/rofi/config-Monitors.rasi" +msg='❗NOTE:❗ This will overwrite $HOME/.config/hypr/monitors.conf' # Define the list of files to ignore ignore_files=( diff --git a/config/hypr/scripts/RofiEmoji.sh b/config/hypr/scripts/RofiEmoji.sh index 3d85d6a3..da9da61f 100755 --- a/config/hypr/scripts/RofiEmoji.sh +++ b/config/hypr/scripts/RofiEmoji.sh @@ -2,7 +2,7 @@ # /* ---- 💫 https://github.com/JaKooLit 💫 ---- */ ## # Variables -rofi_theme="~/.config/rofi/config-emoji.rasi" +rofi_theme="$HOME/.config/rofi/config-emoji.rasi" msg='** note ** 👀 Click or Return to choose || Ctrl V to Paste' # Check if rofi is already running diff --git a/config/waybar/configs/[TOP] Everforest b/config/waybar/configs/[TOP] Everforest index 6663425b..9d2786c6 100644 --- a/config/waybar/configs/[TOP] Everforest +++ b/config/waybar/configs/[TOP] Everforest @@ -89,8 +89,8 @@ "format-time": "{H}h {M}min", "tooltip": true, "tooltip-format": "{timeTo} {power}w", - "on-click-middle": "~/.config/hypr/scripts/ChangeBlur.sh", - "on-click-right": "~/.config/hypr/scripts/Wlogout.sh", + "on-click-middle": "$HOME/.config/hypr/scripts/ChangeBlur.sh", + "on-click-right": "$HOME/.config/hypr/scripts/Wlogout.sh", }, "cpu#forest": { diff --git a/copy.sh b/copy.sh index ed6cd8b3..5d0013db 100755 --- a/copy.sh +++ b/copy.sh @@ -64,9 +64,10 @@ printf "\n%.0s" {1..1} ####### Announcement echo "${WARNING}A T T E N T I O N !${RESET}" -echo "${SKY_BLUE}This version (v2.3.12) requires nwg-displays!${RESET}" +echo "${SKY_BLUE}This version (v2.3.12) requires nwg-displays and some fonts!${RESET}" +echo "${SKY_BLUE}If you ran through (Distro-Hyprland install scripts), no need to do anything${RESET}" echo "${YELLOW}previous version: Some Keybinds changes${RESET}" -echo "${MAGENTA}Kindly visit KooL Hyprland Own Wiki for the changelog${RESET}" +echo "${MAGENTA}Kindly visit KooL Hyprland Own Wiki for changelogs${RESET}" printf "\n%.0s" {1..1} # Create Directory for Copy Logs @@ -458,8 +459,8 @@ get_backup_dirname() { # Check if the ~/.config/ directory exists if [ ! -d "$HOME/.config" ]; then - echo "${ERROR} - The ~/.config directory does not exist." - exit 1 + echo "${ERROR} - $HOME/.config directory does not exist. Creating it now." + mkdir -p "$HOME/.config" && echo "Directory created successfully." || echo "Failed to create directory." fi printf "${INFO} - copying dotfiles ${SKY_BLUE}first${RESET} part\n" @@ -563,7 +564,7 @@ fi DIR="btop cava hypr Kvantum qt5ct qt6ct swappy wallust wlogout" for DIR_NAME in $DIR; do - DIRPATH=~/.config/"$DIR_NAME" + DIRPATH="$HOME/.config/$DIR_NAME" # Backup the existing directory if it exists if [ -d "$DIRPATH" ]; then @@ -582,7 +583,7 @@ for DIR_NAME in $DIR; do # Copy the new config if [ -d "config/$DIR_NAME" ]; then - cp -r "config/$DIR_NAME/" ~/.config/"$DIR_NAME" 2>&1 | tee -a "$LOG" + cp -r "config/$DIR_NAME/" "$HOME/.config/$DIR_NAME" 2>&1 | tee -a "$LOG" if [ $? -eq 0 ]; then echo "${OK} - Copy of config for ${YELLOW}$DIR_NAME${RESET} completed!" else @@ -644,7 +645,7 @@ FILES_TO_RESTORE=( "WindowRules.conf" ) -DIRPATH=~/.config/"$DIRH" +DIRPATH="$HOME/.config/$DIRH" BACKUP_DIR=$(get_backup_dirname) BACKUP_DIR_PATH="$DIRPATH-backup-$BACKUP_DIR/UserConfigs" @@ -687,7 +688,7 @@ SCRIPTS_TO_RESTORE=( "Weather.sh" ) -DIRSHPATH=~/.config/"$DIRSH" +DIRSHPATH="$HOME/.config/$DIRSH" BACKUP_DIR_PATH_S="$DIRSHPATH-backup-$BACKUP_DIR/UserScripts" if [ -d "$BACKUP_DIR_PATH_S" ]; then @@ -721,12 +722,12 @@ FILES_2_RESTORE=( "hypridle.conf" ) -DIRPATH=~/.config/"$DIR_H" +DIRPATH="$HOME/.config/$DIR_H" BACKUP_DIR=$(get_backup_dirname) BACKUP_DIR_PATH_F="$DIRPATH-backup-$BACKUP_DIR" if [ -d "$BACKUP_DIR_PATH_F" ]; then - echo -e "${NOTE} Restoring some files in ${MAGENTA}~/.config/hypr directory${RESET}..." + echo -e "${NOTE} Restoring some files in ${MAGENTA}$HOME/.config/hypr directory${RESET}..." for FILE_RESTORE in "${FILES_2_RESTORE[@]}"; do BACKUP_FILE="$BACKUP_DIR_PATH_F/$FILE_RESTORE" @@ -762,7 +763,7 @@ if [ -d "$HOME/.config/rofi/themes" ]; then if [ -z "$(ls -A $HOME/.config/rofi/themes)" ]; then echo '/* Dummy Rofi theme */' > "$HOME/.config/rofi/themes/dummy.rasi" fi - ln -snf ~/.config/rofi/themes/* ~/.local/share/rofi/themes/ + ln -snf "$HOME/.config/rofi/themes/"* "$HOME/.local/share/rofi/themes/" # Delete the dummy file if it was created if [ -f "$HOME/.config/rofi/themes/dummy.rasi" ]; then rm "$HOME/.config/rofi/themes/dummy.rasi" @@ -772,18 +773,18 @@ fi printf "\n%.0s" {1..1} # wallpaper stuff -mkdir -p ~/Pictures/wallpapers -if cp -r wallpapers ~/Pictures/; then +mkdir -p $HOME/Pictures/wallpapers +if cp -r wallpapers $HOME/Pictures/; then echo "${OK} Some ${MAGENTA}wallpapers${RESET} copied successfully!" | tee -a "$LOG" else echo "${ERROR} Failed to copy some ${YELLOW}wallpapers${RESET}" | tee -a "$LOG" fi # Set some files as executable -chmod +x ~/.config/hypr/scripts/* 2>&1 | tee -a "$LOG" -chmod +x ~/.config/hypr/UserScripts/* 2>&1 | tee -a "$LOG" +chmod +x "$HOME/.config/hypr/scripts/"* 2>&1 | tee -a "$LOG" +chmod +x "$HOME/.config/hypr/UserScripts/"* 2>&1 | tee -a "$LOG" # Set executable for initial-boot.sh -chmod +x ~/.config/hypr/initial-boot.sh 2>&1 | tee -a "$LOG" +chmod +x "$HOME/.config/hypr/initial-boot.sh" 2>&1 | tee -a "$LOG" # Waybar config to symlink & retain based on machine type if hostnamectl | grep -q 'Chassis: desktop'; then @@ -850,12 +851,12 @@ while true; do echo "${OK} Wallpapers downloaded successfully." 2>&1 | tee -a "$LOG" # Check if wallpapers directory exists and create it if not - if [ ! -d ~/Pictures/wallpapers ]; then - mkdir -p ~/Pictures/wallpapers + if [ ! -d "$HOME/Pictures/wallpapers" ]; then + mkdir -p "$HOME/Pictures/wallpapers" echo "${OK} Created wallpapers directory." 2>&1 | tee -a "$LOG" fi - if cp -R Wallpaper-Bank/wallpapers/* ~/Pictures/wallpapers/ >> "$LOG" 2>&1; then + if cp -R Wallpaper-Bank/wallpapers/* "$HOME/Pictures/wallpapers/" >> "$LOG" 2>&1; then echo "${OK} Wallpapers copied successfully." 2>&1 | tee -a "$LOG" rm -rf Wallpaper-Bank 2>&1 # Remove cloned repository after copying wallpapers break @@ -878,10 +879,10 @@ done # CLeaning up of ~/.config/ backups cleanup_backups() { - CONFIG_DIR=~/.config + CONFIG_DIR="$HOME/.config" BACKUP_PREFIX="-backup" - # Loop through directories in ~/.config + # Loop through directories in $HOME/.config for DIR in "$CONFIG_DIR"/*; do if [ -d "$DIR" ]; then BACKUP_DIRS=() diff --git a/upgrade.sh b/upgrade.sh index 687ba69f..8c900f44 100755 --- a/upgrade.sh +++ b/upgrade.sh @@ -141,11 +141,11 @@ if version_gt "$latest_version" "$stored_version"; then printf "\n%.0s" {1..2} echo "$NOTE Files or Folders updated successfully to version $latest_version" 2>&1 | tee -a "$LOG" - # Set some files as executable - chmod +x ~/.config/hypr/scripts/* 2>&1 | tee -a "$LOG" - chmod +x ~/.config/hypr/UserScripts/* 2>&1 | tee -a "$LOG" - chmod +x ~/.config/hypr/initial-boot.sh 2>&1 | tee -a "$LOG" - + # Set some files as executable + chmod +x "$HOME/.config/hypr/scripts/"* 2>&1 | tee -a "$LOG" + chmod +x "$HOME/.config/hypr/UserScripts/"* 2>&1 | tee -a "$LOG" + # Set executable for initial-boot.sh + chmod +x "$HOME/.config/hypr/initial-boot.sh" 2>&1 | tee -a "$LOG" else echo "$MAGENTA Upgrade declined. No files or folders changed" 2>&1 | tee -a "$LOG" fi -- cgit v1.2.3