From 73a945572bf3200568834c4efe358494d507de15 Mon Sep 17 00:00:00 2001 From: JaKooLit Date: Tue, 23 Apr 2024 09:47:54 +0900 Subject: [PATCH 01/18] Bump to v2.2.8 Featuring Hypridle and Hyprlock. Thanks to @SherLock707 for the configs --- config/hypr/UserConfigs/Startup_Apps.conf | 10 +- config/hypr/hypridle.conf | 33 ++++++ config/hypr/hyprlock.conf | 118 ++++++++++++++++++++++ config/hypr/scripts/LockScreen.sh | 6 +- config/hypr/{v2.2.7 => v2.2.8} | 0 5 files changed, 156 insertions(+), 11 deletions(-) create mode 100644 config/hypr/hypridle.conf create mode 100644 config/hypr/hyprlock.conf rename config/hypr/{v2.2.7 => v2.2.8} (100%) diff --git a/config/hypr/UserConfigs/Startup_Apps.conf b/config/hypr/UserConfigs/Startup_Apps.conf index 6d047dc..ee387d8 100644 --- a/config/hypr/UserConfigs/Startup_Apps.conf +++ b/config/hypr/UserConfigs/Startup_Apps.conf @@ -34,15 +34,11 @@ exec-once = wl-paste --type image --watch cliphist store # Rainbow borders exec-once = $UserScripts/RainbowBorders.sh -# sway-idle with lock only -exec-once = swayidle -w timeout 900 '$lock' -# sway-idle with lock and sleep -#exec-once = swayidle -w timeout 900 '$lock' timeout 1200 'hyprctl dispatch dpms off' resume 'hyprctl dispatch dpms on' before-sleep '$lock' -# sway idle without lock -#exec-once = swayidle -w timeout 900 'hyprctl dispatch dpms off' resume 'hyprctl dispatch dpms on' +# Starting hypridle to start hyprlock +exec-once = hypridle -q # Here are list of features available but disabled by default -#exec-once = swww query || swww-daemon --format xrgb && swww img $HOME/Pictures/wallpapers/mecha-nostalgia.png # persistent wallpaper +# exec-once = swww query || swww-daemon --format xrgb && swww img $HOME/Pictures/wallpapers/mecha-nostalgia.png # persistent wallpaper #gnome polkit for nixos #exec-once = $scriptsDir/Polkit-NixOS.sh diff --git a/config/hypr/hypridle.conf b/config/hypr/hypridle.conf new file mode 100644 index 0000000..7b8ce81 --- /dev/null +++ b/config/hypr/hypridle.conf @@ -0,0 +1,33 @@ +# /* ---- 💫 https://github.com/JaKooLit 💫 ---- */ # +# Hypridle +# Original config submitted by https://github.com/SherLock707 + + +general { + # lock_cmd = notify-send "lock!" # dbus/sysd lock command (loginctl lock-session) + # unlock_cmd = notify-send "unlock!" # same as above, but unlock + # before_sleep_cmd = notify-send "Zzz" # command ran before sleep + # after_sleep_cmd = notify-send "Awake!" # command ran after sleep + ignore_dbus_inhibit = false # whether to ignore dbus-sent idle-inhibit requests (used by e.g. firefox or steam) +} + +# Warn +listener { + timeout = 540 # 9 min + on-timeout = notify-send "You are idle!" # command to run when timeout has passed + on-resume = notify-send "Welcome back!" # command to run when activity is detected after timeout has fired. +} + +# Screenlock +listener { + timeout = 600 # 10 min + on-timeout = hyprlock # command to run when timeout has passed + # on-resume = notify-send "Welcome back to your desktop!" # command to run when activity is detected after timeout has fired. +} + +# Suspend # disabled by default +# listener { + # timeout = 1200 # 20 min + # on-timeout = systemctl suspend # command to run when timeout has passed + # on-resume = notify-send "Welcome back to your desktop!" # command to run when activity is detected after timeout has fired. +# } diff --git a/config/hypr/hyprlock.conf b/config/hypr/hyprlock.conf new file mode 100644 index 0000000..6af5d7b --- /dev/null +++ b/config/hypr/hyprlock.conf @@ -0,0 +1,118 @@ +# /* ---- 💫 https://github.com/JaKooLit 💫 ---- */ # +# Hyprlock +# Original config submitted by https://github.com/SherLock707 + +source = $HOME/.cache/wal/colors-hyprland + +general { + grace = 1 +} + +background { + monitor = + path = screenshot # screenshot of your desktop + # path = $HOME/.config/rofi/.current_wallpaper # NOTE only png supported for now + color = $color7 + + # all these options are taken from hyprland, see https://wiki.hyprland.org/Configuring/Variables/#blur for explanations + blur_size = 4 + blur_passes = 2 # 0 disables blurring + noise = 0.0117 + contrast = 1.3000 # Vibrant!!! + brightness = 0.8000 + vibrancy = 0.2100 + vibrancy_darkness = 0.0 +} + +input-field { + monitor = + size = 250, 50 + outline_thickness = 3 + dots_size = 0.33 # Scale of input-field height, 0.2 - 0.8 + dots_spacing = 0.15 # Scale of dots' absolute size, 0.0 - 1.0 + dots_center = true + outer_color = $color1 + inner_color = $color0 + font_color = $color7 + fade_on_empty = true + placeholder_text = Password... # Text rendered in the input box when it's empty. + hide_input = false + + position = 0, 100 + halign = center + valign = bottom +} + +# Date +label { + monitor = + text = cmd[update:18000000] echo " "$(date +'%A, %-d %B %Y')" " + color = $color5 + font_size = 34 + font_family = JetBrains Mono Nerd Font 10 + + position = 0, -100 + halign = center + valign = top +} + +# Week +label { + monitor = + text = cmd[update:18000000] echo " "$(date +'Week %U')" " + color = $color7 + font_size = 24 + font_family = JetBrains Mono Nerd Font 10 + + position = 0, -150 + halign = center + valign = top +} + +# Time +label { + monitor = + text = cmd[update:1000] echo " $(date +"%H:%M:%S") " # 24H + #text = cmd[update:1000] echo " $(date +"%I:%M:%S %p") " # AM/PM + color = $color7 + font_size = 94 + font_family = JetBrains Mono Nerd Font 10 + + position = 0, 0 + halign = center + valign = center +} + +label { + monitor = + text =  $USER + color = $color7 + font_size = 18 + font_family = Inter Display Medium + + position = 0, 200 + halign = center + valign = bottom +} + +label { + monitor = + text = cmd[update:60000] echo " "$(uptime -p)" " + color = $color12 + font_size = 24 + font_family = JetBrains Mono Nerd Font 10 + position = 0, 0 + halign = right + valign = bottom +} + +label { + monitor = + text = cmd[update:3600000] curl -s 'wttr.in?format=2' # For specific location : wttr.in/busan?format=2 + color = $color10 + font_size = 24 + font_family = JetBrains Mono Nerd Font 10 + position = 50, 0 + halign = left + valign = bottom +} diff --git a/config/hypr/scripts/LockScreen.sh b/config/hypr/scripts/LockScreen.sh index bf9fcf5..56d496a 100755 --- a/config/hypr/scripts/LockScreen.sh +++ b/config/hypr/scripts/LockScreen.sh @@ -1,7 +1,5 @@ #!/bin/bash # /* ---- 💫 https://github.com/JaKooLit 💫 ---- */ ## -# For Swaylock -CONFIG="$HOME/.config/swaylock/config" - -sleep 0.5s; swaylock --config ${CONFIG} & disown +# For Hyprlock +hyprlock -q \ No newline at end of file diff --git a/config/hypr/v2.2.7 b/config/hypr/v2.2.8 similarity index 100% rename from config/hypr/v2.2.7 rename to config/hypr/v2.2.8 From b25891b922ac7b66a56671eb94ee90315d04d9f4 Mon Sep 17 00:00:00 2001 From: JaKooLit Date: Tue, 23 Apr 2024 11:01:06 +0900 Subject: [PATCH 02/18] updated initial-boot.sh --- config/hypr/initial-boot.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/hypr/initial-boot.sh b/config/hypr/initial-boot.sh index 15fae8c..b6c57f3 100755 --- a/config/hypr/initial-boot.sh +++ b/config/hypr/initial-boot.sh @@ -20,7 +20,7 @@ if [ ! -f ~/.config/hypr/.initial_startup_done ]; then # Initialize pywal and wallpaper if [ -f "$wallpaper" ]; then wal -i $wallpaper -s -t > /dev/null - swww-daemon --format xrgb && $swww $wallpaper $effect + swww query || swww-daemon && $swww $wallpaper $effect "$scriptsDir/PywalSwww.sh" > /dev/null 2>&1 & fi From 7c96b0a07eb869cecbbea24d5030d9387c751243 Mon Sep 17 00:00:00 2001 From: JaKooLit Date: Tue, 23 Apr 2024 11:04:31 +0900 Subject: [PATCH 03/18] minor waybar update --- config/waybar/configs/[TOP] Minimal - Long | 1 + 1 file changed, 1 insertion(+) diff --git a/config/waybar/configs/[TOP] Minimal - Long b/config/waybar/configs/[TOP] Minimal - Long index 52e16fd..143f22d 100644 --- a/config/waybar/configs/[TOP] Minimal - Long +++ b/config/waybar/configs/[TOP] Minimal - Long @@ -27,6 +27,7 @@ ], "modules-center": [ "clock", + "idle_inhibitor", ], "modules-right": [ "group/motherboard", From e0e75bdb095c6777cd45e5f7baae7a14884df790 Mon Sep 17 00:00:00 2001 From: JaKooLit Date: Tue, 23 Apr 2024 11:45:05 +0900 Subject: [PATCH 04/18] updated touchpad.sh --- config/hypr/scripts/TouchPad.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/config/hypr/scripts/TouchPad.sh b/config/hypr/scripts/TouchPad.sh index c5722c1..e94ee06 100755 --- a/config/hypr/scripts/TouchPad.sh +++ b/config/hypr/scripts/TouchPad.sh @@ -1,6 +1,9 @@ #!/bin/bash # /* ---- 💫 https://github.com/JaKooLit 💫 ---- */ ## # For disabling touchpad. +# Edit the Touchpad_Device according to your system +# use hyprctl devices to get your system touchpad device name + Touchpad_Device="asue1209:00-04f3:319f-touchpad" notif="$HOME/.config/swaync/images/bell.png" From 06aba65570b0d059d037b484018dd639b0be4e10 Mon Sep 17 00:00:00 2001 From: JaKooLit Date: Tue, 23 Apr 2024 16:18:23 +0900 Subject: [PATCH 05/18] added half-moon waybar style --- config/waybar/style/Half-Moon.css | 201 ++++++++++++++++++++++++++++++ 1 file changed, 201 insertions(+) create mode 100644 config/waybar/style/Half-Moon.css diff --git a/config/waybar/style/Half-Moon.css b/config/waybar/style/Half-Moon.css new file mode 100644 index 0000000..3fa290d --- /dev/null +++ b/config/waybar/style/Half-Moon.css @@ -0,0 +1,201 @@ +/* ----------- 💫 https://github.com/JaKooLit 💫 -------- */ +/* ....................................*/ +/* ..........Half Moon.................. */ +/* NOTE: This is only for some waybar configs */ +/* --- 👍 shared by https://github.com/TomekBobrowicz 👍 --- */ + +* { +font-size: 97%; +font-family: JetBrainsMono Nerd Font, Font Awesome, sans-serif; +font-weight: bold; +} +window#waybar { + background-color: rgba(26,27,38,0); + border-bottom: 1px solid rgba(26,27,38,0); + border-radius: 0px; + color: #E6B673; + + } +#workspaces { + background: #0F1419; + margin: 5px; + padding: 0px 1px; + border-radius: 15px; + border: 0px; + font-style: normal; + color: #0F1419; + + } +#workspaces button { + padding: 0px 5px; + margin: 4px 3px; + border-radius: 15px; + border: 0px; + color: #0F1419; + background: linear-gradient(45deg, #95E6CB, #59C2FF, #D2A6FF); + opacity: 0.5; + transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682); + + } +#workspaces button.active { + padding: 0px 5px; + margin: 4px 3px; + border-radius: 15px; + border: 0px; + color: #0F1419; + background: linear-gradient(45deg, #59C2FF, #D2A6FF); + opacity: 1.0; + min-width: 40px; + transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682); + } +#workspaces button:hover { + border-radius: 15px; + color: #0F1419; + background: linear-gradient(45deg, #59C2FF, #D2A6FF); + opacity: 0.8; + transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682); + + } +@keyframes gradient_horizontal { +0% { + background-position: 0% 50%; +} +50% { + background-position: 100% 50%; +} +100% { + background-position: 0% 50%; +} + } + @keyframes swiping { + 0% { + background-position: 0% 200%; +} +100% { + background-position: 200% 200%; +} + } + tooltip { +background: #0F1419; +border: 1px solid #D2A6FF; +border-radius: 10px; + } + tooltip label { +color: #F3F4F5; + } + #window { + color: #E6E1CF; + background: #0F1419; + border-radius: 50px 15px 50px 15px; + margin: 5px; + padding: 2px 20px; + + } + #temperature, + #memory { +color: #E6B673; + background: #0F1419; + border-radius: 50px 15px 50px 15px; + margin: 5px; + padding: 2px 20px; + + } + + #custom-swaync, + #idle_inhibitor, + #clock { + color: #B8CC52; + background: #0F1419; + border-radius: 15px 50px 15px 50px; + margin: 5px; + padding: 2px 20px; + + } + #cpu { + color: #F3F4F5; + background: #0F1419; + border-radius: 50px 15px 50px 15px; + margin: 5px; + padding: 2px 20px; + + } + #disk { + color: #B8CC52; + background: #0F1419; + border-radius: 50px 15px 50px 15px; + margin: 5px; + padding: 2px 20px; + + } + #battery { + color: #F07178; + background: #0F1419; + border-radius: 15px 50px 15px 50px; + margin: 5px; + padding: 2px 20px; + + } + #network { + color: #FF8F40; + background: #0F1419; + border-radius: 50px 15px 50px 15px; + margin: 5px; + padding: 2px 20px; + + } + #custom-hyprbindings { + color: #D2A6FF; + background: #0F1419; + border-radius: 15px 50px 15px 50px; + margin: 5px; + padding: 2px 20px; + + } + #tray { + color: #E6E1CF; + background: #0F1419; + border-radius: 15px 30px 30px 50px; + margin: 5px 0px 5px 5px; + padding: 2px 20px; + + } + #pulseaudio { + color: #59C2FF; + background: #0F1419; + border-radius: 50px 15px 50px 15px; + margin: 5px; + padding: 2px 20px; + + } + #custom-notification { + color: #95E6CB; + background: #0F1419; + border-radius: 15px 50px 15px 50px; + margin: 5px; + padding: 2px 20px; + + } + #custom-weather { + color: #59C2FF; + background: #0F1419; + border-radius: 0px 50px 15px 0px; + margin: 5px 0px; + padding: 2px 15px 2px 5px; + + } + #custom-menu { + color: #59C2FF; + background: #0F1419; + border-radius: 0px 15px 50px 0px; + margin: 5px 5px 5px 0px; + padding: 1px 15px; + + } + #custom-power { + color: #D2A6FF; + background: #0F1419; + border-radius: 15px 0px 0px 50px; + margin: 5px 0px; + padding: 2px 5px 2px 15px; + + } From 8f52c3c99dc0a83c8b84c59bddd0c37d62ef06c8 Mon Sep 17 00:00:00 2001 From: Drew Helgerson Date: Tue, 23 Apr 2024 18:23:15 -0500 Subject: [PATCH 06/18] added user option for 12hr clock --- copy.sh | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/copy.sh b/copy.sh index 7b513a9..b8c505b 100755 --- a/copy.sh +++ b/copy.sh @@ -113,6 +113,36 @@ done printf "\n" +# Ask whether 12 or 24hr clock is preffered +while true; do + echo "$ORANGE Do you prefer a 12hr or 24hr clock?" + echo "$YELLOW 1. 12hr clock (AM/PM)" + echo "$YELLOW 2. 24hr clock" + read -p "$CAT Enter the number of your choice: " choice + + case $choice in + 1) + clockformat="12" + break + ;; + 2) + clockformat="24" + break + ;; + *) + echo "Invalid choice. Please enter 1 for 12hr clock or 2 for 24hr" + ;; + esac +done + +# Provide feedback for chosen clock format +echo "You Chose a $clockformat hour clock" 2>&1 | tee -a "$LOG" + +# modify waybar config if 12hr is selected +if [ "$clockformat" == "12" ]; then + sed -i 's/^ \/\/"format": " {:%I:%M %p}"/ "format": " {:%I:%M %p}"/' ./config/waybar/modules + sed -i 's/^ "format": " {:%H:%M:%S}"/ \/\/"format": " {:%H:%M:%S}"/' ./config/waybar/modules + # Action to do for better rofi appearance while true; do echo "$ORANGE Select monitor resolution for better Rofi appearance:" From 0b2abdb3a462cdc4027be75da7db2c673f194838 Mon Sep 17 00:00:00 2001 From: Kiran George Date: Wed, 24 Apr 2024 08:03:30 +0530 Subject: [PATCH 07/18] Added image in hyprlock config and added ping to server before weather curl request is sent --- config/hypr/hyprlock.conf | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/config/hypr/hyprlock.conf b/config/hypr/hyprlock.conf index 6af5d7b..538ae25 100644 --- a/config/hypr/hyprlock.conf +++ b/config/hypr/hyprlock.conf @@ -51,7 +51,7 @@ label { font_size = 34 font_family = JetBrains Mono Nerd Font 10 - position = 0, -100 + position = 0, -150 halign = center valign = top } @@ -64,7 +64,7 @@ label { font_size = 24 font_family = JetBrains Mono Nerd Font 10 - position = 0, -150 + position = 0, -200 halign = center valign = top } @@ -78,7 +78,7 @@ label { font_size = 94 font_family = JetBrains Mono Nerd Font 10 - position = 0, 0 + position = 0, -150 halign = center valign = center } @@ -108,7 +108,7 @@ label { label { monitor = - text = cmd[update:3600000] curl -s 'wttr.in?format=2' # For specific location : wttr.in/busan?format=2 + text = cmd[update:3600000] ping -c 1 wttr.in > /dev/null && curl -s 'wttr.in?format=2' # For specific location : wttr.in/busan?format=2 color = $color10 font_size = 24 font_family = JetBrains Mono Nerd Font 10 @@ -116,3 +116,17 @@ label { halign = left valign = bottom } + +image { + monitor = + path = $HOME/.config/rofi/.current_wallpaper + size = 230 + rounding = -1 + border_size = 4 + border_color = $color12 + rotate = 0 + reload_time = -1 + position = 0, 200 + halign = center + valign = center +} \ No newline at end of file From d9f5d66504336a361cb59ac96591b774288938c4 Mon Sep 17 00:00:00 2001 From: Kiran George Date: Wed, 24 Apr 2024 08:13:03 +0530 Subject: [PATCH 08/18] Updated hypridle to launch hyprlock before sleep to have hyprlock open when waking up from suspend --- config/hypr/hypridle.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/hypr/hypridle.conf b/config/hypr/hypridle.conf index 7b8ce81..549f1b1 100644 --- a/config/hypr/hypridle.conf +++ b/config/hypr/hypridle.conf @@ -6,7 +6,7 @@ general { # lock_cmd = notify-send "lock!" # dbus/sysd lock command (loginctl lock-session) # unlock_cmd = notify-send "unlock!" # same as above, but unlock - # before_sleep_cmd = notify-send "Zzz" # command ran before sleep + before_sleep_cmd = hyprlock # command ran before sleep # after_sleep_cmd = notify-send "Awake!" # command ran after sleep ignore_dbus_inhibit = false # whether to ignore dbus-sent idle-inhibit requests (used by e.g. firefox or steam) } From 2ad64d2efb37bdbb38e8e5b9885978eddc74cf04 Mon Sep 17 00:00:00 2001 From: "Ja.KooLit" Date: Wed, 24 Apr 2024 14:50:22 +0900 Subject: [PATCH 09/18] Update copy.sh changed somethings and added for hyprlock --- copy.sh | 54 +++++++++++++++++++++++++++--------------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/copy.sh b/copy.sh index b8c505b..70fac62 100755 --- a/copy.sh +++ b/copy.sh @@ -113,35 +113,35 @@ done printf "\n" -# Ask whether 12 or 24hr clock is preffered +# Ask whether to change to 12hr format while true; do - echo "$ORANGE Do you prefer a 12hr or 24hr clock?" - echo "$YELLOW 1. 12hr clock (AM/PM)" - echo "$YELLOW 2. 24hr clock" - read -p "$CAT Enter the number of your choice: " choice - - case $choice in - 1) - clockformat="12" - break - ;; - 2) - clockformat="24" - break - ;; - *) - echo "Invalid choice. Please enter 1 for 12hr clock or 2 for 24hr" - ;; - esac -done - -# Provide feedback for chosen clock format -echo "You Chose a $clockformat hour clock" 2>&1 | tee -a "$LOG" + # Ask whether to change to 12hr format + echo -e "$ORANGE By default, configs are in 24H format." + read -p "$CAT Do you want to change to 12H format (AM/PM)? (y/n): " answer + + # Convert the answer to lowercase for comparison + answer=$(echo "$answer" | tr '[:upper:]' '[:lower:]') + + # Check if the answer is valid + if [[ "$answer" == "y" ]]; then + # Modify waybar config if 12hr is selected + # waybar + sed -i 's/^ \/\/"format": " {:%I:%M %p}"/ "format": " {:%I:%M %p}"/' ./config/waybar/modules + sed -i 's/^ "format": " {:%H:%M:%S}"/ \/\/"format": " {:%H:%M:%S}"/' ./config/waybar/modules + # hyprlock + sed -i 's|^ # text = cmd\[update:1000\] echo " $(date +"%I:%M:%S %p") " # AM/PM| text = cmd[update:1000] echo " $(date +"%I:%M:%S %p") <\/big><\/b>" # AM\/PM|' ./config/hypr/hyprlock.conf + sed -i 's|^ text = cmd\[update:1000\] echo " $(date +"%H:%M:%S") " # 24H| # text = cmd[update:1000] echo " $(date +"%H:%M:%S") <\/big><\/b>" # 24H|' ./config/hypr/hyprlock.conf + + break + elif [[ "$answer" == "n" ]]; then + echo "You chose not to change to 12H format." + break + else + echo "Invalid choice. Please enter y for yes or n for no." + fi +done -# modify waybar config if 12hr is selected -if [ "$clockformat" == "12" ]; then - sed -i 's/^ \/\/"format": " {:%I:%M %p}"/ "format": " {:%I:%M %p}"/' ./config/waybar/modules - sed -i 's/^ "format": " {:%H:%M:%S}"/ \/\/"format": " {:%H:%M:%S}"/' ./config/waybar/modules +printf "\n" # Action to do for better rofi appearance while true; do From a631162dd801e2839cbd6f488e78e1a7e9fd207a Mon Sep 17 00:00:00 2001 From: JaKooLit Date: Wed, 24 Apr 2024 14:53:33 +0900 Subject: [PATCH 10/18] minor updated regarding 24H format --- config/hypr/hyprlock.conf | 2 +- copy.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config/hypr/hyprlock.conf b/config/hypr/hyprlock.conf index 538ae25..918e598 100644 --- a/config/hypr/hyprlock.conf +++ b/config/hypr/hyprlock.conf @@ -73,7 +73,7 @@ label { label { monitor = text = cmd[update:1000] echo " $(date +"%H:%M:%S") " # 24H - #text = cmd[update:1000] echo " $(date +"%I:%M:%S %p") " # AM/PM + # text = cmd[update:1000] echo " $(date +"%I:%M:%S %p") " # AM/PM color = $color7 font_size = 94 font_family = JetBrains Mono Nerd Font 10 diff --git a/copy.sh b/copy.sh index 70fac62..44799fc 100755 --- a/copy.sh +++ b/copy.sh @@ -129,7 +129,7 @@ while true; do sed -i 's/^ \/\/"format": " {:%I:%M %p}"/ "format": " {:%I:%M %p}"/' ./config/waybar/modules sed -i 's/^ "format": " {:%H:%M:%S}"/ \/\/"format": " {:%H:%M:%S}"/' ./config/waybar/modules # hyprlock - sed -i 's|^ # text = cmd\[update:1000\] echo " $(date +"%I:%M:%S %p") " # AM/PM| text = cmd[update:1000] echo " $(date +"%I:%M:%S %p") <\/big><\/b>" # AM\/PM|' ./config/hypr/hyprlock.conf + sed -i 's|^ #text = cmd\[update:1000\] echo " $(date +"%I:%M:%S %p") " # AM/PM| text = cmd[update:1000] echo " $(date +"%I:%M:%S %p") <\/big><\/b>" # AM\/PM|' ./config/hypr/hyprlock.conf sed -i 's|^ text = cmd\[update:1000\] echo " $(date +"%H:%M:%S") " # 24H| # text = cmd[update:1000] echo " $(date +"%H:%M:%S") <\/big><\/b>" # 24H|' ./config/hypr/hyprlock.conf break From e25a8a4f487ccb4f68682f4885262152ef955f39 Mon Sep 17 00:00:00 2001 From: JaKooLit Date: Wed, 24 Apr 2024 15:11:20 +0900 Subject: [PATCH 11/18] updated hyprlock.conf --- config/hypr/hyprlock.conf | 4 ++-- copy.sh | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/config/hypr/hyprlock.conf b/config/hypr/hyprlock.conf index 918e598..1e50cbd 100644 --- a/config/hypr/hyprlock.conf +++ b/config/hypr/hyprlock.conf @@ -72,8 +72,8 @@ label { # Time label { monitor = - text = cmd[update:1000] echo " $(date +"%H:%M:%S") " # 24H - # text = cmd[update:1000] echo " $(date +"%I:%M:%S %p") " # AM/PM +# text = cmd[update:1000] echo " $(date +"%I:%M:%S %p") " # AM/PM +text = cmd[update:1000] echo " $(date +"%H:%M:%S") " # 24H color = $color7 font_size = 94 font_family = JetBrains Mono Nerd Font 10 diff --git a/copy.sh b/copy.sh index 44799fc..f03715a 100755 --- a/copy.sh +++ b/copy.sh @@ -128,9 +128,10 @@ while true; do # waybar sed -i 's/^ \/\/"format": " {:%I:%M %p}"/ "format": " {:%I:%M %p}"/' ./config/waybar/modules sed -i 's/^ "format": " {:%H:%M:%S}"/ \/\/"format": " {:%H:%M:%S}"/' ./config/waybar/modules - # hyprlock - sed -i 's|^ #text = cmd\[update:1000\] echo " $(date +"%I:%M:%S %p") " # AM/PM| text = cmd[update:1000] echo " $(date +"%I:%M:%S %p") <\/big><\/b>" # AM\/PM|' ./config/hypr/hyprlock.conf - sed -i 's|^ text = cmd\[update:1000\] echo " $(date +"%H:%M:%S") " # 24H| # text = cmd[update:1000] echo " $(date +"%H:%M:%S") <\/big><\/b>" # 24H|' ./config/hypr/hyprlock.conf + + # for hyprlock + sed -i 's|^# text = cmd\[update:1000\] echo " $(date +"%I:%M:%S %p") " # AM/PM|text = cmd\[update:1000\] echo " $(date +"%I:%M:%S %p") " # AM/PM|' ./config/hypr/hyprlock.conf + sed -i 's|^text = cmd\[update:1000\] echo " $(date +"%H:%M:%S") " # 24H|# text = cmd\[update:1000\] echo " $(date +"%H:%M:%S") " # 24H|' ./config/hypr/hyprlock.conf break elif [[ "$answer" == "n" ]]; then From f1c53081afc0b3d548a50bf41deacce246d153f4 Mon Sep 17 00:00:00 2001 From: JaKooLit Date: Wed, 24 Apr 2024 16:31:21 +0900 Subject: [PATCH 12/18] added for SDDM theme 12H format --- copy.sh | 58 ++++++++++++++++++++++++++++++++------------------------- 1 file changed, 33 insertions(+), 25 deletions(-) diff --git a/copy.sh b/copy.sh index f03715a..d3df387 100755 --- a/copy.sh +++ b/copy.sh @@ -115,32 +115,40 @@ printf "\n" # Ask whether to change to 12hr format while true; do - # Ask whether to change to 12hr format - echo -e "$ORANGE By default, configs are in 24H format." - read -p "$CAT Do you want to change to 12H format (AM/PM)? (y/n): " answer - - # Convert the answer to lowercase for comparison - answer=$(echo "$answer" | tr '[:upper:]' '[:lower:]') - - # Check if the answer is valid - if [[ "$answer" == "y" ]]; then - # Modify waybar config if 12hr is selected - # waybar - sed -i 's/^ \/\/"format": " {:%I:%M %p}"/ "format": " {:%I:%M %p}"/' ./config/waybar/modules - sed -i 's/^ "format": " {:%H:%M:%S}"/ \/\/"format": " {:%H:%M:%S}"/' ./config/waybar/modules - - # for hyprlock - sed -i 's|^# text = cmd\[update:1000\] echo " $(date +"%I:%M:%S %p") " # AM/PM|text = cmd\[update:1000\] echo " $(date +"%I:%M:%S %p") " # AM/PM|' ./config/hypr/hyprlock.conf - sed -i 's|^text = cmd\[update:1000\] echo " $(date +"%H:%M:%S") " # 24H|# text = cmd\[update:1000\] echo " $(date +"%H:%M:%S") " # 24H|' ./config/hypr/hyprlock.conf - - break - elif [[ "$answer" == "n" ]]; then - echo "You chose not to change to 12H format." - break - else - echo "Invalid choice. Please enter y for yes or n for no." + echo -e "$ORANGE By default, configs are in 24H format." + read -p "$CAT Do you want to change to 12H format (AM/PM)? (y/n): " answer + + # Convert the answer to lowercase for comparison + answer=$(echo "$answer" | tr '[:upper:]' '[:lower:]') + + # Check if the answer is valid + if [[ "$answer" == "y" ]]; then + # Modify waybar config if 12hr is selected + sed -i 's/^ \/\/"format": " {:%I:%M %p}"/ "format": " {:%I:%M %p}"/' ./config/waybar/modules + sed -i 's/^ "format": " {:%H:%M:%S}"/ \/\/"format": " {:%H:%M:%S}"/' ./config/waybar/modules + + # for hyprlock + sed -i 's|^# text = cmd\[update:1000\] echo " $(date +"%I:%M:%S %p") " # AM/PM|text = cmd\[update:1000\] echo " $(date +"%I:%M:%S %p") " # AM/PM|' ./config/hypr/hyprlock.conf + sed -i 's|^text = cmd\[update:1000\] echo " $(date +"%H:%M:%S") " # 24H|# text = cmd\[update:1000\] echo " $(date +"%H:%M:%S") " # 24H|' ./config/hypr/hyprlock.conf + + # for SDDM (custom theme) + sddm_folder="/usr/share/sddm/themes/simple-sddm" + if [ -d "$sddm_folder" ]; then + echo "Simple sddm exists. Editing to 12H format" + + sudo sed -i 's|^## HourFormat="hh:mm AP"|HourFormat="hh:mm AP"|' "$sddm_folder/theme.conf" + sudo sed -i 's|^HourFormat="HH:mm"|## HourFormat="HH:mm"|' "$sddm_folder/theme.conf" + + echo "12H format set to SDDM theme successfully." fi -done + break + elif [[ "$answer" == "n" ]]; then + echo "You chose not to change to 12H format." + break + else + echo "Invalid choice. Please enter y for yes or n for no." + fi +done printf "\n" From db00354935a3bdc5170f2d75675b576cbe82635c Mon Sep 17 00:00:00 2001 From: John Titor <50095635+JohnRTitor@users.noreply.github.com> Date: Wed, 24 Apr 2024 15:18:03 +0530 Subject: [PATCH 13/18] wl-logout/layout: change to hyprlock --- config/wlogout/layout | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/config/wlogout/layout b/config/wlogout/layout index c873650..9559fee 100644 --- a/config/wlogout/layout +++ b/config/wlogout/layout @@ -24,13 +24,15 @@ } { "label" : "suspend", - "action" : "swaylock -f && systemctl suspend", + // "action" : "swaylock -f && systemctl suspend", + "action" : "hyprlock --immediate && systemctl suspend", "text" : "Suspend", "keybind" : "u" } { "label" : "hibernate", - "action" : "swaylock -f && systemctl hibernate", + // "action" : "swaylock -f && systemctl hibernate", + "action" : "hyprlock --immediate && systemctl hibernate", "text" : "Hibernate", "keybind" : "h" } \ No newline at end of file From 84c265ff6fbf969ae1c813f80258c834e394ce31 Mon Sep 17 00:00:00 2001 From: John Titor <50095635+JohnRTitor@users.noreply.github.com> Date: Wed, 24 Apr 2024 16:06:32 +0530 Subject: [PATCH 14/18] wl-logout/layout: no need to invoke hyprlock seperately invoking hyprlock before systemctl seem to hang the "process of hibernate/suspend" password needs to be entered then it will invoke systemctl hibernate/suspend so, no need to invoke hyprlock seperately remove comments as wl-logout does not support "comments", it fail to start with comments --- config/wlogout/layout | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/config/wlogout/layout b/config/wlogout/layout index 9559fee..ea46874 100644 --- a/config/wlogout/layout +++ b/config/wlogout/layout @@ -24,15 +24,13 @@ } { "label" : "suspend", - // "action" : "swaylock -f && systemctl suspend", - "action" : "hyprlock --immediate && systemctl suspend", + "action" : "systemctl suspend", "text" : "Suspend", "keybind" : "u" } { "label" : "hibernate", - // "action" : "swaylock -f && systemctl hibernate", - "action" : "hyprlock --immediate && systemctl hibernate", + "action" : "systemctl hibernate", "text" : "Hibernate", "keybind" : "h" } \ No newline at end of file From 699f9cc6148b48d40f48a7ec392023a47fdce3cf Mon Sep 17 00:00:00 2001 From: JaKooLit Date: Thu, 25 Apr 2024 08:50:37 +0900 Subject: [PATCH 15/18] minor update --- config/hypr/UserConfigs/Startup_Apps.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/hypr/UserConfigs/Startup_Apps.conf b/config/hypr/UserConfigs/Startup_Apps.conf index ee387d8..86e40ba 100644 --- a/config/hypr/UserConfigs/Startup_Apps.conf +++ b/config/hypr/UserConfigs/Startup_Apps.conf @@ -35,7 +35,7 @@ exec-once = wl-paste --type image --watch cliphist store exec-once = $UserScripts/RainbowBorders.sh # Starting hypridle to start hyprlock -exec-once = hypridle -q +exec-once = hypridle # Here are list of features available but disabled by default # exec-once = swww query || swww-daemon --format xrgb && swww img $HOME/Pictures/wallpapers/mecha-nostalgia.png # persistent wallpaper From ecab96c3fca247f933b3229b9fdab246a71992b6 Mon Sep 17 00:00:00 2001 From: JaKooLit Date: Thu, 25 Apr 2024 10:29:51 +0900 Subject: [PATCH 16/18] small adjustment on hyprlock --- config/hypr/hyprlock.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/hypr/hyprlock.conf b/config/hypr/hyprlock.conf index 1e50cbd..7e8c184 100644 --- a/config/hypr/hyprlock.conf +++ b/config/hypr/hyprlock.conf @@ -64,7 +64,7 @@ label { font_size = 24 font_family = JetBrains Mono Nerd Font 10 - position = 0, -200 + position = 0, -225 halign = center valign = top } From ea72caef9f39d1ce751ff58806c44b9f138622de Mon Sep 17 00:00:00 2001 From: JaKooLit Date: Thu, 25 Apr 2024 17:19:52 +0900 Subject: [PATCH 17/18] small changes on rofi-beats --- config/hypr/UserScripts/RofiBeats.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/config/hypr/UserScripts/RofiBeats.sh b/config/hypr/UserScripts/RofiBeats.sh index 16777f5..315bcf5 100755 --- a/config/hypr/UserScripts/RofiBeats.sh +++ b/config/hypr/UserScripts/RofiBeats.sh @@ -9,9 +9,11 @@ iDIR="$HOME/.config/swaync/icons" # Define menu options as an associative array declare -A menu_options=( ["Lofi Girl ☕️🎶"]="https://play.streamafrica.net/lofiradio" - ["96.3 Easy Rock 📻🎶"]="https://radio-stations-philippines.com/easy-rock" - ["Ghibli Music 🎻🎶"]="https://youtube.com/playlist?list=PLNi74S754EXbrzw-IzVhpeAaMISNrzfUy&si=rqnXCZU5xoFhxfOl" + ["Easy Rock 96.3 FM 📻🎶"]="https://radio-stations-philippines.com/easy-rock" + ["Wish 107.5 FM 📻🎶"]="https://radio-stations-philippines.com/dwnu-1075-wish" + ["Wish 107.5 YT Pinoy HipHop 🎻🎶"]="https://youtube.com/playlist?list=PLkrzfEDjeYJnmgMYwCKid4XIFqUKBVWEs&si=vahW_noh4UDJ5d37" ["Top Youtube Music 2023 ☕️🎶"]="https://youtube.com/playlist?list=PLDIoUOhQQPlXr63I_vwF9GD8sAKh77dWU&si=y7qNeEVFNgA-XxKy" + ["Wish 107.5 YT Wishclusives ☕️🎶"]="https://youtube.com/playlist?list=PLkrzfEDjeYJn5B22H9HOWP3Kxxs-DkPSM&si=d_Ld2OKhGvpH48WO" ["Chillhop ☕️🎶"]="http://stream.zeno.fm/fyn8eh3h5f8uv" ["SmoothChill ☕️🎶"]="https://media-ssl.musicradio.com/SmoothChill" ["Relaxing Music ☕️🎶"]="https://youtube.com/playlist?list=PLMIbmfP_9vb8BCxRoraJpoo4q1yMFg4CE" From 9f1130e064542df4d8a8125e8a0b40341350c4bc Mon Sep 17 00:00:00 2001 From: JaKooLit Date: Thu, 25 Apr 2024 21:56:32 +0900 Subject: [PATCH 18/18] added firefox (Fedora 40) on windows rules --- config/hypr/UserConfigs/WindowRules.conf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/config/hypr/UserConfigs/WindowRules.conf b/config/hypr/UserConfigs/WindowRules.conf index 6d13c8c..0340293 100644 --- a/config/hypr/UserConfigs/WindowRules.conf +++ b/config/hypr/UserConfigs/WindowRules.conf @@ -23,6 +23,7 @@ windowrule = center,^(pavucontrol) # windowrule v2 windowrulev2 = workspace 1, class:^(thunderbird)$ windowrulev2 = workspace 2, class:^(firefox)$ +windowrulev2 = workspace 2, class:^(org.mozilla.firefox)$ windowrulev2 = workspace 2, class:^(Firefox-esr)$ windowrulev2 = workspace 2, class:^(Microsoft-edge-beta)$ windowrulev2 = workspace 3, class:^([Tt]hunar)$ @@ -39,6 +40,7 @@ windowrulev2 = opacity 0.9 0.6, class:^([Rr]ofi)$ windowrulev2 = opacity 0.9 0.7, class:^(Brave-browser)$ windowrulev2 = opacity 0.9 0.7, class:^(Brave-browser-dev)$ windowrulev2 = opacity 0.9 0.7, class:^(firefox)$ +windowrulev2 = opacity 0.9 0.7, class:^(org.mozilla.firefox)$ windowrulev2 = opacity 0.9 0.7, class:^(Firefox-esr)$ windowrulev2 = opacity 0.9 0.8, class:^([Tt]hunar)$ windowrulev2 = opacity 0.8 0.6, class:^(pcmanfm-qt)$