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