Merge remote-tracking branch 'origin/master' into mac

8 files changed, 31 insertions, 13 deletions

diff --git a/gtk-2.0/gtkrc b/gtk-2.0/gtkrc
index f569e9b..42f1844 100644
--- a/gtk-2.0/gtkrc
+++ b/gtk-2.0/gtkrc
@@ -3,7 +3,7 @@
 
 include "/home/zachir/.gtkrc-2.0.mine"
 gtk-theme-name="Flat-Remix-GTK-Green-Darkest"
-gtk-icon-theme-name="ePapirus-Dark"
+gtk-icon-theme-name="Papirus-Dark"
 gtk-font-name="Noto Sans,  10"
 gtk-cursor-theme-name="BreezeX-Black"
 gtk-cursor-theme-size=32
diff --git a/gtk-3.0/settings.ini b/gtk-3.0/settings.ini
index 310ac7b..809e192 100644
--- a/gtk-3.0/settings.ini
+++ b/gtk-3.0/settings.ini
@@ -1,6 +1,6 @@
 [Settings]
 gtk-theme-name=Flat-Remix-GTK-Green-Darkest
-gtk-icon-theme-name=ePapirus-Dark
+gtk-icon-theme-name=Papirus-Dark
 gtk-font-name=Noto Sans,  10
 gtk-cursor-theme-name=BreezeX-Black
 gtk-cursor-theme-size=32
diff --git a/hypr/hyprland.conf b/hypr/hyprland.conf
index 0547c21..6c32a42 100644
--- a/hypr/hyprland.conf
+++ b/hypr/hyprland.conf
@@ -1,10 +1,18 @@
 # See https://wiki.hyprland.org/Configuring/Monitors/
 #{{{ Monitor config
+#monitor = DP-2, 1920x1080@75, 0x0, 1
+#monitor = HDMI-A-1, 1920x1080@75, 1920x0, 1
+#monitor = eDP-1, 1920x1080@60, 0x0, 1
 monitor = , preferred, auto, 1
 #}}}
 
 # See https://wiki.hyprland.org/Configuring/Keywords/ for more
 
+#{{{ Plugins
+plugin = /var/cache/hyprpm/zachir/hyprland-plugins/hyprscrolling.so
+plugin = /var/cache/hyprpm/zachir/hyprsplit/hyprsplit.so
+#}}}
+
 #{{{ Autostart
 # Execute your favorite apps at launch
 # exec-once = waybar & hyprpaper & firefox
@@ -16,8 +24,8 @@ exec-once = waybar
 exec-once = pypr
 exec-once = hyprscratch init
 exec-once = lxqt-policykit-agent
-exec-once = import-gsettings gtk-theme 'Flat-Remix-GTK-Green-Darkest-Solid'
-exec-once = import-gsettings icon-theme 'COSMIC'
+exec-once = import-gsettings gtk-theme 'Flat-Remix-GTK-Green-Darkest'
+exec-once = import-gsettings icon-theme 'Papirus-Dark'
 exec-once = import-gsettings cursor-theme 'BreezeX-Black'
 exec-once = gsettings set org.gnome.desktop.interface color-scheme 'prefer-dark'
 exec-once = xrdb -load "$XDG_CONFIG_HOME"/X11/xresources
@@ -210,6 +218,10 @@ windowrulev2 = workspace special:easyeffects silent, class: ^(com\.github\.wwmm\
 windowrulev2 = xray 0, class: ^(\s*), title: ^(\s*)$
 #}}}
 
+#{{{ Layerrules
+layerrule = blur, waybar
+#}}}
+
 #{{{ Mods
 # See https://wiki.hyprland.org/Configuring/Keywords/ for more
 $mainMod = SUPER
@@ -244,6 +256,8 @@ bind = $mainMod+SHIFT, H, layoutmsg, movewindowto l #HYPRSCROLLING
 bind = $mainMod+SHIFT, J, layoutmsg, movewindowto d #HYPRSCROLLING
 bind = $mainMod+SHIFT, K, layoutmsg, movewindowto u #HYPRSCROLLING
 bind = $mainMod+SHIFT, L, layoutmsg, movewindowto r #HYPRSCROLLING
+bind = $mainMod+CONTROL, H, exec, hyprswap.sh -l
+bind = $mainMod+CONTROL, L, exec, hyprswap.sh -r
 #bind = $mainMod+SHIFT, H, movewindow, l #HYPRSCROLLING
 #bind = $mainMod+SHIFT, L, movewindow, r #HYPRSCROLLING
 #bind = $mainMod+SHIFT, K, movewindow, u #HYPRSCROLLING
diff --git a/scroll/config b/scroll/config
index 889da2e..c6bb704 100644
--- a/scroll/config
+++ b/scroll/config
@@ -230,7 +230,7 @@ animations {
 
     # Overview
     bindsym --no-repeat $mod+tab scale_workspace overview
-    bindsym --whole-window button8 scale_workspace overview
+    #bindsym --whole-window button8 scale_workspace overview
 
     # Jump
     # jump_labels_color #9e1530FF
diff --git a/scroll/scripts/scratchpad.lua b/scroll/scripts/scratchpad.lua
index e581cc1..0afaa97 100644
--- a/scroll/scripts/scratchpad.lua
+++ b/scroll/scripts/scratchpad.lua
@@ -24,18 +24,18 @@ end
 command = command or "kitty"
 
 local function exists(id)
-  local is_in_array = false
+  local is_in_scratchpad = false
   local cons = scroll.scratchpad_get_containers()
   for _, con in ipairs(cons) do
     local views = scroll.container_get_views(con)
     for _, view in ipairs(views) do
       local app_id = scroll.view_get_app_id(view)
       if (app_id == id) then
-        is_in_array = true
+        is_in_scratchpad = true
       end
     end
   end
-  return is_in_array
+  return is_in_scratchpad
 end
 
 local function is_focused(id)
diff --git a/waybar/config b/waybar/config
index 933dedc..9a60dba 100644
--- a/waybar/config
+++ b/waybar/config
@@ -157,7 +157,7 @@
         "tooltip": false
     },
     "memory": {
-        "format": "{}% "
+        "format": "{used}G "
     },
     "battery": {
         "bat": "BAT0",
@@ -192,7 +192,7 @@
     },
     "network": {
         // "interface": "wlp2*", // (Optional) To force the use of this interface
-        "format-wifi": "{essid} ({signalStrength}%) ",
+        "format-wifi": "{essid} ",
         "format-ethernet": "Connected  ",
         "tooltip-format": "{ifname} via {gwaddr} ",
         "format-linked": "{ifname} (No IP) ",
@@ -223,7 +223,7 @@
     },
     "custom/power":{
         "format": "",
-        "on-click": "rofi -show p -modi p:rofi-power-menu",
+        "on-click": "power-menu",
         //"on-click-right": "killall rofi"
     },
     "custom/snip":{
diff --git a/waybar/style.css b/waybar/style.css
index 6ecb923..599e6af 100644
--- a/waybar/style.css
+++ b/waybar/style.css
@@ -160,11 +160,13 @@ label:focus {
 #cpu {
     background-color: #1b1d1c;
     color: #ffffff;
+    padding-right: 18px;
 }
 
 #memory {
     background-color: #198844;
     color: #ffffff;
+    padding-right: 18px;
 }
 
 #disk {
@@ -180,6 +182,7 @@ label:focus {
 #network {
     background-color: #198844;
     color: #ffffff;
+    padding-right: 18px;
 }
 
 #network.disconnected {
@@ -190,6 +193,7 @@ label:focus {
 #wireplumber {
     background-color: #198844;
     color: #ffffff;
+    padding-right: 18px;
 }
 
 #wireplumber.muted {
@@ -323,7 +327,7 @@ label:focus {
 #idle_inhibitor {
     background-color: #1b1d1c;
     border-radius: 20px 0px 0px 20px;
-
+    padding-right: 18px;
 }
 
 #idle_inhibitor.activated {
diff --git a/xsettingsd/xsettingsd.conf b/xsettingsd/xsettingsd.conf
index 47a327b..7e001eb 100644
--- a/xsettingsd/xsettingsd.conf
+++ b/xsettingsd/xsettingsd.conf
@@ -1,5 +1,5 @@
 Net/ThemeName "Flat-Remix-GTK-Green-Darkest"
-Net/IconThemeName "ePapirus-Dark"
+Net/IconThemeName "Papirus-Dark"
 Gtk/CursorThemeName "BreezeX-Black"
 Net/EnableEventSounds 1
 EnableInputFeedbackSounds 0