From 31cb63974ea6830216f5e1bcee4744afd8f0d143 Mon Sep 17 00:00:00 2001 From: "Ja.KooLit" <85185940+JaKooLit@users.noreply.github.com> Date: Mon, 24 Feb 2025 00:59:57 +0900 Subject: Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index be149fee..193ee3e6 100644 --- a/README.md +++ b/README.md @@ -120,7 +120,7 @@ chmod +x upgrade.sh - I am getting ridiculously amount of messages for updating your KooL Hyprland dotfiles. I have made a BIG note on [`WIKI`](https://github.com/JaKooLit/Hyprland-Dots/wiki/Install_&_Update) -## ⚠️⚠️⚠️ ATTENTION - BACKUPS CREATED by SCRIPT +#### ⚠️⚠️⚠️ ATTENTION - BACKUPS CREATED by SCRIPT > [!CAUTION] > copy.sh, release.sh and even upgrade.sh creates a backup! > Kindly investigate manually contents on your $HOME/.config -- cgit v1.2.3 From 4a0475938de893b1f4e9092f896ebc46fa6f2810 Mon Sep 17 00:00:00 2001 From: JaKooLit Date: Mon, 24 Feb 2025 10:31:11 +0900 Subject: increased default kitty font size, added more notes on monitors.conf and workspaces.conf --- config/hypr/UserConfigs/WorkSpaceRules | 32 ++++++++++++++++++++++++++++++++ config/hypr/monitors.conf | 11 ++++++++++- config/hypr/workspaces.conf | 7 ++++++- config/kitty/kitty.conf | 2 +- copy.sh | 2 +- 5 files changed, 50 insertions(+), 4 deletions(-) create mode 100644 config/hypr/UserConfigs/WorkSpaceRules diff --git a/config/hypr/UserConfigs/WorkSpaceRules b/config/hypr/UserConfigs/WorkSpaceRules new file mode 100644 index 00000000..aa86b35c --- /dev/null +++ b/config/hypr/UserConfigs/WorkSpaceRules @@ -0,0 +1,32 @@ +# /* ---- 💫 https://github.com/JaKooLit 💫 ---- */ # + +# NOTE: THIS IS NOT BEING SOURCED by hyprland +# It is only here as a guide if you want to do it manually +# The file you should edit is ~/.config/hypr/workspaces.conf +# Since that is the work space rules being sourced by hyprland +# use nwg-displays to handle your workspace rules. + +# 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/config/hypr/monitors.conf b/config/hypr/monitors.conf index b3b75847..74a60819 100644 --- a/config/hypr/monitors.conf +++ b/config/hypr/monitors.conf @@ -1,6 +1,14 @@ # /* ---- 💫 https://github.com/JaKooLit 💫 ---- */ # +# default Monitor config + +# *********************************************************** # +# +# NOTE: This will be overwritten by NWG-Displays +# once you use and click apply. You can still find this +# default at ~/.config/hypr/Monitor_Profiles/default.conf +# +# *********************************************************** # -# WARN!!! THIS WILL BE OVERWRITTEN by NWG-DISPLAY # Monitor Configuration # See Hyprland wiki for more details @@ -50,3 +58,4 @@ monitor=,highres,auto,1 # 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 index 37471b3e..708dee00 100644 --- a/config/hypr/workspaces.conf +++ b/config/hypr/workspaces.conf @@ -1,6 +1,11 @@ # /* ---- 💫 https://github.com/JaKooLit 💫 ---- */ # -# WARN THIS WILL BE OVERWRITTEN by NWG-DISPLAY +# *********************************************************** # +# +# NOTE: This will be overwritten by NWG-Displays +# once you use and click apply. +# +# *********************************************************** # # 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. diff --git a/config/kitty/kitty.conf b/config/kitty/kitty.conf index 34bc3414..e33e8cf6 100644 --- a/config/kitty/kitty.conf +++ b/config/kitty/kitty.conf @@ -4,7 +4,7 @@ #include kitty-colors.conf font_family FantasqueSansM Nerd Font Mono Bold -font_size 15.0 +font_size 16.0 bold_font auto italic_font auto bold_italic_font auto diff --git a/copy.sh b/copy.sh index 83377b8b..23cb3aef 100755 --- a/copy.sh +++ b/copy.sh @@ -321,7 +321,7 @@ echo "${OK} You have chosen $resolution resolution." 2>&1 | tee -a "$LOG" # Add your commands based on the resolution choice if [ "$resolution" == "< 1440p" ]; then #cp -r config/rofi/resolution/1080p/* config/rofi/ 10-Feb-2025 - sed -i 's/font_size 15.0/font_size 13.0/' config/kitty/kitty.conf + sed -i 's/font_size 16.0/font_size 14.0/' config/kitty/kitty.conf # hyprlock matters mv config/hypr/hyprlock.conf config/hypr/hyprlock-2k.conf && -- cgit v1.2.3 From 2a4853dacf660327335b9f6c3c561a299bdeeea2 Mon Sep 17 00:00:00 2001 From: JaKooLit Date: Mon, 24 Feb 2025 10:57:43 +0900 Subject: added some notes in EnVariables.conf --- config/hypr/UserConfigs/ENVariables.conf | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/config/hypr/UserConfigs/ENVariables.conf b/config/hypr/UserConfigs/ENVariables.conf index 09ae1bdb..a0ba2c15 100644 --- a/config/hypr/UserConfigs/ENVariables.conf +++ b/config/hypr/UserConfigs/ENVariables.conf @@ -44,8 +44,9 @@ env = QT_SCALE_FACTOR,1 # firefox env = MOZ_ENABLE_WAYLAND,1 -# electron >28 apps (may help) -env = ELECTRON_OZONE_PLATFORM_HINT,auto +# electron >28 apps (may help) ## +# https://www.electronjs.org/docs/latest/api/environment-variables +env = ELECTRON_OZONE_PLATFORM_HINT,auto # auto selects Wayland if possible, X11 otherwise # NVIDIA # This is from Hyprland Wiki. Below will be activated nvidia gpu detected @@ -55,12 +56,6 @@ env = ELECTRON_OZONE_PLATFORM_HINT,auto #env = __GLX_VENDOR_LIBRARY_NAME,nvidia #env = NVD_BACKEND,direct -# to use nvidia as primary renderer (need hyprland >0.45) -#env = AQ_DRM_DEVICES,/dev/dri/card1 (nvidia) -#env = AQ_DRM_DEVICES,/dev/dri/card0 - -#env = AQ_NO_ATOMIC,1 #use legacy DRM interface - # additional ENV's for nvidia. Caution, activate with care #env = GBM_BACKEND,nvidia-drm @@ -77,4 +72,18 @@ env = ELECTRON_OZONE_PLATFORM_HINT,auto # nvidia firefox (for hardware acceleration on FF)? # check this post https://github.com/elFarto/nvidia-vaapi-driver#configuration #env = MOZ_DISABLE_RDD_SANDBOX,1 -#env = EGL_PLATFORM,wayland \ No newline at end of file +#env = EGL_PLATFORM,wayland + +#### Aquamarine Environment Variables #### ( Hyprland > 0.45 ) +# https://wiki.hyprland.org/Configuring/Environment-variables/#aquamarine-environment-variables----ref-httpsgithubcomhyprwmaquamarineblobmaindocsenvmd--- +# env = AQ_TRACE,1 # Enables more verbose logging. +# env = AQ_DRM_DEVICES,/dev/dri/card1:/dev/dri/card0 # Set an explicit list of DRM devices (GPUs) to use. It’s a colon-separated list of paths, with the first being the primary. E.g. /dev/dri/card1:/dev/dri/card0 +# env = AQ_MGPU_NO_EXPLICIT,1 # Disables explicit syncing on mgpu buffers +# env = AQ_NO_MODIFIERS,1 # Disables modifiers for DRM buffers + +#### Hyprland Environment Variables #### +# https://wiki.hyprland.org/Configuring/Environment-variables/#hyprland-environment-variables +# env = HYPRLAND_TRACE,1 # Enables more verbose logging. +# env = HYPRLAND_NO_RT,1 # Disables realtime priority setting by Hyprland. +# env = HYPRLAND_NO_SD_NOTIFY,1 # If systemd, disables the 'sd_notify' calls. +# env = HYPRLAND_NO_SD_VARS,1 # Disables management of variables in systemd and dbus activation environments. -- cgit v1.2.3 From 6326d71c174c4156fe7c5b70127a6e1d90f93604 Mon Sep 17 00:00:00 2001 From: "Ja.KooLit" <85185940+JaKooLit@users.noreply.github.com> Date: Mon, 24 Feb 2025 11:54:21 +0900 Subject: Update Kool_Quick_Settings.sh --- config/hypr/UserScripts/Kool_Quick_Settings.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/hypr/UserScripts/Kool_Quick_Settings.sh b/config/hypr/UserScripts/Kool_Quick_Settings.sh index 3e70fee3..0381bd02 100755 --- a/config/hypr/UserScripts/Kool_Quick_Settings.sh +++ b/config/hypr/UserScripts/Kool_Quick_Settings.sh @@ -1,6 +1,6 @@ #!/bin/bash # /* ---- 💫 https://github.com/JaKooLit 💫 ---- */ ## -# Rofi menu for Quick Edit/View of Settings (SUPER SHIFT E) +# Rofi menu for KooL Quick Hyprland Settings (SUPER SHIFT E) # Define preferred text editor and terminal edit=${EDITOR:-nano} -- cgit v1.2.3 From 355b1e2c11e80ebd93801d8587391d117bd364c5 Mon Sep 17 00:00:00 2001 From: "Ja.KooLit" <85185940+JaKooLit@users.noreply.github.com> Date: Mon, 24 Feb 2025 11:55:52 +0900 Subject: Update Kool_Quick_Settings.sh --- config/hypr/UserScripts/Kool_Quick_Settings.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/hypr/UserScripts/Kool_Quick_Settings.sh b/config/hypr/UserScripts/Kool_Quick_Settings.sh index 0381bd02..7b41512e 100755 --- a/config/hypr/UserScripts/Kool_Quick_Settings.sh +++ b/config/hypr/UserScripts/Kool_Quick_Settings.sh @@ -1,6 +1,6 @@ #!/bin/bash # /* ---- 💫 https://github.com/JaKooLit 💫 ---- */ ## -# Rofi menu for KooL Quick Hyprland Settings (SUPER SHIFT E) +# Rofi menu for KooL Hyprland Quick Settings (SUPER SHIFT E) # Define preferred text editor and terminal edit=${EDITOR:-nano} -- cgit v1.2.3 From 483334becd60d48fdcaec526e013d1f024f1b4fb Mon Sep 17 00:00:00 2001 From: JaKooLit Date: Mon, 24 Feb 2025 18:45:31 +0900 Subject: new wlogout style. This should cover all screen resolutions --- config/hypr/scripts/Wlogout.sh | 58 +------------ config/wlogout/icons/hibernate-hover.png | Bin 5721 -> 18289 bytes config/wlogout/icons/hibernate-hover1.png | Bin 0 -> 5721 bytes config/wlogout/icons/sleep-hover.png | Bin 18289 -> 9522 bytes config/wlogout/icons/sleep2.png | Bin 0 -> 14964 bytes config/wlogout/style.css | 138 +++++++++++++++++++++--------- 6 files changed, 100 insertions(+), 96 deletions(-) create mode 100644 config/wlogout/icons/hibernate-hover1.png create mode 100644 config/wlogout/icons/sleep2.png diff --git a/config/hypr/scripts/Wlogout.sh b/config/hypr/scripts/Wlogout.sh index 1f720b18..3f83e51f 100755 --- a/config/hypr/scripts/Wlogout.sh +++ b/config/hypr/scripts/Wlogout.sh @@ -1,58 +1,4 @@ #!/bin/bash -# /* ---- 💫 https://github.com/JaKooLit 💫 ---- */ ## -# wlogout (Power, Screen Lock, Suspend, etc) +# /* ----------- 💫 https://github.com/JaKooLit 💫 -------- */ # -# Parameters for screen resolutions -declare -A resolutions=( - [2160]=450 - [1600]=450 - [1440]=450 - [1080]=350 - [720]=175 -) - -# Check if wlogout is already running, if so, kill it -if pgrep -x "wlogout" > /dev/null; then - pkill -x "wlogout" - exit 0 -fi - -# Detect the current monitor's native resolution and scale -monitor_info=$(hyprctl -j monitors | jq -r '.[] | select(.focused==true)') - -resolution=$(echo "$monitor_info" | jq -r '.height') -width=$(echo "$monitor_info" | jq -r '.width') -hypr_scale=$(echo "$monitor_info" | jq -r '.scale') - -# Round hypr_scale to 2 decimal places for accurate comparison -rounded_scale=$(echo "scale=2; $hypr_scale/1" | bc) - -# If resolution or scale is invalid or hypr_scale >= 1.25, run wlogout with -b 3 -if [[ -z "$resolution" || ! "$resolution" =~ ^[0-9]+$ || -z "$hypr_scale" || $(echo "$rounded_scale >= 1.25" | bc) -eq 1 ]]; then - echo "Hypr_scale is greater than or equal to 1.25 or resolution could not be detected, running wlogout with -b 3" - wlogout --protocol layer-shell -b 3 -T 100 -B 100 & - exit 0 -fi - -# Determine the appropriate resolution range and calculate T and B values -if ((resolution >= 2160)); then - res_key=2160 -elif ((resolution >= 1600)); then - res_key=1600 -elif ((resolution >= 1440)); then - res_key=1440 -elif ((resolution >= 1080)); then - res_key=1080 -else - res_key=720 -fi - -# Calculate T and B values based on selected resolution and scale -T_val=$(awk "BEGIN {printf \"%.0f\", ${resolutions[$res_key]} * $res_key * $hypr_scale / $resolution}") -B_val=$(awk "BEGIN {printf \"%.0f\", ${resolutions[$res_key]} * $res_key * $hypr_scale / $resolution}") - -# Output the resolution setting for debugging purposes -echo "Setting parameters for resolution >= $res_key" - -# Run wlogout with -b 6 and calculated T/B values -wlogout --protocol layer-shell -b 6 -T $T_val -B $B_val & \ No newline at end of file +wlogout -p layer-shell -b 3 -c 2 \ No newline at end of file diff --git a/config/wlogout/icons/hibernate-hover.png b/config/wlogout/icons/hibernate-hover.png index 0fd3bade..0ac492d1 100644 Binary files a/config/wlogout/icons/hibernate-hover.png and b/config/wlogout/icons/hibernate-hover.png differ diff --git a/config/wlogout/icons/hibernate-hover1.png b/config/wlogout/icons/hibernate-hover1.png new file mode 100644 index 00000000..0fd3bade Binary files /dev/null and b/config/wlogout/icons/hibernate-hover1.png differ diff --git a/config/wlogout/icons/sleep-hover.png b/config/wlogout/icons/sleep-hover.png index 0ac492d1..b1a5fabb 100644 Binary files a/config/wlogout/icons/sleep-hover.png and b/config/wlogout/icons/sleep-hover.png differ diff --git a/config/wlogout/icons/sleep2.png b/config/wlogout/icons/sleep2.png new file mode 100644 index 00000000..b87fabf8 Binary files /dev/null and b/config/wlogout/icons/sleep2.png differ diff --git a/config/wlogout/style.css b/config/wlogout/style.css index 4e53eded..4fc19b09 100644 --- a/config/wlogout/style.css +++ b/config/wlogout/style.css @@ -5,83 +5,141 @@ @import '../../.config/waybar/wallust/colors-waybar.css'; window { - font-family: Fira Code Medium; - font-size: 16pt; - color: #cdd6f4; /* text */ - background-color: rgba(30, 30, 46, 0.6); + font-family: "FantasqueSansM Nerd Font Mono Bold"; + font-size: 125%; + background-color: rgba(30, 30, 46, 0.9); } button { + font-family: "FantasqueSansM Nerd Font Mono Bold"; background-repeat: no-repeat; - background-position: center; - background-size: 20%; + background-size: 10%; background-color: rgba(200, 220, 255, 0); animation: gradient_f 10s ease-in infinite; - transition: all 0.3s cubic-bezier(.55, 0.0, .28, 1.682), box-shadow 0.2s ease-in-out, background-color 0.2s ease-in-out; - border-radius: 80px; - border:0px; + transition: all 0.3s ease, box-shadow 0.2s ease-in-out, background-color 0.2s ease-in-out; + border: 2px solid transparent; + border-radius: 30%; + margin: 0px; + padding: 0px; + transition: all 0.3s ease; + background-position: center; } button:focus { - background-size: 50%; - border: 0px; - + background-size: 20%; + border: 0px; + border-radius: 30%; } button:hover { - background-color: @color12; - color: #1e1e2e; - background-size: 50%; - margin: 30px; - border-radius: 80px; - box-shadow: 0 0 30px @color7; - + background-color: transparent; + color: @color13; + border-radius: 40%; + background-size: 30%; + box-shadow: 0 0 100px @color12; } -/* Adjust the size of the icon or content inside the button */ -button span { - font-size: 1.2em; /* Increase the font size */ -} - - -#lock { +/* Port Side */ +#lock { + padding-right: 200px; + padding-left: 0px; + margin-left: 0px; + margin-right: -200px; background-image: image(url("./icons/lock.png")); } #lock:hover { + padding-left: 200px; + padding-right: 0px; + margin-right: 0px; + margin-left: -200px; background-image: image(url("./icons/lock-hover.png")); } +#reboot { + padding-right: 200px; + padding-left: 0px; + margin-left: 0px; + margin-right: -200px; + background-image: image(url("./icons/restart.png")); +} +#reboot:hover { + padding-left: 200px; + padding-right: 0px; + margin-right: 0px; + margin-left: -200px; + background-image: image(url("./icons/restart-hover.png")); +} + +/* Midship */ +#shutdown { + padding-bottom: 0px; + padding-top: 0px; + padding-right: 0px; + padding-left: 0px; + margin-left: 0px; + margin-right: 0px; + margin-top: -200px; + background-image: image(url("./icons/power.png")); +} +#shutdown:hover { + padding-top: 0px; + padding-bottom: 0px; + padding-right: 0px; + padding-left: 0px; + margin-left: 0px; + margin-right: 0px; + margin-top: -200px; + background-image: image(url("./icons/power-hover.png")); +} + #logout { + padding-top: 0px; + padding-bottom: 0px; + padding-right: 0px; + padding-left: 0px; + margin-left: 0px; + margin-right: 0px; + margin-bottom: -200px; background-image: image(url("./icons/logout.png")); } #logout:hover { + padding-bottom: 00px; + padding-top: 0px; + padding-right: 0px; + padding-left: 0px; + margin-left: 0px; + margin-right: 0px; + margin-bottom: -200px; background-image: image(url("./icons/logout-hover.png")); } +/* Starboard */ #suspend { + padding-left: 200px; + padding-right: 0px; + margin-right: 0px; + margin-left: -200px; background-image: image(url("./icons/sleep.png")); } #suspend:hover { + padding-right: 200px; + padding-left: 0px; + margin-left: 0px; + margin-right: -200px; background-image: image(url("./icons/sleep-hover.png")); } -#shutdown { - background-image: image(url("./icons/power.png")); -} -#shutdown:hover { - background-image: image(url("./icons/power-hover.png")); -} - -#reboot { - background-image: image(url("./icons/restart.png")); -} -#reboot:hover { - background-image: image(url("./icons/restart-hover.png")); -} - #hibernate { + padding-left: 200px; + padding-right: 0px; + margin-right: 0px; + margin-left: -200px; background-image: image(url("./icons/hibernate.png")); } #hibernate:hover { + padding-right: 200px; + padding-left: 0px; + margin-left: 0px; + margin-right: -200px; background-image: image(url("./icons/hibernate-hover.png")); } -- cgit v1.2.3