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') 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 f79f0a1dad43628eea867ca433fa13edd2296936 Mon Sep 17 00:00:00 2001 From: JaKooLit Date: Thu, 20 Feb 2025 10:25:02 +0900 Subject: integrated nwg-display --- config/hypr/UserConfigs/UserDecorations.conf | 6 ++-- config/hypr/UserConfigs/WindowRules.conf | 5 +++ config/hypr/UserScripts/QuickEdit.sh | 35 ++++++++++--------- config/hypr/monitors.conf | 52 ++++++++++++++++++++++++++++ config/hypr/workspaces.conf | 28 +++++++++++++++ copy.sh | 52 ++++++++++++++++++++++++---- 6 files changed, 152 insertions(+), 26 deletions(-) create mode 100644 config/hypr/monitors.conf create mode 100644 config/hypr/workspaces.conf (limited to 'config/hypr/UserScripts') diff --git a/config/hypr/UserConfigs/UserDecorations.conf b/config/hypr/UserConfigs/UserDecorations.conf index b69f26ec..0b450904 100644 --- a/config/hypr/UserConfigs/UserDecorations.conf +++ b/config/hypr/UserConfigs/UserDecorations.conf @@ -10,8 +10,8 @@ source = $HOME/.config/hypr/wallust/wallust-hyprland.conf general { border_size = 2 - gaps_in = 4 - gaps_out = 6 + gaps_in = 2 + gaps_out = 4 col.active_border = $color12 col.inactive_border = $color10 @@ -55,4 +55,4 @@ group { groupbar { col.active = $color0 } -} \ No newline at end of file +} diff --git a/config/hypr/UserConfigs/WindowRules.conf b/config/hypr/UserConfigs/WindowRules.conf index 4c1e5dc6..05db62f1 100644 --- a/config/hypr/UserConfigs/WindowRules.conf +++ b/config/hypr/UserConfigs/WindowRules.conf @@ -14,6 +14,8 @@ windowrulev2 = tag +browser, class:^([Tt]horium-browser|[Cc]achy-browser)$ windowrulev2 = tag +browser, class:^(zen-alpha|zen)$ windowrulev2 = tag +notif, class:^(swaync-control-center|swaync-notification-window|swaync-client|class)$ +windowrulev2 = tag +nwg, class:^(nwg-displays|nwg-look)$ + # terminal tags windowrulev2 = tag +terminal, class:^(Alacritty|kitty|kitty-dropterm)$ @@ -82,6 +84,7 @@ windowrulev2 = tag +viewer, class:^(eog|org.gnome.Loupe)$ # image viewer windowrulev2 = center, title:^(KooL Quick Cheat Sheet)$ windowrulev2 = center, class:([Tt]hunar), title:negative:(.*[Tt]hunar.*) windowrulev2 = center, title:^(ROG Control)$ +windowrulev2 = center, tag:nwg* windowrulev2 = center, title:^(Keybindings)$ windowrulev2 = center, class:^(pavucontrol|org.pulseaudio.pavucontrol|com.saivert.pwvucontrol)$ windowrulev2 = center, class:^([Ww]hatsapp-for-linux|ZapZap|com.rtosta.zapzap)$ @@ -114,6 +117,7 @@ windowrulev2 = float, title:^(KooL Quick Cheat Sheet)$ windowrulev2 = float, tag:wallpaper* windowrulev2 = float, tag:settings* windowrulev2 = float, tag:viewer* +windowrulev2 = float, tag:nwg* windowrulev2 = float, class:([Zz]oom|onedriver|onedriver-launcher)$ windowrulev2 = float, class:(org.gnome.Calculator), title:(Calculator) windowrulev2 = float, class:^(mpv|com.github.rafostar.Clapper)$ @@ -123,6 +127,7 @@ windowrulev2 = float, class:^([Ff]erdium)$ windowrulev2 = float, title:^(Picture-in-Picture)$ #windowrulev2 = float, title:^(Firefox)$ + #windowrule v2 - float popups and dialogue windowrulev2 = float, title:^(Authentication Required)$ windowrulev2 = center, title:^(Authentication Required)$ diff --git a/config/hypr/UserScripts/QuickEdit.sh b/config/hypr/UserScripts/QuickEdit.sh index 09530881..12db89b4 100755 --- a/config/hypr/UserScripts/QuickEdit.sh +++ b/config/hypr/UserScripts/QuickEdit.sh @@ -15,17 +15,17 @@ msg=' ⁉️ Choose which config to View or Edit ⁉️' # Function to display the menu options menu() { cat < /dev/null; then fi main + diff --git a/config/hypr/monitors.conf b/config/hypr/monitors.conf new file mode 100644 index 00000000..b3b75847 --- /dev/null +++ b/config/hypr/monitors.conf @@ -0,0 +1,52 @@ +# /* ---- πŸ’« https://github.com/JaKooLit πŸ’« ---- */ # + +# WARN!!! THIS WILL BE OVERWRITTEN by NWG-DISPLAY + +# Monitor Configuration +# See Hyprland wiki for more details +# https://wiki.hyprland.org/Configuring/Monitors/ +# Configure your Display resolution, offset, scale and Monitors here, use `hyprctl monitors` to get the info. + +# Monitors +monitor=,preferred,auto,1 + +# High Refresh Rate +monitor=,highrr,auto,1 + +# High Resolution +monitor=,highres,auto,1 + +# NOTE: for laptop, kindly check notes in Laptops.conf regarding display +# Created this inorder for the monitor display to not wake up if not intended. +# See here: https://github.com/hyprwm/Hyprland/issues/4090 + +# Some examples to set your own monitor +#monitor = eDP-1, preferred, auto, 1 +#monitor = eDP-1, 2560x1440@165, 0x0, 1 #own screen +#monitor = DP-3, 1920x1080@240, auto, 1 +#monitor = DP-1, preferred, auto, 1 +#monitor = HDMI-A-1, preferred,auto,1 + +# QEMU-KVM, virtual box or vmware +#monitor = Virtual-1, 1920x1080@60,auto,1 + +# to disable a monitor +#monitor=name,disable + +# Mirror samples +#monitor=DP-3,1920x1080@60,0x0,1,mirror,DP-2 +#monitor=,preferred,auto,1,mirror,eDP-1 +#monitor=HDMI-A-1,2560x1440@144,0x0,1,mirror,eDP-1 + +# 10 bit monitor support - See wiki https://wiki.hyprland.org/Configuring/Monitors/#10-bit-support - See NOTES below +# NOTE: Colors registered in Hyprland (e.g. the border color) do not support 10 bit. +# NOTE: Some applications do not support screen capture with 10 bit enabled. (Screen captures like OBS may render black screen) +# monitor=,preferred,auto,1,bitdepth,10 + +#monitor=eDP-1,transform,0 +#monitor=eDP-1,addreserved,10,10,10,49 + +# workspaces - Monitor rules +# https://wiki.hyprland.org/Configuring/Workspace-Rules/ +# SUPER E - Workspace-Rules +# See ~/.config/hypr/UserConfigs/WorkspaceRules.conf diff --git a/config/hypr/workspaces.conf b/config/hypr/workspaces.conf new file mode 100644 index 00000000..37471b3e --- /dev/null +++ b/config/hypr/workspaces.conf @@ -0,0 +1,28 @@ +# /* ---- πŸ’« https://github.com/JaKooLit πŸ’« ---- */ # + +# WARN THIS WILL BE OVERWRITTEN by NWG-DISPLAY + +# You can set workspace rules to achieve workspace-specific behaviors. +# For instance, you can define a workspace where all windows are drawn without borders or gaps. + +# https://wiki.hyprland.org/Configuring/Workspace-Rules/ + +# Assigning workspace to a certain monitor. Below are just examples +# workspace = 1, monitor:eDP-1 +# workspace = 2, monitor:eDP-1 +# workspace = 3, monitor:eDP-1 +# workspace = 4, monitor:eDP-1 +# workspace = 5, monitor:DP-2 +# workspace = 6, monitor:DP-2 +# workspace = 7, monitor:DP-2 +# workspace = 8, monitor:DP-2 + + +# example rules (from wiki) +# workspace = 3, rounding:false, decorate:false +# workspace = name:coding, rounding:false, decorate:false, gapsin:0, gapsout:0, border:false, decorate:false, monitor:DP-1 +# workspace = 8,bordersize:8 +# workspace = name:Hello, monitor:DP-1, default:true +# workspace = name:gaming, monitor:desc:Chimei Innolux Corporation 0x150C, default:true +# workspace = 5, on-created-empty:[float] firefox +# workspace = special:scratchpad, on-created-empty:foot \ No newline at end of file diff --git a/copy.sh b/copy.sh index 8225349e..edf5a05f 100755 --- a/copy.sh +++ b/copy.sh @@ -104,7 +104,7 @@ if hostnamectl | grep -q 'Chassis: vm'; then sed -i 's/^\([[:space:]]*no_hardware_cursors[[:space:]]*=[[:space:]]*\)false/\1true/' config/hypr/UserConfigs/UserSettings.conf sed -i '/env = WLR_RENDERER_ALLOW_SOFTWARE,1/s/^#//' config/hypr/UserConfigs/ENVariables.conf #sed -i '/env = LIBGL_ALWAYS_SOFTWARE,1/s/^#//' config/hypr/UserConfigs/ENVariables.conf - sed -i '/monitor = Virtual-1, 1920x1080@60,auto,1/s/^#//' config/hypr/UserConfigs/Monitors.conf + sed -i '/monitor = Virtual-1, 1920x1080@60,auto,1/s/^#//' config/hypr/monitors.conf fi # Proper Polkit for NixOS @@ -114,7 +114,7 @@ if hostnamectl | grep -q 'Operating System: NixOS'; then sed -i '/^exec-once = \$scriptsDir\/Polkit\.sh$/ s/^#*/#/' config/hypr/UserConfigs/Startup_Apps.conf fi -# Check if dpkg is installed (use to check if Debian or Ubuntu or based distros +# to check if Debian or Ubuntu or based distros if grep -iq '^\(ID_LIKE\|ID\)=.*\(debian\|ubuntu\)' /etc/os-release >/dev/null 2>&1; then echo "${INFO} Debian/Ubuntu based distro. Disabling pyprland since it does not work properly" 2>&1 | tee -a "$LOG" || true # disabling pyprland as causing issues @@ -583,14 +583,12 @@ FILES_TO_RESTORE=( "ENVariables.conf" "LaptopDisplay.conf" "Laptops.conf" - "Monitors.conf" "Startup_Apps.conf" "UserDecorations.conf" "UserAnimations.conf" "UserKeybinds.conf" "UserSettings.conf" "WindowRules.conf" - "WorkspaceRules.conf" ) DIRPATH=~/.config/"$DIRH" @@ -637,13 +635,13 @@ SCRIPTS_TO_RESTORE=( ) DIRSHPATH=~/.config/"$DIRSH" -BACKUP_DIR_PATH="$DIRSHPATH-backup-$BACKUP_DIR/UserScripts" +BACKUP_DIR_PATH_S="$DIRSHPATH-backup-$BACKUP_DIR/UserScripts" -if [ -d "$BACKUP_DIR_PATH" ]; then +if [ -d "$BACKUP_DIR_PATH_S" ]; then echo -e "${NOTE} Restoring previous ${MAGENTA}User-Scripts${RESET}..." for SCRIPT_NAME in "${SCRIPTS_TO_RESTORE[@]}"; do - BACKUP_SCRIPT="$BACKUP_DIR_PATH/$SCRIPT_NAME" + BACKUP_SCRIPT="$BACKUP_DIR_PATH_S/$SCRIPT_NAME" if [ -f "$BACKUP_SCRIPT" ]; then printf "\n${INFO} Found ${YELLOW}$SCRIPT_NAME${RESET} in hypr backup...\n" @@ -663,6 +661,46 @@ fi printf "\n%.0s" {1..1} +# restoring some files in ~/.config/hypr +DIR_H="hypr" +FILES_2_RESTORE=( + "hyprlock.conf" + "hypridle.conf" + "monitors.conf" + "workspaces.conf" +) + +DIRPATH=~/.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}..." + + for FILE_RESTORE in "${FILES_2_RESTORE[@]}"; do + BACKUP_FILE="$BACKUP_DIR_PATH_F/$FILE_RESTORE" + + if [ -f "$BACKUP_FILE" ]; then + echo -e "\n${INFO} Found ${YELLOW}$FILE_RESTORE${RESET} in hypr backup..." + read -p "${CAT} Do you want to restore ${YELLOW}$FILE_RESTORE${RESET} from backup? (y/N): " file2restore + + if [[ "$file2restore" == [Yy]* ]]; then + if cp "$BACKUP_FILE" "$DIRPATH/$FILE_RESTORE"; then + echo "${OK} - $FILE_RESTORE restored!" 2>&1 | tee -a "$LOG" + else + echo "${ERROR} - Failed to restore $FILE_RESTORE!" 2>&1 | tee -a "$LOG" + fi + else + echo "${NOTE} - Skipped restoring $FILE_RESTORE." + fi + else + echo "${ERROR} - Backup file $BACKUP_FILE does not exist." + fi + done +fi + +printf "\n%.0s" {1..1} + # Define the target directory for rofi themes rofi_DIR="$HOME/.local/share/rofi/themes" -- 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') 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') 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 4fee6c130280ecdd97ace82250c6ecd4b382a625 Mon Sep 17 00:00:00 2001 From: JaKooLit Date: Fri, 21 Feb 2025 01:21:10 +0900 Subject: updated quickedit in preparation of adding nwg-displays --- config/hypr/UserScripts/QuickEdit.sh | 18 +++++++++++++----- config/rofi/config-wallpaper-effect.rasi | 2 +- 2 files changed, 14 insertions(+), 6 deletions(-) (limited to 'config/hypr/UserScripts') diff --git a/config/hypr/UserScripts/QuickEdit.sh b/config/hypr/UserScripts/QuickEdit.sh index 618ed002..2964ef3d 100755 --- a/config/hypr/UserScripts/QuickEdit.sh +++ b/config/hypr/UserScripts/QuickEdit.sh @@ -6,11 +6,12 @@ edit=${EDITOR:-nano} tty=kitty -# Paths to configuration directories +# variables configs="$HOME/.config/hypr/configs" UserConfigs="$HOME/.config/hypr/UserConfigs" rofi_theme="~/.config/rofi/config-edit.rasi" msg=' ⁉️ Choose which config to View or Edit ⁉️' +iDIR="$HOME/.config/swaync/images" # Function to display the menu options menu() { @@ -44,8 +45,16 @@ main() { 7) file="$UserConfigs/UserAnimations.conf" ;; 8) file="$UserConfigs/Laptops.conf" ;; 9) file="$configs/Keybinds.conf" ;; - 10) nwg-displays ;; - 11) nwg-displays ;; + 10) if ! command -v nwg-displays &>/dev/null; then + notify-send -i "$iDIR/ja.png" "Missing nwg-displays" "Install nwg-displays first" + exit 1 + fi + nwg-displays ;; + 11) if ! command -v nwg-displays &>/dev/null; then + notify-send -i "$iDIR/ja.png" "Missing nwg-displays" "Install nwg-displays first" + exit 1 + fi + nwg-displays ;; *) return ;; # Do nothing for invalid choices esac @@ -60,5 +69,4 @@ if pidof rofi > /dev/null; then pkill rofi fi -main - +main \ No newline at end of file diff --git a/config/rofi/config-wallpaper-effect.rasi b/config/rofi/config-wallpaper-effect.rasi index 6b5dece2..0909bae4 100644 --- a/config/rofi/config-wallpaper-effect.rasi +++ b/config/rofi/config-wallpaper-effect.rasi @@ -12,8 +12,8 @@ mainbox { /* ---- Entry ---- */ entry { - width: 32%; placeholder: " πŸ™οΈ Search / Choose desired wallpaper effect"; + padding: 12px; } /* ---- Window ---- */ -- cgit v1.2.3 From c35b1026d16cff151b763ee484d9fc773952aeb1 Mon Sep 17 00:00:00 2001 From: JaKooLit Date: Fri, 21 Feb 2025 16:14:38 +0900 Subject: pushing for monitor profiles, changed the version to dev first indicating still in dev branch. Enhance functionality of KooL Quick Settings --- config/hypr/Monitor_Profiles/README | 9 +++ config/hypr/Monitor_Profiles/default.conf | 52 ++++++++++++++++ config/hypr/UserConfigs/UserKeybinds.conf | 2 +- config/hypr/UserConfigs/WindowRules.conf | 10 ++-- config/hypr/UserScripts/Kool_Quick_Settings.sh | 83 ++++++++++++++++++++++++++ config/hypr/UserScripts/QuickEdit.sh | 72 ---------------------- config/hypr/hyprland.conf | 4 +- config/hypr/scripts/KeyHints.sh | 2 +- config/hypr/scripts/MonitorProfiles.sh | 42 +++++++++++++ config/hypr/v2.3.12 | 5 -- config/hypr/v2.3.12-dev | 5 ++ config/rofi/config-Monitors.rasi | 41 +++++++++++++ config/rofi/config-edit.rasi | 3 +- config/waybar/ModulesCustom | 4 +- 14 files changed, 245 insertions(+), 89 deletions(-) create mode 100644 config/hypr/Monitor_Profiles/README create mode 100644 config/hypr/Monitor_Profiles/default.conf create mode 100755 config/hypr/UserScripts/Kool_Quick_Settings.sh delete mode 100755 config/hypr/UserScripts/QuickEdit.sh create mode 100755 config/hypr/scripts/MonitorProfiles.sh delete mode 100644 config/hypr/v2.3.12 create mode 100644 config/hypr/v2.3.12-dev create mode 100644 config/rofi/config-Monitors.rasi (limited to 'config/hypr/UserScripts') diff --git a/config/hypr/Monitor_Profiles/README b/config/hypr/Monitor_Profiles/README new file mode 100644 index 00000000..b2e218c5 --- /dev/null +++ b/config/hypr/Monitor_Profiles/README @@ -0,0 +1,9 @@ +# Create a Monitor profile you want to on this directory + +# Create a unique file name i.e. Mirror, or Office, Scale, etc etc + +# tip: You can easily create a profile using nwg-displays +# after which, you can copy the ~/.config/hypr/monitors.conf file in this directory + +# Note, after selecting Profiles wanted, it will copy contents into ~/.config/hypr/monitors.conf + diff --git a/config/hypr/Monitor_Profiles/default.conf b/config/hypr/Monitor_Profiles/default.conf new file mode 100644 index 00000000..a96cac7d --- /dev/null +++ b/config/hypr/Monitor_Profiles/default.conf @@ -0,0 +1,52 @@ +# /* ---- πŸ’« https://github.com/JaKooLit πŸ’« ---- */ # +# default Monitor config + +# Monitor Configuration +# See Hyprland wiki for more details +# https://wiki.hyprland.org/Configuring/Monitors/ +# Configure your Display resolution, offset, scale and Monitors here, use `hyprctl monitors` to get the info. + +# Monitors +monitor=,preferred,auto,1 + +# High Refresh Rate +monitor=,highrr,auto,1 + +# High Resolution +monitor=,highres,auto,1 + +# NOTE: for laptop, kindly check notes in Laptops.conf regarding display +# Created this inorder for the monitor display to not wake up if not intended. +# See here: https://github.com/hyprwm/Hyprland/issues/4090 + +# Some examples to set your own monitor +#monitor = eDP-1, preferred, auto, 1 +#monitor = eDP-1, 2560x1440@165, 0x0, 1 #own screen +#monitor = DP-3, 1920x1080@240, auto, 1 +#monitor = DP-1, preferred, auto, 1 +#monitor = HDMI-A-1, preferred,auto,1 + +# QEMU-KVM, virtual box or vmware +#monitor = Virtual-1, 1920x1080@60,auto,1 + +# to disable a monitor +#monitor=name,disable + +# Mirror samples +#monitor=DP-3,1920x1080@60,0x0,1,mirror,DP-2 +#monitor=,preferred,auto,1,mirror,eDP-1 +#monitor=HDMI-A-1,2560x1440@144,0x0,1,mirror,eDP-1 + +# 10 bit monitor support - See wiki https://wiki.hyprland.org/Configuring/Monitors/#10-bit-support - See NOTES below +# NOTE: Colors registered in Hyprland (e.g. the border color) do not support 10 bit. +# NOTE: Some applications do not support screen capture with 10 bit enabled. (Screen captures like OBS may render black screen) +# monitor=,preferred,auto,1,bitdepth,10 + +#monitor=eDP-1,transform,0 +#monitor=eDP-1,addreserved,10,10,10,49 + +# workspaces - Monitor rules +# https://wiki.hyprland.org/Configuring/Workspace-Rules/ +# SUPER E - Workspace-Rules +# See ~/.config/hypr/UserConfigs/WorkspaceRules.conf + diff --git a/config/hypr/UserConfigs/UserKeybinds.conf b/config/hypr/UserConfigs/UserKeybinds.conf index 0538ee72..16557059 100644 --- a/config/hypr/UserConfigs/UserKeybinds.conf +++ b/config/hypr/UserConfigs/UserKeybinds.conf @@ -44,7 +44,7 @@ bind = $mainMod CTRL, B, exec, $scriptsDir/WaybarStyles.sh # Waybar Styles Menu bind = $mainMod ALT, B, exec, $scriptsDir/WaybarLayout.sh # Waybar Layout Menu # FEATURES / EXTRAS (UserScripts) -bind = $mainMod SHIFT, E, exec, $UserScripts/QuickEdit.sh # Quick Edit Hyprland Settings +bind = $mainMod SHIFT, E, exec, $UserScripts/Kool_Quick_Settings.sh # Settings Menu KooL Hyprland Settings bind = $mainMod SHIFT, M, exec, $UserScripts/RofiBeats.sh # online music using rofi bind = $mainMod, W, exec, $UserScripts/WallpaperSelect.sh # Select wallpaper to apply bind = $mainMod SHIFT, W, exec, $UserScripts/WallpaperEffects.sh # Wallpaper Effects by imagemagick diff --git a/config/hypr/UserConfigs/WindowRules.conf b/config/hypr/UserConfigs/WindowRules.conf index 05db62f1..faecbfa5 100644 --- a/config/hypr/UserConfigs/WindowRules.conf +++ b/config/hypr/UserConfigs/WindowRules.conf @@ -13,8 +13,8 @@ windowrulev2 = tag +browser, class:^(Brave-browser(-beta|-dev|-unstable)?)$ windowrulev2 = tag +browser, class:^([Tt]horium-browser|[Cc]achy-browser)$ windowrulev2 = tag +browser, class:^(zen-alpha|zen)$ windowrulev2 = tag +notif, class:^(swaync-control-center|swaync-notification-window|swaync-client|class)$ - -windowrulev2 = tag +nwg, class:^(nwg-displays|nwg-look)$ +windowrulev2 = tag +KooL_Settings, title:^(KooL Hyprland Settings)$ +windowrulev2 = tag +KooL-Settings, class:^(nwg-displays|nwg-look)$ # terminal tags windowrulev2 = tag +terminal, class:^(Alacritty|kitty|kitty-dropterm)$ @@ -69,7 +69,7 @@ windowrulev2 = tag +settings, title:(Kvantum Manager) windowrulev2 = tag +settings, class:^(file-roller|org.gnome.FileRoller)$ # archive manager windowrulev2 = tag +settings, class:^(nm-applet|nm-connection-editor|blueman-manager)$ windowrulev2 = tag +settings, class:^(pavucontrol|org.pulseaudio.pavucontrol|com.saivert.pwvucontrol)$ -windowrulev2 = tag +settings, class:^(nwg-look|qt5ct|qt6ct|[Yy]ad)$ +windowrulev2 = tag +settings, class:^(qt5ct|qt6ct|[Yy]ad)$ windowrulev2 = tag +settings, class:(xdg-desktop-portal-gtk) windowrulev2 = tag +settings, class:^(org.kde.polkit-kde-authentication-agent-1)$ windowrulev2 = tag +settings, class:^([Rr]ofi)$ @@ -84,7 +84,7 @@ windowrulev2 = tag +viewer, class:^(eog|org.gnome.Loupe)$ # image viewer windowrulev2 = center, title:^(KooL Quick Cheat Sheet)$ windowrulev2 = center, class:([Tt]hunar), title:negative:(.*[Tt]hunar.*) windowrulev2 = center, title:^(ROG Control)$ -windowrulev2 = center, tag:nwg* +windowrulev2 = center, tag:KooL_Settings* windowrulev2 = center, title:^(Keybindings)$ windowrulev2 = center, class:^(pavucontrol|org.pulseaudio.pavucontrol|com.saivert.pwvucontrol)$ windowrulev2 = center, class:^([Ww]hatsapp-for-linux|ZapZap|com.rtosta.zapzap)$ @@ -117,7 +117,7 @@ windowrulev2 = float, title:^(KooL Quick Cheat Sheet)$ windowrulev2 = float, tag:wallpaper* windowrulev2 = float, tag:settings* windowrulev2 = float, tag:viewer* -windowrulev2 = float, tag:nwg* +windowrulev2 = float, tag:KooL_Settings* windowrulev2 = float, class:([Zz]oom|onedriver|onedriver-launcher)$ windowrulev2 = float, class:(org.gnome.Calculator), title:(Calculator) windowrulev2 = float, class:^(mpv|com.github.rafostar.Clapper)$ diff --git a/config/hypr/UserScripts/Kool_Quick_Settings.sh b/config/hypr/UserScripts/Kool_Quick_Settings.sh new file mode 100755 index 00000000..7b2f7f0e --- /dev/null +++ b/config/hypr/UserScripts/Kool_Quick_Settings.sh @@ -0,0 +1,83 @@ +#!/bin/bash +# /* ---- πŸ’« https://github.com/JaKooLit πŸ’« ---- */ ## +# Rofi menu for Quick Edit/View of Settings (SUPER SHIFT E) + +# Define preferred text editor and terminal +edit=${EDITOR:-nano} +tty=kitty + +# variables +configs="$HOME/.config/hypr/configs" +UserConfigs="$HOME/.config/hypr/UserConfigs" +rofi_theme="~/.config/rofi/config-edit.rasi" +msg=' ⁉️ Choose what to do ⁉️' +iDIR="$HOME/.config/swaync/images" +scriptsDir="$HOME/.config/hypr/scripts" +UserScripts="$HOME/.config/hypr/UserScripts" + +# Function to display the menu options +menu() { + cat </dev/null; then + notify-send -i "$iDIR/ja.png" "Missing nwg-displays" "Install nwg-displays first" + exit 1 + fi + nwg-displays ;; + 11) if ! command -v nwg-displays &>/dev/null; then + notify-send -i "$iDIR/ja.png" "Missing nwg-displays" "Install nwg-displays first" + exit 1 + fi + nwg-displays ;; + 12) $scriptsDir/Animations.sh ;; + 13) $scriptsDir/MonitorProfiles.sh ;; + 14) $scriptsDir/RofiThemeSelector.sh ;; + 15) $scriptsDir/KeyBinds.sh ;; + + *) return ;; # Do nothing for invalid choices + esac + + # Open the selected file in the terminal with the text editor + if [ -n "$file" ]; then + $tty -e $edit "$file" + fi +} + +# Check if rofi is already running +if pidof rofi > /dev/null; then + pkill rofi +fi + +main \ No newline at end of file diff --git a/config/hypr/UserScripts/QuickEdit.sh b/config/hypr/UserScripts/QuickEdit.sh deleted file mode 100755 index 2964ef3d..00000000 --- a/config/hypr/UserScripts/QuickEdit.sh +++ /dev/null @@ -1,72 +0,0 @@ -#!/bin/bash -# /* ---- πŸ’« https://github.com/JaKooLit πŸ’« ---- */ ## -# Rofi menu for Quick Edit/View of Settings (SUPER E) - -# Define preferred text editor and terminal -edit=${EDITOR:-nano} -tty=kitty - -# variables -configs="$HOME/.config/hypr/configs" -UserConfigs="$HOME/.config/hypr/UserConfigs" -rofi_theme="~/.config/rofi/config-edit.rasi" -msg=' ⁉️ Choose which config to View or Edit ⁉️' -iDIR="$HOME/.config/swaync/images" - -# Function to display the menu options -menu() { - cat </dev/null; then - notify-send -i "$iDIR/ja.png" "Missing nwg-displays" "Install nwg-displays first" - exit 1 - fi - nwg-displays ;; - 11) if ! command -v nwg-displays &>/dev/null; then - notify-send -i "$iDIR/ja.png" "Missing nwg-displays" "Install nwg-displays first" - exit 1 - fi - nwg-displays ;; - *) return ;; # Do nothing for invalid choices - esac - - # Open the selected file in the terminal with the text editor - if [ -n "$file" ]; then - $tty -e $edit "$file" - fi -} - -# Check if rofi is already running -if pidof rofi > /dev/null; then - pkill rofi -fi - -main \ No newline at end of file diff --git a/config/hypr/hyprland.conf b/config/hypr/hyprland.conf index 1469db06..0c6b7fc4 100644 --- a/config/hypr/hyprland.conf +++ b/config/hypr/hyprland.conf @@ -19,7 +19,7 @@ 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 (old builds) +#source= $UserConfigs/Monitors.conf # Its all about your monitor config (old dots #source= $UserConfigs/WorkspaceRules.conf # Hyprland workspaces (old dots) source= $UserConfigs/Laptops.conf # For laptop related @@ -36,6 +36,6 @@ source= $UserConfigs/UserKeybinds.conf # Put your own keybinds here source= $UserConfigs/UserSettings.conf # Main Hyprland Settings. -# nwg displays +# nwg-displays source= $HOME/.config/hypr/monitors.conf source= $HOME/.config/hypr/workspaces.conf \ No newline at end of file diff --git a/config/hypr/scripts/KeyHints.sh b/config/hypr/scripts/KeyHints.sh index 60b2d689..973ca6b6 100755 --- a/config/hypr/scripts/KeyHints.sh +++ b/config/hypr/scripts/KeyHints.sh @@ -25,7 +25,7 @@ GDK_BACKEND=$BACKEND yad \ --timeout-indicator=bottom \ "ESC" "close this app" "" "ξ―† = ο…Ί" "SUPER KEY (Windows Key Button)" "(SUPER KEY)" \ "ξ―† SHIFT K" "Searchable Keybinds" "(Search all Keybinds via rofi)" \ -"ξ―† SHIFT E" "View or EDIT Keybinds, Settings, Monitor" "" \ +"ξ―† SHIFT E" "KooL Hyprland Settings Menu" "" \ "" "" "" \ "ξ―† enter" "Terminal" "(kitty)" \ "ξ―† SHIFT enter" "DropDown Terminal" "(Not available in Debian and Ubuntu)" \ diff --git a/config/hypr/scripts/MonitorProfiles.sh b/config/hypr/scripts/MonitorProfiles.sh new file mode 100755 index 00000000..ebab0144 --- /dev/null +++ b/config/hypr/scripts/MonitorProfiles.sh @@ -0,0 +1,42 @@ +#!/bin/bash +# /* ---- πŸ’« https://github.com/JaKooLit πŸ’« ---- */ ## +# For applying Pre-configured Monitor Profiles + +# Check if rofi is already running +if pidof rofi > /dev/null; then + pkill rofi +fi + +# Variables +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' + +# Define the list of files to ignore +ignore_files=( + "README" +) + +# list of Monitor Profiles, sorted alphabetically with numbers first +mon_profiles_list=$(find -L "$monitor_dir" -maxdepth 1 -type f | sed 's/.*\///' | sed 's/\.conf$//' | sort -V) + +# Remove ignored files from the list +for ignored_file in "${ignore_files[@]}"; do + mon_profiles_list=$(echo "$mon_profiles_list" | grep -v -E "^$ignored_file$") +done + +# Rofi Menu +chosen_file=$(echo "$mon_profiles_list" | rofi -i -dmenu -config $rofi_theme -mesg "$msg") + +# Check if a file was selected +if [[ -n "$chosen_file" ]]; then + full_path="$monitor_dir/$chosen_file.conf" + cp -r "$target" "$monitor_dir/Previous_Profile.conf" && cp "$full_path" "$target" + notify-send -u low -i "$iDIR/ja.png" "$chosen_file" "Monitor Profile Loaded" +fi + +sleep 1 +"$SCRIPTSDIR/RefreshNoWaybar.sh" diff --git a/config/hypr/v2.3.12 b/config/hypr/v2.3.12 deleted file mode 100644 index 31b3414d..00000000 --- a/config/hypr/v2.3.12 +++ /dev/null @@ -1,5 +0,0 @@ -### https://github.com/JaKooLit ### -## https://github.com/JaKooLit/Hyprland-Dots -## This is to have a reference of which version would be - -## note that this will always be higher than the released versions \ No newline at end of file diff --git a/config/hypr/v2.3.12-dev b/config/hypr/v2.3.12-dev new file mode 100644 index 00000000..31b3414d --- /dev/null +++ b/config/hypr/v2.3.12-dev @@ -0,0 +1,5 @@ +### https://github.com/JaKooLit ### +## https://github.com/JaKooLit/Hyprland-Dots +## This is to have a reference of which version would be + +## note that this will always be higher than the released versions \ No newline at end of file diff --git a/config/rofi/config-Monitors.rasi b/config/rofi/config-Monitors.rasi new file mode 100644 index 00000000..4e9c2284 --- /dev/null +++ b/config/rofi/config-Monitors.rasi @@ -0,0 +1,41 @@ +/* ---- πŸ’« https://github.com/JaKooLit πŸ’« ---- */ +/* Monitor Profiles Menu */ + +@import "~/.config/rofi/config.rasi" + +/* ---- Mainbox ---- */ +mainbox { + children: + [ "inputbar", "message", "listview"]; +} + +/* ---- Window ---- */ +window { + width: 45%; + height: inherit; +} + +/* ---- Entry ---- */ +entry { + width: 43%; + placeholder: " πŸ’» Search / Choose which Monitor Profiles to load"; +} + +/* ---- Listview ---- */ +listview { + columns: 1; + lines: 5; + fixed-height: false; + margin: 10px; + scrollbar: true; +} + +/* ---- Elements ---- */ +element-icon { + size: 0%; +} +element-text { + horizontal-align: 0.0; + vertical-align: 0.0; + margin: 5px 30px 5px 30px; +} diff --git a/config/rofi/config-edit.rasi b/config/rofi/config-edit.rasi index 79fbbbd9..b8a90345 100644 --- a/config/rofi/config-edit.rasi +++ b/config/rofi/config-edit.rasi @@ -1,5 +1,5 @@ /* ---- πŸ’« https://github.com/JaKooLit πŸ’« ---- */ -/* Main Config (compact) */ +/* KooL Hyprland Edit Rofi Config */ @import "~/.config/rofi/config.rasi" @@ -27,6 +27,7 @@ listview { columns: 2; lines: 6; fixed-height: false; + scrollbar: true; } /* ---- Entry input ---- */ diff --git a/config/waybar/ModulesCustom b/config/waybar/ModulesCustom index ba9c77ba..06feedfe 100644 --- a/config/waybar/ModulesCustom +++ b/config/waybar/ModulesCustom @@ -40,9 +40,9 @@ "custom/settings": { "format": "ξ­‘ ", - "on-click": "$HOME/.config/hypr/UserScripts/QuickEdit.sh", + "on-click": "$HOME/.config/hypr/UserScripts/Kool_Quick_Settings.sh", "tooltip": true, - "tooltip-format": "Launch Quick Edit", + "tooltip-format": "Launch KooL Hyprland Settings Menu", }, "custom/cycle_wall": { -- cgit v1.2.3 From 6be9f677691bbca3e0b0c82f65862a566a60da07 Mon Sep 17 00:00:00 2001 From: JaKooLit Date: Fri, 21 Feb 2025 20:30:41 +0900 Subject: updated --- config/hypr/UserScripts/Kool_Quick_Settings.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'config/hypr/UserScripts') diff --git a/config/hypr/UserScripts/Kool_Quick_Settings.sh b/config/hypr/UserScripts/Kool_Quick_Settings.sh index 7b2f7f0e..663b51ed 100755 --- a/config/hypr/UserScripts/Kool_Quick_Settings.sh +++ b/config/hypr/UserScripts/Kool_Quick_Settings.sh @@ -27,8 +27,8 @@ menu() { 7. view/edit Animations 8. view/edit Laptop Keybinds 9. view/edit Default Keybinds -10. view/edit Monitors (via nwg-displays) -11. view/edit Workspace Rules (nwg-displays) +10. Configure Monitors (nwg-displays) +11. Configure Workspace Rules (nwg-displays) 12. Choose Hyprland Animations 13. Choose Monitor Profiles 14. Choose Rofi Themes -- cgit v1.2.3 From cac7771a124a3a480bc8cf7c91896d560d917e43 Mon Sep 17 00:00:00 2001 From: JaKooLit Date: Fri, 21 Feb 2025 23:04:38 +0900 Subject: adjusted rofi configs to have better compatibility? --- config/hypr/UserScripts/Kool_Quick_Settings.sh | 87 +++++++++++++------------- config/rofi/config-Animations.rasi | 6 +- config/rofi/config-clipboard.rasi | 7 ++- config/rofi/config-edit.rasi | 7 ++- config/rofi/config-emoji.rasi | 5 +- config/rofi/config-keybinds.rasi | 3 + config/rofi/config-rofi-Beats-menu.rasi | 2 + config/rofi/config-rofi-Beats.rasi | 5 +- config/rofi/config-rofi-theme.rasi | 8 ++- config/rofi/config-wallpaper-effect.rasi | 8 ++- config/rofi/config-wallpaper.rasi | 15 ++--- config/rofi/config-waybar-layout.rasi | 4 +- config/rofi/config-waybar-style.rasi | 4 +- 13 files changed, 94 insertions(+), 67 deletions(-) (limited to 'config/hypr/UserScripts') diff --git a/config/hypr/UserScripts/Kool_Quick_Settings.sh b/config/hypr/UserScripts/Kool_Quick_Settings.sh index 663b51ed..a6dc2885 100755 --- a/config/hypr/UserScripts/Kool_Quick_Settings.sh +++ b/config/hypr/UserScripts/Kool_Quick_Settings.sh @@ -15,57 +15,58 @@ iDIR="$HOME/.config/swaync/images" scriptsDir="$HOME/.config/hypr/scripts" UserScripts="$HOME/.config/hypr/UserScripts" -# Function to display the menu options +# Function to display the menu options without numbers menu() { cat </dev/null; then - notify-send -i "$iDIR/ja.png" "Missing nwg-displays" "Install nwg-displays first" - exit 1 - fi - nwg-displays ;; - 11) if ! command -v nwg-displays &>/dev/null; then - notify-send -i "$iDIR/ja.png" "Missing nwg-displays" "Install nwg-displays first" - exit 1 - fi - nwg-displays ;; - 12) $scriptsDir/Animations.sh ;; - 13) $scriptsDir/MonitorProfiles.sh ;; - 14) $scriptsDir/RofiThemeSelector.sh ;; - 15) $scriptsDir/KeyBinds.sh ;; - + case "$choice" in + "view/edit ENV variables") file="$UserConfigs/ENVariables.conf" ;; + "view/edit Window Rules") file="$UserConfigs/WindowRules.conf" ;; + "view/edit User Keybinds") file="$UserConfigs/UserKeybinds.conf" ;; + "view/edit User Settings") file="$UserConfigs/UserSettings.conf" ;; + "view/edit Startup Apps") file="$UserConfigs/Startup_Apps.conf" ;; + "view/edit Decorations") file="$UserConfigs/UserDecorations.conf" ;; + "view/edit Animations") file="$UserConfigs/UserAnimations.conf" ;; + "view/edit Laptop Keybinds") file="$UserConfigs/Laptops.conf" ;; + "view/edit Default Keybinds") file="$configs/Keybinds.conf" ;; + "Configure Monitors (nwg-displays)") + if ! command -v nwg-displays &>/dev/null; then + notify-send -i "$iDIR/ja.png" "Missing nwg-displays" "Install nwg-displays first" + exit 1 + fi + nwg-displays ;; + "Configure Workspace Rules (nwg-displays)") + if ! command -v nwg-displays &>/dev/null; then + notify-send -i "$iDIR/ja.png" "Missing nwg-displays" "Install nwg-displays first" + exit 1 + fi + nwg-displays ;; + "Choose Hyprland Animations") $scriptsDir/Animations.sh ;; + "Choose Monitor Profiles") $scriptsDir/MonitorProfiles.sh ;; + "Choose Rofi Themes") $scriptsDir/RofiThemeSelector.sh ;; + "Search for Keybinds") $scriptsDir/KeyBinds.sh ;; *) return ;; # Do nothing for invalid choices esac @@ -80,4 +81,4 @@ if pidof rofi > /dev/null; then pkill rofi fi -main \ No newline at end of file +main diff --git a/config/rofi/config-Animations.rasi b/config/rofi/config-Animations.rasi index c7a86361..f26eecd6 100644 --- a/config/rofi/config-Animations.rasi +++ b/config/rofi/config-Animations.rasi @@ -11,7 +11,7 @@ mainbox { /* ---- Window ---- */ window { - width: 45%; + width: inherit; height: inherit; } @@ -28,6 +28,7 @@ listview { fixed-height: false; margin: 10px; scrollbar: true; + spacing: 6px; } /* ---- Elements ---- */ @@ -37,5 +38,6 @@ element-icon { element-text { horizontal-align: 0.0; vertical-align: 0.0; - margin: 5px 30px 5px 30px; + margin: 0px; + padding: 0px; } diff --git a/config/rofi/config-clipboard.rasi b/config/rofi/config-clipboard.rasi index 4006e646..d0d3d3ae 100644 --- a/config/rofi/config-clipboard.rasi +++ b/config/rofi/config-clipboard.rasi @@ -5,7 +5,7 @@ /* ---- Window ---- */ window { - width: 50%; + width: inherit; height: inherit; } @@ -17,7 +17,7 @@ mainbox { /* ---- Entry ---- */ entry { - width: 47%; + width: inherit; placeholder: " πŸ“‹ Search Clipboard "; } @@ -26,6 +26,7 @@ listview { columns: 1; lines: 8; fixed-height: true; + spacing: 6px; } /* ---- Elements ---- */ @@ -40,4 +41,6 @@ element-icon { element-text { horizontal-align: 0.0; vertical-align: 0.5; + margin: 0px; + padding: 0px; } diff --git a/config/rofi/config-edit.rasi b/config/rofi/config-edit.rasi index b8a90345..4f5215ef 100644 --- a/config/rofi/config-edit.rasi +++ b/config/rofi/config-edit.rasi @@ -17,7 +17,7 @@ configuration { /* ---- Window ---- */ window { - width: 50%; + width: inherit; height: inherit; } @@ -28,6 +28,7 @@ listview { lines: 6; fixed-height: false; scrollbar: true; + spacing: 6px; } /* ---- Entry input ---- */ @@ -47,6 +48,6 @@ element-icon { } element-text { horizontal-align: 0.0; - padding-left: 0px; - margin: 5px 30px 5px 30px; + margin: 0px; + padding: 0px; } \ No newline at end of file diff --git a/config/rofi/config-emoji.rasi b/config/rofi/config-emoji.rasi index 79135a10..3ab498e3 100644 --- a/config/rofi/config-emoji.rasi +++ b/config/rofi/config-emoji.rasi @@ -11,7 +11,7 @@ mainbox { /* ---- Window ---- */ window { - width: 45%; + width: inherit; height: inherit; } @@ -28,6 +28,7 @@ listview { lines: 7; fixed-height: false; scrollbar: true; + spacing: 6px; } /* ---- Elements ---- */ @@ -42,4 +43,6 @@ element-icon { element-text { horizontal-align: 0.0; vertical-align: 0.5; + padding: 0px; + margin: 0px; } \ No newline at end of file diff --git a/config/rofi/config-keybinds.rasi b/config/rofi/config-keybinds.rasi index 1deeccca..256c2e87 100644 --- a/config/rofi/config-keybinds.rasi +++ b/config/rofi/config-keybinds.rasi @@ -22,6 +22,7 @@ listview { lines: 8; fixed-height: false; scrollbar: true; + spacing: 6px; } window { @@ -41,4 +42,6 @@ element-icon { element-text { horizontal-align: 0.0; vertical-align: 0.5; + margin: 0px; + padding: 0px; } \ No newline at end of file diff --git a/config/rofi/config-rofi-Beats-menu.rasi b/config/rofi/config-rofi-Beats-menu.rasi index e2728ff5..ea20a09c 100644 --- a/config/rofi/config-rofi-Beats-menu.rasi +++ b/config/rofi/config-rofi-Beats-menu.rasi @@ -31,6 +31,7 @@ listview { scrollbar: false; colums: 1; lines: 3; + spacing: 6px; } /* ---- Element ---- */ @@ -39,4 +40,5 @@ element-icon { } element-text { horizontal-align: 0.5; + } \ No newline at end of file diff --git a/config/rofi/config-rofi-Beats.rasi b/config/rofi/config-rofi-Beats.rasi index 9be65e09..9c67f4e4 100644 --- a/config/rofi/config-rofi-Beats.rasi +++ b/config/rofi/config-rofi-Beats.rasi @@ -5,7 +5,7 @@ /* ---- Window ---- */ window { - width: 45%; + width: inherit; height: inherit; } @@ -27,6 +27,7 @@ listview { fixed-height: false; margin: 10px; scrollbar: true; + spacing: 6px; } /* ---- Elements ---- */ @@ -41,4 +42,6 @@ element-icon { element-text { horizontal-align: 0.0; vertical-align: 0.5; + margin: 0px; + padding: 0px; } \ No newline at end of file diff --git a/config/rofi/config-rofi-theme.rasi b/config/rofi/config-rofi-theme.rasi index 81b20ded..83975f64 100644 --- a/config/rofi/config-rofi-theme.rasi +++ b/config/rofi/config-rofi-theme.rasi @@ -5,7 +5,7 @@ /* ---- Window ---- */ window { - width: 45%; + width: inherit; height: inherit; } @@ -26,8 +26,9 @@ listview { columns: 2; lines: 7; fixed-height: false; - margin: 0px; + margin: 10px; scrollbar: true; + spacing: 6px; } /* ---- Elements ---- */ @@ -36,6 +37,7 @@ element-icon { } element-text { horizontal-align: 0.0; - vertical-align: 0.0; + vertical-align: 0.5; margin: 0px; + padding: 0px; } diff --git a/config/rofi/config-wallpaper-effect.rasi b/config/rofi/config-wallpaper-effect.rasi index 0909bae4..61d68a76 100644 --- a/config/rofi/config-wallpaper-effect.rasi +++ b/config/rofi/config-wallpaper-effect.rasi @@ -12,13 +12,13 @@ mainbox { /* ---- Entry ---- */ entry { + width: 32%; placeholder: " πŸ™οΈ Search / Choose desired wallpaper effect"; - padding: 12px; } /* ---- Window ---- */ window { - width: 35%; + width: inherit; height: inherit; } @@ -28,6 +28,7 @@ listview { lines: 7; fixed-height: false; scrollbar: true; + spacing: 6px; } /* ---- Inputbar ---- */ @@ -43,5 +44,6 @@ element-icon { element-text { horizontal-align: 0.0; vertical-align: 0.0; - margin: 5px 30px 5px 30px; + margin: 0px; + padding: 0px; } \ No newline at end of file diff --git a/config/rofi/config-wallpaper.rasi b/config/rofi/config-wallpaper.rasi index aa96932f..99f68098 100644 --- a/config/rofi/config-wallpaper.rasi +++ b/config/rofi/config-wallpaper.rasi @@ -31,6 +31,7 @@ listview { columns: 6; lines: 2; spacing: 20px; + padding: 10px; columns: 6; lines: 2; flow: horizontal; @@ -41,6 +42,8 @@ listview { /* ---- Element ---- */ element { orientation: vertical; + padding: 0px; + spacing: 0px; border-radius: 10px; padding: 0px; margin: 0px; @@ -48,20 +51,18 @@ element { element selected.normal { background-color: transparent; - } element-icon { - text-color: inherit; - size: 1%; - margin: -30px; - cursor: inherit; - + text-color: inherit; + size: 10%; + margin: -30px; + cursor: inherit; } element-text { vertical-align: 0.5; horizontal-align: 0.5; - padding: 20px; + padding: 10px; margin: 0px; } diff --git a/config/rofi/config-waybar-layout.rasi b/config/rofi/config-waybar-layout.rasi index 0d98a1ad..97ebe96f 100644 --- a/config/rofi/config-waybar-layout.rasi +++ b/config/rofi/config-waybar-layout.rasi @@ -33,6 +33,7 @@ listview { fixed-height: false; margin: 10px; scrollbar: true; + spacing: 6px; } /* ---- Elements ---- */ @@ -41,5 +42,6 @@ element-icon { } element-text { horizontal-align: 0.0; - margin: 5px 30px 5px 30px; + margin: 0px; + padding: 0px; } \ No newline at end of file diff --git a/config/rofi/config-waybar-style.rasi b/config/rofi/config-waybar-style.rasi index fd91e94f..bf9b11f2 100644 --- a/config/rofi/config-waybar-style.rasi +++ b/config/rofi/config-waybar-style.rasi @@ -32,6 +32,7 @@ listview { fixed-height: false; margin: 10px; scrollbar: true; + spacing: 6px; } /* ---- Elements ---- */ @@ -40,5 +41,6 @@ element-icon { } element-text { horizontal-align: 0.0; - margin: 5px 30px 5px 30px; + margin: 0px; + padding: 0px; } -- cgit v1.2.3