From 16621bef0e8e3419f82389ba841b97db40a555b1 Mon Sep 17 00:00:00 2001 From: JaKooLit Date: Mon, 1 Jan 2024 15:13:32 +0900 Subject: [PATCH] - Breaking Changes. - Quick Edit script moved to user scripts - I understand some users wants to use other editor - RofiBeats moved to user scripts - This is because users wants their own stations :) - RofiBeats keybinds changed to SUPER SHIFT M keybind - Keybinds to change layout SUPER ALT L - Wlogout Script adjusted with 4K. - Wallpaper Scripts are moved to UserScripts. This is because if users has a different location of wallpapers and also wants a different animations --- config/hypr/UserConfigs/Monitors.conf | 2 +- config/hypr/UserConfigs/Startup_Apps.conf | 2 +- config/hypr/UserScripts/00-Readme | 0 .../{scripts => UserScripts}/QuickEdit.sh | 0 .../{scripts => UserScripts}/RofiBeats.sh | 0 .../{scripts => UserScripts}/Wallpaper.sh | 0 .../WallpaperRandom.sh | 0 .../WallpaperSelect.sh | 0 config/hypr/configs/Keybinds.conf | 19 ++++++++++--------- config/hypr/scripts/KeyHints.sh | 2 +- config/hypr/scripts/Wlogout.sh | 8 ++++---- 11 files changed, 17 insertions(+), 16 deletions(-) mode change 100644 => 100755 config/hypr/UserScripts/00-Readme rename config/hypr/{scripts => UserScripts}/QuickEdit.sh (100%) rename config/hypr/{scripts => UserScripts}/RofiBeats.sh (100%) rename config/hypr/{scripts => UserScripts}/Wallpaper.sh (100%) rename config/hypr/{scripts => UserScripts}/WallpaperRandom.sh (100%) rename config/hypr/{scripts => UserScripts}/WallpaperSelect.sh (100%) diff --git a/config/hypr/UserConfigs/Monitors.conf b/config/hypr/UserConfigs/Monitors.conf index ca2ef0e..3e758c0 100644 --- a/config/hypr/UserConfigs/Monitors.conf +++ b/config/hypr/UserConfigs/Monitors.conf @@ -15,7 +15,7 @@ monitor=,preferred,auto,1 #monitor = eDP-1, preferred, auto, 1 #monitor = eDP-1, 2560x1440@165, 0x0, 1 #own screen -#monitor = DP-2, preferred, auto, 1 +#monitor = DP-3, 1920x1080@240, auto, 1 #monitor = DP-1, preferred, auto, 1 #monitor = HDMI-A-1, preferred,auto,1 diff --git a/config/hypr/UserConfigs/Startup_Apps.conf b/config/hypr/UserConfigs/Startup_Apps.conf index 2aacba4..5ba2dbf 100644 --- a/config/hypr/UserConfigs/Startup_Apps.conf +++ b/config/hypr/UserConfigs/Startup_Apps.conf @@ -4,7 +4,7 @@ $scriptsDir = $HOME/.config/hypr/scripts $UserscriptsDir = $HOME/.config/hypr/UserScripts $lock = $scriptsDir/LockScreen.sh -$SwwwRandom = $scriptsDir/WallpaperRandom.sh +$SwwwRandom = $UserscriptsDir/WallpaperRandom.sh $WallpaperPath = $HOME/Pictures/wallpapers diff --git a/config/hypr/UserScripts/00-Readme b/config/hypr/UserScripts/00-Readme old mode 100644 new mode 100755 diff --git a/config/hypr/scripts/QuickEdit.sh b/config/hypr/UserScripts/QuickEdit.sh similarity index 100% rename from config/hypr/scripts/QuickEdit.sh rename to config/hypr/UserScripts/QuickEdit.sh diff --git a/config/hypr/scripts/RofiBeats.sh b/config/hypr/UserScripts/RofiBeats.sh similarity index 100% rename from config/hypr/scripts/RofiBeats.sh rename to config/hypr/UserScripts/RofiBeats.sh diff --git a/config/hypr/scripts/Wallpaper.sh b/config/hypr/UserScripts/Wallpaper.sh similarity index 100% rename from config/hypr/scripts/Wallpaper.sh rename to config/hypr/UserScripts/Wallpaper.sh diff --git a/config/hypr/scripts/WallpaperRandom.sh b/config/hypr/UserScripts/WallpaperRandom.sh similarity index 100% rename from config/hypr/scripts/WallpaperRandom.sh rename to config/hypr/UserScripts/WallpaperRandom.sh diff --git a/config/hypr/scripts/WallpaperSelect.sh b/config/hypr/UserScripts/WallpaperSelect.sh similarity index 100% rename from config/hypr/scripts/WallpaperSelect.sh rename to config/hypr/UserScripts/WallpaperSelect.sh diff --git a/config/hypr/configs/Keybinds.conf b/config/hypr/configs/Keybinds.conf index 84b78cf..2223bf6 100644 --- a/config/hypr/configs/Keybinds.conf +++ b/config/hypr/configs/Keybinds.conf @@ -3,32 +3,33 @@ $mainMod = SUPER $scriptsDir = $HOME/.config/hypr/scripts +$UserScripts = $HOME/.config/hypr/UserScripts bind = CTRL ALT, Delete, exec, hyprctl dispatch exit 0 +bind = $mainMod, Q, killactive, +bind = $mainMod, F, fullscreen bind = $mainMod SHIFT, Q, closewindow, bind = $mainMod SHIFT, F, togglefloating, bind = $mainMod ALT, F, exec, hyprctl dispatch workspaceopt allfloat -bind = $mainMod, F, fullscreen -bind = $mainMod, Q, killactive, bind = CTRL ALT, L, exec, $scriptsDir/LockScreen.sh bind = CTRL ALT, P, exec, $scriptsDir/Wlogout.sh # FEATURES / EXTRAS +bind = $mainMod, H, exec, $scriptsDir/KeyHints.sh # Small help file bind = $mainMod ALT, R, exec, $scriptsDir/Refresh.sh # Refresh waybar, swaync, rofi -bind = $mainMod CTRL, S, exec, $scriptsDir/RofiBeats.sh # online music bind = $mainMod ALT, E, exec, $scriptsDir/RofiEmoji.sh # emoji -bind = $mainMod, H, exec, $scriptsDir/KeyHints.sh # Small help file -bind = $mainMod, E, exec, $scriptsDir/QuickEdit.sh # Quick Edit Hyprland Settings bind = $mainMod SHIFT, B, exec, $scriptsDir/ChangeBlur.sh # Toggle blur settings bind = $mainMod SHIFT, G, exec, $scriptsDir/GameMode.sh # animations ON/OFF bind = $mainMod ALT, K, exec, $scriptsDir/SwitchKeyboardLayout.sh # Switch Keyboard Layout -bind = $mainMod, Space, exec, $scriptsDir/ChangeLayout.sh # Toggle Master or Dwindle Layout +bind = $mainMod ALT, L, exec, $scriptsDir/ChangeLayout.sh # Toggle Master or Dwindle Layout bind = $mainMod ALT, V, exec, $scriptsDir/ClipManager.sh # Clipboard Manager bind = $mainMod SHIFT, N, exec, swaync-client -t -sw # swayNC panel -# Wallpaper related keybinds -bind = $mainMod, W, exec, $scriptsDir/WallpaperSelect.sh # Select wallpaper to apply -bind = CTRL ALT, W, exec, $scriptsDir/Wallpaper.sh # Random wallpapers +# FEATURES / EXTRAS (UserScripts) +bind = $mainMod, E, exec, $UserScripts/QuickEdit.sh # Quick Edit Hyprland Settings +bind = $mainMod ALT, M, exec, $UserScripts/RofiBeats.sh # online music +bind = $mainMod, W, exec, $UserScripts/WallpaperSelect.sh # Select wallpaper to apply +bind = CTRL ALT, W, exec, $UserScripts/Wallpaper.sh # Random wallpapers # Waybar / Bar related bind = $mainMod, B, exec, killall -SIGUSR1 waybar # Toggle hide/show waybar diff --git a/config/hypr/scripts/KeyHints.sh b/config/hypr/scripts/KeyHints.sh index 180befa..90c9ec4 100755 --- a/config/hypr/scripts/KeyHints.sh +++ b/config/hypr/scripts/KeyHints.sh @@ -57,7 +57,7 @@ yad --width=$dynamic_width --height=$dynamic_height \ "CTRL ALT L" "screen lock" "(swaylock)" \ "CTRL ALT Del" "Hyprland Exit" "(SAVE YOUR WORK!!!)" \ " F" "Fullscreen" "Toggles to full screen" \ -" Spacebar" "Toggle Dwindle | Master Layout" "Hyprland Layout" \ +" ALT L" "Toggle Dwindle | Master Layout" "Hyprland Layout" \ " Shift F" "Toggle float" "single window" \ " ALT F" "Toggle all windows to float" "all windows" \ " Shift B" "Toggle Blur" "normal or less blur" \ diff --git a/config/hypr/scripts/Wlogout.sh b/config/hypr/scripts/Wlogout.sh index 998d3fe..71d2144 100755 --- a/config/hypr/scripts/Wlogout.sh +++ b/config/hypr/scripts/Wlogout.sh @@ -1,8 +1,8 @@ #!/bin/bash # Set variables for parameters -A_2160=2500 -B_2160=2700 +A_2160=500 +B_2160=500 A_1440=500 B_1440=550 A_1080=300 @@ -24,7 +24,7 @@ echo "Detected Resolution: $resolution" # Set parameters based on screen resolution and scaling factor if ((resolution >= 2160)); then - wlogout --protocol layer-shell -b 6 -T $(awk "BEGIN {printf \"%.0f\", $A_2160 * 2160 * $hypr_scale / $resolution}") -B $(awk "BEGIN {printf \"%.0f\", $B_2160 * 2160 * $hypr_scale / $resolution}") & + wlogout --protocol layer-shell -b 3 -T $(awk "BEGIN {printf \"%.0f\", $A_2160 * 2160 * $hypr_scale / $resolution}") -B $(awk "BEGIN {printf \"%.0f\", $B_2160 * 2160 * $hypr_scale / $resolution}") & echo "Setting parameters for resolution >= 2160p" elif ((resolution >= 1440)); then wlogout --protocol layer-shell -b 6 -T $(awk "BEGIN {printf \"%.0f\", $A_1440 * 1440 * $hypr_scale / $resolution}") -B $(awk "BEGIN {printf \"%.0f\", $B_1440 * 1440 * $hypr_scale / $resolution}") & @@ -38,4 +38,4 @@ elif ((resolution > 720)); then else wlogout & echo "Setting default parameters for resolution <= 720p" -fi +fi \ No newline at end of file