Merge pull request #59 from JaKooLit/working-on-it

bump 2.1.18

7 files changed, 68 insertions, 42 deletions

diff --git a/config/hypr/configs/Execs.conf b/config/hypr/configs/Execs.conf
index e4f428b8..545b26fa 100644
--- a/config/hypr/configs/Execs.conf
+++ b/config/hypr/configs/Execs.conf
@@ -22,7 +22,7 @@ exec-once = $scriptsDir/Polkit.sh
 #gnome polkit for nixos
 #exec-once = $scriptsDir/Polkit-NixOS.sh
 
-# Portal Hyprland (should be auto starting. However, you can force to start)
+# xdg-desktop-portal-hyprland (should be auto starting. However, you can force to start)
 #exec-once = $scriptsDir/PortalHyprland.sh
 
 # starup apps
diff --git a/config/hypr/configs/Keybinds.conf b/config/hypr/configs/Keybinds.conf
index 2c4a048c..f264cd7d 100644
--- a/config/hypr/configs/Keybinds.conf
+++ b/config/hypr/configs/Keybinds.conf
@@ -16,8 +16,8 @@ $volume = $scriptsDir/Volume.sh
 
 # see https://wiki.hyprland.org/Configuring/Binds/ for more
 # rofi launcher
-bindr = $mainMod, $mainMod_L, exec, pkill rofi || rofi -show drun -modi drun,filebrowser
-bind = $mainMod, D, exec, pkill rofi || rofi -show drun -modi drun,filebrowser
+bindr = $mainMod, $mainMod_L, exec, pkill rofi || rofi -show drun -modi run,filebrowser,drun
+bind = $mainMod, D, exec, pkill rofi || rofi -show drun -modi run,filebrowser,drun
 
 bind = CTRL ALT, Delete, exec, hyprctl dispatch exit 0
 bind = $mainMod SHIFT, R, exec, hyprctl reload
@@ -41,6 +41,7 @@ bind = CTRL ALT, W, exec, $scriptsDir/Wallpaper.sh
 bind = CTRL, W, exec, $scriptsDir/WaybarStyles.sh
 bind = $mainMod, W, exec, $scriptsDir/WallpaperSelect.sh
 bind = ALT, W, exec, $scriptsDir/WaybarLayout.sh
+bind = ALT, K, exec, $scriptsDir/SwitchKeyboardLayout.sh
 
 bind = $mainMod CTRL, D, layoutmsg, removemaster
 bind = $mainMod, Escape, exec, hyprctl kill
@@ -66,7 +67,7 @@ bind = , xf86audioraisevolume, exec, $volume --inc #volume up
 bind = , xf86audiolowervolume, exec, $volume --dec #volume down
 bind = , xf86AudioMicMute, exec, $volume --toggle-mic #mute mic
 bind = , xf86audiomute, exec, $volume --toggle #FN+F1
-bind = , xf86Sleep, exec, $LockScreen #FN+F11 (sleep button) 
+bind = , xf86Sleep, exec, systemctl suspend #FN+F11 (sleep button) 
 bind = , xf86Rfkill, exec, $AirplaneMode #Airplane mode FN+F12
 
 # media controls using keyboards
@@ -122,32 +123,32 @@ bind = $mainMod, 9, workspace, 9
 bind = $mainMod, 0, workspace, 10
 
 # Move active window and follow to workspace
-bind = $mainMod CTRL, 1, movetoworkspace, 1
-bind = $mainMod CTRL, 2, movetoworkspace, 2
-bind = $mainMod CTRL, 3, movetoworkspace, 3
-bind = $mainMod CTRL, 4, movetoworkspace, 4
-bind = $mainMod CTRL, 5, movetoworkspace, 5
-bind = $mainMod CTRL, 6, movetoworkspace, 6
-bind = $mainMod CTRL, 7, movetoworkspace, 7
-bind = $mainMod CTRL, 8, movetoworkspace, 8
-bind = $mainMod CTRL, 9, movetoworkspace, 9
-bind = $mainMod CTRL, 0, movetoworkspace, 10
-bind = $mainMod CTRL, bracketleft, movetoworkspace, -1
-bind = $mainMod CTRL, bracketright, movetoworkspace, +1
+bind = $mainMod SHIFT, 1, movetoworkspace, 1
+bind = $mainMod SHIFT, 2, movetoworkspace, 2
+bind = $mainMod SHIFT, 3, movetoworkspace, 3
+bind = $mainMod SHIFT, 4, movetoworkspace, 4
+bind = $mainMod SHIFT, 5, movetoworkspace, 5
+bind = $mainMod SHIFT, 6, movetoworkspace, 6
+bind = $mainMod SHIFT, 7, movetoworkspace, 7
+bind = $mainMod SHIFT, 8, movetoworkspace, 8
+bind = $mainMod SHIFT, 9, movetoworkspace, 9
+bind = $mainMod SHIFT, 0, movetoworkspace, 10
+bind = $mainMod SHIFT, bracketleft, movetoworkspace, -1
+bind = $mainMod SHIFT, bracketright, movetoworkspace, +1
 
 # Move active window to a workspace with mainMod + SHIFT + [0-9]
-bind = $mainMod SHIFT, 1, movetoworkspacesilent, 1
-bind = $mainMod SHIFT, 2, movetoworkspacesilent, 2
-bind = $mainMod SHIFT, 3, movetoworkspacesilent, 3
-bind = $mainMod SHIFT, 4, movetoworkspacesilent, 4
-bind = $mainMod SHIFT, 5, movetoworkspacesilent, 5
-bind = $mainMod SHIFT, 6, movetoworkspacesilent, 6
-bind = $mainMod SHIFT, 7, movetoworkspacesilent, 7
-bind = $mainMod SHIFT, 8, movetoworkspacesilent, 8
-bind = $mainMod SHIFT, 9, movetoworkspacesilent, 9
-bind = $mainMod SHIFT, 0, movetoworkspacesilent, 10
-bind = $mainMod SHIFT, bracketleft, movetoworkspacesilent, -1
-bind = $mainMod SHIFT, bracketright, movetoworkspacesilent, +1
+bind = $mainMod CTRL, 1, movetoworkspacesilent, 1
+bind = $mainMod CTRL, 2, movetoworkspacesilent, 2
+bind = $mainMod CTRL, 3, movetoworkspacesilent, 3
+bind = $mainMod CTRL, 4, movetoworkspacesilent, 4
+bind = $mainMod CTRL, 5, movetoworkspacesilent, 5
+bind = $mainMod CTRL, 6, movetoworkspacesilent, 6
+bind = $mainMod CTRL, 7, movetoworkspacesilent, 7
+bind = $mainMod CTRL, 8, movetoworkspacesilent, 8
+bind = $mainMod CTRL, 9, movetoworkspacesilent, 9
+bind = $mainMod CTRL, 0, movetoworkspacesilent, 10
+bind = $mainMod CTRL, bracketleft, movetoworkspacesilent, -1
+bind = $mainMod CTRL, bracketright, movetoworkspacesilent, +1
 
 # Scroll through existing workspaces with mainMod + scroll
 bind = $mainMod, mouse_down, workspace, e+1
@@ -159,6 +160,7 @@ bind = $mainMod, comma, workspace, e-1
 bindm = $mainMod, mouse:272, movewindow
 bindm = $mainMod, mouse:273, resizewindow
 
+
 # Screenshot keybindings NOTE:
 #bind = , Print, exec, $screenshot --now
 bind = $mainMod, Print, exec, $screenshot --now
diff --git a/config/hypr/configs/LaptopDisplay.conf b/config/hypr/configs/LaptopDisplay.conf
new file mode 100644
index 00000000..d50c9119
--- /dev/null
+++ b/config/hypr/configs/LaptopDisplay.conf
@@ -0,0 +1,4 @@
+## NOTE, THIS FILE IS BEING USED by disabling Laptop display monitor behaviour when closing lid.
+## See notes on Laptops.conf
+
+#monitor = eDP-1, preferred, auto, 1
diff --git a/config/hypr/configs/Laptops.conf b/config/hypr/configs/Laptops.conf
index 0b274336..58cdccde 100644
--- a/config/hypr/configs/Laptops.conf
+++ b/config/hypr/configs/Laptops.conf
@@ -2,6 +2,7 @@
 # Setting variables
 # This configs are mostly for laptops. This is addemdum to Keybinds.conf
 
+$configs = $HOME/.config/hypr/configs
 $mainMod = SUPER
 $scriptsDir = $HOME/.config/hypr/scripts
 
@@ -13,25 +14,40 @@ $LidSwitch = $scriptsDir/LidSwitch.sh
 $screenshot = $scriptsDir/ScreenShot.sh
 $touchpad = $scriptsDir/TouchPad.sh
 
-bind = , xf86KbdBrightnessDown, exec, $kbacklight --dec #FN+F2 Keyboard brightness Down
-bind = , xf86KbdBrightnessUp, exec, $kbacklight --inc #FN+F3 Keyboard brightnes up
+bind = , xf86KbdBrightnessDown, exec, $kbacklight --dec #Keyboard brightness Down
+bind = , xf86KbdBrightnessUp, exec, $kbacklight --inc #Keyboard brightness up
 bind = , xf86Launch1, exec, rog-control-center # ASUS Armory crate button
 bind = , xf86Launch3, exec, asusctl led-mode -n #FN+F4 Switch keyboard RGB profile 
 bind = , xf86Launch4, exec, asusctl profile -n  #FN+F5 change of fan profiles (Quite, Balance, Performance)
-bind = , xf86MonBrightnessDown, exec, $backlight --dec #FN+F7
-bind = , xf86MonBrightnessUp, exec, $backlight --inc #FN+F8
-bind = , xf86TouchpadToggle, exec, $touchpad #FN+10 disable touchpad
+bind = , xf86MonBrightnessDown, exec, $backlight --dec 
+bind = , xf86MonBrightnessUp, exec, $backlight --inc 
+bind = , xf86TouchpadToggle, exec, $touchpad #disable touchpad
 
-# triggered when external monitor is connected and closing lid (For Laptop)
-# bindl=,switch:Lid Switch, exec, $LidSwitch 
-# NOTE: (12-Nov-2023) This use to work before but seems below is ok now
+# Screenshot keybindings for Asus G15 (no PrinSrc button)
+bind = $mainMod, F6, exec, $screenshot --now
+bind = $mainMod SHIFT, F6, exec, $screenshot --area
+bind = $mainMod CTRL SHIFT, F6, exec, $screenshot --in5
+bind = $mainMod ALT, F6, exec, $screenshot --in10
+
+# Below are useful when you are connecting your laptop in external display
+# Suggest you edit below for your laptop display
 # From WIKI This is to disable laptop monitor when lid is closed.
 # consult https://wiki.hyprland.org/hyprland-wiki/pages/Configuring/Binds/#switches
 bindl = , switch:off:Lid Switch,exec,hyprctl keyword monitor "eDP-1, preferred, auto, 1"
 bindl = , switch:on:Lid Switch,exec,hyprctl keyword monitor "eDP-1, disable"
 
-# Screenshot keybindings for Asus G15 (no PrinSrc button)
-bind = $mainMod, F6, exec, $screenshot --now
-bind = $mainMod SHIFT, F6, exec, $screenshot --area
-bind = $mainMod CTRL SHIFT, F6, exec, $screenshot --in5
-bind = $mainMod ALT, F6, exec, $screenshot --in10
\ No newline at end of file
+#############################################################################
+### WARNING! Using this method has some caveats!! USE THIS PART WITH SOME CAUTION!
+# CONS of doing this, is that you need to set up your wallpaper (SUPER W) and choose wallpaper.
+# CAVEATS! Sometimes the Main Laptop Monitor DOES NOT have display that it needs to re-connect your external monitor
+# One work around is to ensure that before shutting down laptop, MAKE SURE your laptop lid is OPEN!!
+# Make sure to comment (put # on the both the bindl = , switch ......) above
+# NOTE: Display for laptop are being generated into LaptopDisplay.conf
+# This part is to be use if you do not want your main laptop monitor to wake up during say wallpaper change etc
+
+#bindl = , switch:off:Lid Switch,exec,echo "monitor = eDP-1, preferred, auto, 1" > $configs/LaptopDisplay.conf
+#bindl = , switch:on:Lid Switch,exec,echo "monitor = eDP-1, disable" > $configs/LaptopDisplay.conf
+
+# for laptop-lid action (to erase the last entry)
+#exec-once = echo "eDP-1, preferred, auto, 1" > $HOME/.config/hypr/configs/LaptopDisplay.conf
+##############################################################################
diff --git a/config/hypr/configs/Monitors.conf b/config/hypr/configs/Monitors.conf
index b8ea829d..6481942b 100644
--- a/config/hypr/configs/Monitors.conf
+++ b/config/hypr/configs/Monitors.conf
@@ -11,7 +11,10 @@ xwayland {
 # Monitors
 monitor=,preferred,auto,1
 
-# my G15 Laptop
+# 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
+
 #monitor = eDP-1, preferred, auto, 1
 #monitor = eDP-1, 2560x1440@165, 0x0, 1 #own screen
 #monitor = DP-2, preferred, auto, 1 
diff --git a/config/hypr/hyprland.conf b/config/hypr/hyprland.conf
index 65f0b83b..c09e6f75 100644
--- a/config/hypr/hyprland.conf
+++ b/config/hypr/hyprland.conf
@@ -5,6 +5,7 @@ source=$configs/ENVariables.conf
 source=$configs/Execs.conf
 source=$configs/Keybinds.conf
 source=$configs/Laptops.conf
+source=$configs/LaptopDisplay.conf
 source=$configs/Monitors.conf
 source=$configs/WindowRules.conf
 source=$configs/Settings.conf
diff --git a/config/hypr/v2.1.17 b/config/hypr/v2.1.18
index 31b3414d..31b3414d 100644
--- a/config/hypr/v2.1.17
+++ b/config/hypr/v2.1.18