hyprland: more config

3 files changed, 31 insertions, 33 deletions

diff --git a/.config/git/config b/.config/git/config
index bacf11f..a25976c 100644
--- a/.config/git/config
+++ b/.config/git/config
@@ -15,3 +15,5 @@
 	ds = diff --staged
 [push]
 	autoSetupRemote = true
+[init]
+	defaultBranch = zachster
diff --git a/.config/hypr/hyprland.conf b/.config/hypr/hyprland.conf
index d69bfe5..d731e40 100644
--- a/.config/hypr/hyprland.conf
+++ b/.config/hypr/hyprland.conf
@@ -1,17 +1,3 @@
-
-########################################################################################
-AUTOGENERATED HYPR CONFIG.
-PLEASE USE THE CONFIG PROVIDED IN THE GIT REPO /examples/hypr.conf AND EDIT IT,
-OR EDIT THIS ONE ACCORDING TO THE WIKI INSTRUCTIONS.
-########################################################################################
-
-#
-# Please note not all available settings / options are set here.
-# For a full list, see the wiki
-#
-
-autogenerated = 0 # remove this line to remove the warning
-
 # See https://wiki.hyprland.org/Configuring/Monitors/
 monitor=,preferred,auto,auto
 monitor=DSI-1,preferred,auto,3
@@ -62,7 +48,7 @@ general {
     # See https://wiki.hyprland.org/Configuring/Variables/ for more
 
     gaps_in = 5
-    gaps_out = 5
+    gaps_out = 20
     border_size = 2
     col.active_border = rgba(33ccffee) rgba(00ff99ee) 45deg
     col.inactive_border = rgba(595959aa)
@@ -126,6 +112,7 @@ gestures {
     workspace_swipe_invert = off
     workspace_swipe_forever = on
     #workspace_swipe_direction_lock = on
+    workspace_swipe_numbered = on
 }
 
 misc {
@@ -151,7 +138,7 @@ windowrulev2 = nomaximizerequest, class:.* # You'll probably like this.
 $mainMod = SUPER
 
 # Example binds, see https://wiki.hyprland.org/Configuring/Binds/ for more
-bind = $mainMod, Q, exec, $terminal
+bind = $mainMod, Q, exec, $terminal $terminal_opts
 bind = $mainMod, C, killactive, 
 bind = $mainMod, M, exit, 
 bind = $mainMod, E, exec, $fileManager
@@ -202,24 +189,31 @@ bind = $mainMod, mouse_up, workspace, e-1
 bindm = $mainMod, mouse:272, movewindow
 bindm = $mainMod, mouse:273, resizewindow
 
-#bind = , XF86AudioRaiseVolume, exec, $menu
-bind = , XF86AudioRaiseVolume, exec, hyprctl dispatch submap menu; $menu; hyprctl dispatch submap reset
-bind = , XF86AudioLowerVolume, exec, pkill -SIGRTMIN -f wvkbd-mobintl & pkill -SIGRTMIN suggpicker
-#bind = , XF86AudioLowerVolume, exec, pkill -SIGRTMIN -f wvkbd-mobintl && pkill -SIGRTMIN -f suggpicker
+bindi = , XF86AudioRaiseVolume, exec, $menu
+#bindi = , XF86AudioRaiseVolume, exec, hyprctl dispatch submap menu; $menu; hyprctl dispatch submap reset
+bindi = , XF86AudioLowerVolume, exec, pkill -SIGRTMIN -f wvkbd-mobintl & pkill -SIGRTMIN suggpicker
+# if someone killed the keyboard, restart it
+bindi =, XF86AudioLowerVolume, execr, pgrep $keyboard || $keyboard $keyboard_args
 
 # toggle screen on/off
-bind = , XF86PowerOff, exec, hyprctl -i 0 dispatch dpms $(hyprctl -j -i 0 monitors | jq -r 'first|.dpmsStatus|if . then "off" else "on" end')
-# TODO: disable input on screen off??
+bindli = , XF86PowerOff, exec, hyprctl dispatch dpms $(hyprctl -j monitors | jq -r 'first|.dpmsStatus|if . then "off" else "on" end')
+# disable input on screen off
+bindli = , XF86PowerOff, exec, hyprctl keyword input:touchdevice:enabled $(hyprctl -j getoption input:touchdevice:enabled | jq '.int==0')
+#bind = , XF86PowerOff, exec, $lock
+
 # TODO: lock screen on screen off?
 
 # menu submap
 submap=menu
-binde=,XF86AudioRaiseVolume,exec,wtype -k up
-binde=, XF86AudioLowerVolume,exec,wtype -k down
-bind=,XF86PowerOff, exec, wtype -k return
-# fallback:reset the submap when you release the power button
-bindr=,XF86PowerOff,submap,reset
+bindie=,XF86AudioRaiseVolume,exec,wtype -k up
+bindie=, XF86AudioLowerVolume,exec,wtype -k down
+bindi=,XF86PowerOff, exec, wtype -k return
+# also close the submap when you push the button
+bindi=,XF86PowerOff,submap,reset
 # use shift+escs to go back to the global submap
 bind=SHIFT,escape,submap,reset 
 # will reset the submap, meaning end the current one and return to the global one
 submap=reset
+
+# "fullscreen" for mobile
+bind = $mainMod, F, exec, hyprctl keyword general:gaps_out $(hyprctl -j getoption general:gaps_out 20 | jq 'if .int == 20 then 0 else 20 end')
diff --git a/.config/waybar/config b/.config/waybar/config
index 6ea7b82..0439971 100644
--- a/.config/waybar/config
+++ b/.config/waybar/config
@@ -5,7 +5,7 @@
     // Choose the order of the modules
     "modules-left": ["sway/workspaces", "hyprland/workspaces", "sway/mode",  "hyprland/submap", "sway/scratchpad", "custom/media"],
     "modules-center": [],
-    "modules-right": ["temperature", "network", "battery", "pulseaudio", "tray"],
+    "modules-right": ["clock","backlight", "temperature", "network", "battery", "pulseaudio", "tray"],
     // Modules configuration
     // "sway/workspaces": {
     //     "disable-scroll": true,
@@ -81,7 +81,7 @@
     },
     "clock": {
         // "timezone": "America/New_York",
-        "tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>",
+        "format": "{:%H:%M}",
         "format-alt": "{:%Y-%m-%d}",
         "locale": "C"
     },
@@ -96,8 +96,10 @@
     },
     "backlight": {
         // "device": "acpi_video1",
-        "format": "{percent}% {icon}",
-        "format-icons": ["", "", "", "", "", "", "", "", ""]
+        "format": "{icon} ",
+        "format-alt": "{percent}% {icon} ",
+        "format-icons": ["", "", "", "", "", "", "", "", ""],
+        "on-click": "brightnessctl s $(( ( $(brightnessctl g) + ( $(brightnessctl m) / 8 ) ) % $(brightnessctl m) ))"
     },
     "battery": {
         "states": {
@@ -120,10 +122,10 @@
     "network": {
         // "interface": "wlp2*", // (Optional) To force the use of this interface
         "format-wifi": "{icon} ",
-        "format-ethernet": "{ipaddr}/{cidr} ",
+        "format-ethernet": "{icon} ",
         "tooltip-format": "",
         "format-linked": "{ifname} (No IP) ",
-        "format-disconnected": "Disconnected ⚠",
+        "format-disconnected": "⚠",
         "format-alt": "{signalStrength}% {icon} ",
         "format-icons": ["󰤯","󰤟","󰤢","󰤥","󰤨"]
     },