Merge pull request #97 from JaKooLit/Development

Development to Main

7 files changed, 73 insertions, 79 deletions

diff --git a/config/btop/btop.conf b/config/btop/btop.conf
index 0c84c891..6dd3a125 100644
--- a/config/btop/btop.conf
+++ b/config/btop/btop.conf
@@ -2,7 +2,7 @@
 
 #* Name of a btop++/bpytop/bashtop formatted ".theme" file, "Default" and "TTY" for builtin themes.
 #* Themes should be placed in "../share/btop/themes" relative to binary or "$HOME/.config/btop/themes"
-color_theme = "catppuccin_macchiato.theme"
+color_theme = "$HOME/.config/btop/themes/catppuccin_macchiato.theme"
 
 #* If the theme set background should be shown, set to False if you want terminal background transparency.
 theme_background = False
@@ -54,7 +54,7 @@ update_ms = 2000
 
 #* Processes sorting, "pid" "program" "arguments" "threads" "user" "memory" "cpu lazy" "cpu direct",
 #* "cpu lazy" sorts top process over time (easier to follow), "cpu direct" updates top process directly.
-proc_sorting = "cpu lazy"
+proc_sorting = "cpu direct"
 
 #* Reverse sorting order, True or False.
 proc_reversed = False
diff --git a/config/hypr/configs/Keybinds.conf b/config/hypr/configs/Keybinds.conf
index cc8d9d42..e9dbbe52 100644
--- a/config/hypr/configs/Keybinds.conf
+++ b/config/hypr/configs/Keybinds.conf
@@ -1,88 +1,81 @@
 ## /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  ##
 
-# See https://wiki.hyprland.org/Configuring/Keywords/ for more
-# Setting variables
-# See laptops.conf 
-
+# See https://wiki.hyprland.org/Configuring/Keywords/ for more settings and variables
+# See also Laptops.conf for laptops keybinds 
 $mainMod = SUPER
 $files = thunar
 $browser = firefox
 $term = kitty
 $scriptsDir = $HOME/.config/hypr/scripts
 
-# Scripts Variables
-$AirplaneMode = $scriptsDir/AirplaneMode.sh
-$Media = $scriptsDir/MediaCtrl.sh
-$screenshot = $scriptsDir/ScreenShot.sh
-$volume = $scriptsDir/Volume.sh
-
-# see https://wiki.hyprland.org/Configuring/Binds/ for more
-# rofi launcher
+# rofi App launcher
 bindr = $mainMod, $mainMod_L, exec, pkill rofi || rofi -show drun -modi drun,filebrowser,run
 bind = $mainMod, D, exec, pkill rofi || rofi -show drun -modi drun,filebrowser,run
 
+bind = $mainMod, Return, exec, $term
 bind = CTRL ALT, Delete, exec, hyprctl dispatch exit 0
-bind = $mainMod SHIFT, R, exec, hyprctl reload
 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 = $mainMod, Return, exec, $term
 bind = $mainMod, T, exec, $files
 bind = CTRL ALT, L, exec, $scriptsDir/LockScreen.sh
 bind = CTRL ALT, P, exec, $scriptsDir/Wlogout.sh
-bind = $mainMod CTRL, S, exec, $scriptsDir/RofiBeats.sh
-bind = $mainMod ALT, E, exec, $scriptsDir/RofiEmoji.sh
+
+# FEATURES
+bind = $mainMod ALT, R, exec, $scriptsDir/Refresh.sh # Refresh waybar, dunst, 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
 bind = $mainMod, E, exec, $scriptsDir/QuickEdit.sh
 bind = $mainMod SHIFT, B, exec, $scriptsDir/ChangeBlur.sh # Toggle blur settings 
-bind = $mainMod SHIFT, G, exec, $scriptsDir/GameMode.sh
+bind = $mainMod SHIFT, G, exec, $scriptsDir/GameMode.sh # animations ON/OFF
+bind = $mainMod ALT, K, exec, $scriptsDir/SwitchKeyboardLayout.sh
+bind = $mainMod, Space, exec, $scriptsDir/ChangeLayout.sh # Toggle Master or Dwindle Layout
+bind = $mainMod ALT, V, exec, $scriptsDir/ClipManager.sh
+
+# MISC (Miscellaneous Keybinds)
+bind = $mainMod SHIFT, O, exec, $scriptsDir/ZshChangeTheme.sh # Change oh-my-zsh theme
+
+# Wallpaper related keybinds
 bind = CTRL ALT, W, exec, $scriptsDir/Wallpaper.sh
 bind = $mainMod, W, exec, $scriptsDir/WallpaperSelect.sh
-bind = $mainMod SHIFT, O, exec, $scriptsDir/ZshChangeTheme.sh # Change oh-my-zsh theme
-bind = $mainMod ALT, K, exec, $scriptsDir/SwitchKeyboardLayout.sh
-bind = $mainMod ALT, R, exec, $scriptsDir/Refresh.sh
 
 # Waybar / Bar related
 bind = $mainMod, B, exec, killall -SIGUSR1 waybar # Toggle hide/show waybar 
 bind = $mainMod CTRL, B, exec, $scriptsDir/WaybarStyles.sh
 bind = $mainMod ALT, B, exec, $scriptsDir/WaybarLayout.sh
 
+# Master Layout
 bind = $mainMod CTRL, D, layoutmsg, removemaster
-bind = $mainMod, Escape, exec, hyprctl kill
 bind = $mainMod, I, layoutmsg, addmaster
 bind = $mainMod, J, layoutmsg, cyclenext
 bind = $mainMod, K, layoutmsg, cycleprev
 bind = $mainMod, M, exec, hyprctl dispatch splitratio 0.3
 bind = $mainMod, P, pseudo, # dwindle
 bind = $mainMod CTRL, Return, layoutmsg, swapwithmaster
-bind = $mainMod, Space, exec, $scriptsDir/ChangeLayout.sh
-bind = $mainMod ALT, V, exec, $scriptsDir/ClipManager.sh
 bind = $mainMod SHIFT, M, exec, hyprctl dispatch splitratio -0.3
 
 # group
 bind = $mainMod, G, togglegroup
-bind = $mainMod, tab, workspace, m+1
-bind = $mainMod SHIFT, tab, workspace, m-1
-bind = ALT, tab, cyclenext,  # change focus to another window  
-bind = ALT SHIFT, tab, bringactivetotop,   # bring it to the top
+bind = ALT, tab, changegroupactive  # change focus to another window  
 
 # Special Keys / Hot Keys
-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, systemctl suspend #FN+F11 (sleep button) 
-bind = , xf86Rfkill, exec, $AirplaneMode #Airplane mode FN+F12
+bind = , xf86audioraisevolume, exec, $scriptsDir/Volume.sh --inc #volume up
+bind = , xf86audiolowervolume, exec, $scriptsDir/Volume.sh --dec #volume down
+bind = , xf86AudioMicMute, exec, $scriptsDir/Volume.sh --toggle-mic #mute mic
+bind = , xf86audiomute, exec, $scriptsDir/Volume.sh --toggle
+bind = , xf86Sleep, exec, systemctl suspend  # sleep button 
+bind = , xf86Rfkill, exec, $scriptsDir/AirplaneMode.sh #Airplane mode
 
 # media controls using keyboards
-bind = , xf86AudioPlayPause, exec, $Media --pause
-bind = , xf86AudioPause, exec, $Media --pause
-bind = , xf86AudioPlay, exec, $Media --pause
-bind = , xf86AudioNext, exec, $Media --nxt
-bind = , xf86AudioPrev, exec, $Media --prv
-bind = , xf86audiostop, exec, $Media --stop
+bind = , xf86AudioPlayPause, exec, $scriptsDir/MediaCtrl.sh --pause
+bind = , xf86AudioPause, exec, $scriptsDir/MediaCtrl.sh --pause
+bind = , xf86AudioPlay, exec, $scriptsDir/MediaCtrl.sh --pause
+bind = , xf86AudioNext, exec, $scriptsDir/MediaCtrl.sh --nxt
+bind = , xf86AudioPrev, exec, $scriptsDir/MediaCtrl.sh --prv
+bind = , xf86audiostop, exec, $scriptsDir/MediaCtrl.sh --stop
 
 # Resize (vim style)
 binde = $mainMod SHIFT, H, resizeactive,-50 0
@@ -112,6 +105,10 @@ bind = $mainMod, right, movefocus, r
 bind = $mainMod, up, movefocus, u
 bind = $mainMod, down, movefocus, d
 
+# Workspaces related
+bind = $mainMod, tab, workspace, m+1
+bind = $mainMod SHIFT, tab, workspace, m-1
+
 # Special workspace
 bind = $mainMod SHIFT, U, movetoworkspace, special
 bind = $mainMod, U, togglespecialworkspace,
@@ -139,7 +136,7 @@ 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, bracketleft, movetoworkspace, -1 # brackets [ or ]
 bind = $mainMod SHIFT, bracketright, movetoworkspace, +1
 
 # Move active window to a workspace with mainMod + SHIFT + [0-9]
@@ -153,7 +150,7 @@ 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, bracketleft, movetoworkspacesilent, -1 # brackets [ or ]
 bind = $mainMod CTRL, bracketright, movetoworkspacesilent, +1
 
 # Scroll through existing workspaces with mainMod + scroll
@@ -166,15 +163,13 @@ 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
-bind = $mainMod CTRL SHIFT, Print, exec, $screenshot --in5
-bind = $mainMod ALT, Print, exec, $screenshot --in10
-#bind = CTRL, Print, exec, $screenshot --win
-#bind = SHIFT, Print, exec, $screenshot --area
-bind = $mainMod SHIFT, Print, exec, $screenshot --area
+#bind = , Print, exec, $scriptsDir/ScreenShot.sh --now
+bind = $mainMod, Print, exec, $scriptsDir/ScreenShot.sh --now
+bind = $mainMod SHIFT, Print, exec, $scriptsDir/ScreenShot.sh --area
+bind = $mainMod CTRL, Print, exec, $scriptsDir/ScreenShot.sh --in5 #screenshot in 5 secs
+bind = $mainMod ALT, Print, exec, $scriptsDir/ScreenShot.sh --in10 #screenshot in 5 secs
+
 
 # screenshot with swappy (another screenshot tool)
 bind = $mainMod SHIFT, S, exec, grim -g "$(slurp)" - | swappy -f -
diff --git a/config/hypr/configs/Laptops.conf b/config/hypr/configs/Laptops.conf
index ee67928e..e071f2c0 100644
--- a/config/hypr/configs/Laptops.conf
+++ b/config/hypr/configs/Laptops.conf
@@ -1,42 +1,32 @@
 ## /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  ##
 
-# See https://wiki.hyprland.org/Configuring/Keywords/ for more
-# Setting variables
-# This configs are mostly for laptops. This is addemdum to Keybinds.conf
-
+# See https://wiki.hyprland.org/Configuring/Keywords/ for more variable settings
+# These configs are mostly for laptops. This is addemdum to Keybinds.conf
 $configs = $HOME/.config/hypr/configs
 $mainMod = SUPER
 $scriptsDir = $HOME/.config/hypr/scripts
 
-# Scripts Variables
-$backlight = $scriptsDir/Brightness.sh
-$kbacklight = $scriptsDir/BrightnessKbd.sh
-$LidSwitch = $scriptsDir/LidSwitch.sh
-
-$screenshot = $scriptsDir/ScreenShot.sh
-$touchpad = $scriptsDir/TouchPad.sh
-
-bind = , xf86KbdBrightnessDown, exec, $kbacklight --dec #Keyboard brightness Down
-bind = , xf86KbdBrightnessUp, exec, $kbacklight --inc #Keyboard brightness up
+bind = , xf86KbdBrightnessDown, exec, $scriptsDir/BrightnessKbd.sh --dec #Keyboard brightness Down
+bind = , xf86KbdBrightnessUp, exec, $scriptsDir/BrightnessKbd.sh --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 
-bind = , xf86MonBrightnessUp, exec, $backlight --inc 
-bind = , xf86TouchpadToggle, exec, $touchpad #disable touchpad
+bind = , xf86MonBrightnessDown, exec, $scriptsDir/Brightness.sh --dec 
+bind = , xf86MonBrightnessUp, exec, $scriptsDir/Brightness.sh --inc 
+bind = , xf86TouchpadToggle, exec, $scriptsDir/TouchPad.sh #disable touchpad
 
 # 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
+bind = $mainMod, F6, exec, $scriptsDir/ScreenShot.sh --now
+bind = $mainMod SHIFT, F6, exec, $scriptsDir/ScreenShot.sh --area
+bind = $mainMod CTRL, F6, exec, $scriptsDir/ScreenShot.sh --in5
+bind = $mainMod ALT, F6, exec, $scriptsDir/ScreenShot.sh --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"
+#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"
 
 #############################################################################
 ### WARNING! Using this method has some caveats!! USE THIS PART WITH SOME CAUTION!
diff --git a/config/waybar/style/Rose Pine.css b/config/waybar/style/Rose Pine.css
index eb4d3f60..f4ba4303 100644
--- a/config/waybar/style/Rose Pine.css
+++ b/config/waybar/style/Rose Pine.css
@@ -156,6 +156,9 @@ tooltip {
   background-color: @red;
 }
 
+#custom-power {
+	padding-right: 1px;
+}
 #group-motherboard,
 #group-laptop,
 #group-audio {
diff --git a/config/waybar/style/[Bordered Pywal] Chroma Fusion Edge.css b/config/waybar/style/[Bordered Pywal] Chroma Fusion Edge.css
index d26c6a28..4c10435e 100644
--- a/config/waybar/style/[Bordered Pywal] Chroma Fusion Edge.css
+++ b/config/waybar/style/[Bordered Pywal] Chroma Fusion Edge.css
@@ -94,14 +94,14 @@ window#waybar.empty #window {
 	background-color: @background-module;
     border-radius: 25px;
     padding: 0px 10px 0px 10px;
-    margin: 3px 3px 3px 3px;
+    margin: 5px 5px 5px 5px;
     opacity:0.8;
     border:2px solid @border-color;
 
 }
 #custom-power {
     color: @red;
-    padding: 0px 4px 0px 8px;
+    padding: 0px 0px 0px 6px;
     opacity:1.0;
 }
 
diff --git a/config/waybar/style/[Colorful] Aurora.css b/config/waybar/style/[Colorful] Aurora.css
index b151b9c4..297be9d0 100644
--- a/config/waybar/style/[Colorful] Aurora.css
+++ b/config/waybar/style/[Colorful] Aurora.css
@@ -113,8 +113,8 @@ tooltip label{
 #custom-light_dark,
 #custom-lock,
 #custom-menu,
-#custom-power_vertical,
 #custom-power,
+#custom-power_vertical,
 #custom-speaker,
 #custom-updater,
 #custom-weather,
@@ -138,6 +138,12 @@ tooltip label{
 	padding-right: 6px;
 	padding-left: 6px;
 }
+
+#custom-power {
+	padding-left: 10px;
+	padding-right: 2px;
+}
+
 /*-----Indicators----*/
 #idle_inhibitor.activated {
 	color: #2dcc36;
diff --git a/config/waybar/style/[Pywal] Chroma Fusion.css b/config/waybar/style/[Pywal] Chroma Fusion.css
index 3a2ddda7..16d8d955 100644
--- a/config/waybar/style/[Pywal] Chroma Fusion.css
+++ b/config/waybar/style/[Pywal] Chroma Fusion.css
@@ -93,12 +93,12 @@ window#waybar.empty #window {
 	background-color: @background-module;
     border-radius: 25px;
     padding: 0px 10px 0px 10px;
-    margin: 3px 3px 3px 3px;
+    margin: 5px 5px 5px 5px;
     opacity:0.8;
 }
 #custom-power {
     color: @red;
-    padding: 0px 4px 0px 8px;
+    padding: 0px 0px 0px 6px;
     opacity:1.0;
 }