From 35416061aab2cadcfd604105c9f059c26c864453 Mon Sep 17 00:00:00 2001
From: ZachIR <zachir@librem.one>
Date: Wed, 23 Jul 2025 22:11:32 -0500
Subject: Change custom widget symbols

---
 waybar/config | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'waybar')

diff --git a/waybar/config b/waybar/config
index 77f7386..26b3f75 100644
--- a/waybar/config
+++ b/waybar/config
@@ -144,12 +144,12 @@
         "scroll-step": 0.1
     },
     "custom/launcher":{
-        "format": "",
+        "format": ">",
         "on-click": "rofi -show drun",
         //"on-click-right": "killall rofi"
     },
     "custom/power":{
-        "format": "  ",
+        "format": "",
         "on-click": "rofi -show p -modi p:rofi-power-menu",
         //"on-click-right": "killall rofi"
     },
-- 
cgit v1.2.3


From 745fcd626acd258fada028be53a2613526c737d5 Mon Sep 17 00:00:00 2001
From: zachir <zachir@librem.one>
Date: Fri, 25 Jul 2025 18:56:17 -0500
Subject: Add waybar config for niri

---
 waybar/config-niri | 161 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 161 insertions(+)
 create mode 100644 waybar/config-niri

(limited to 'waybar')

diff --git a/waybar/config-niri b/waybar/config-niri
new file mode 100644
index 0000000..9b36e8e
--- /dev/null
+++ b/waybar/config-niri
@@ -0,0 +1,161 @@
+{
+    "layer": "bottom",
+    "position": "top",
+    "height": 36,
+    //"output": "%%DISPLAY%%",
+    "spacing": 4,
+    //"margin-top": 5,
+    //"margin-bottom":5,
+
+    // Choose the order of the modules
+
+    "modules-left":[ "niri/workspaces", "custom/launcher", "niri/window"],
+    "modules-center":[],
+    "modules-right":[ "tray", "mpd", "idle_inhibitor", "wireplumber", "cpu", "memory", "battery", "temperature#cpu", "temperature#gpu", "backlight",  "network", "clock", "custom/power"],
+
+    // Modules configuration
+
+    "hyprland/workspaces": {
+      "format": "{icon}",
+      "active-only": false,
+      "all-outputs": false,
+      "format-icons": {
+        "1": "1",
+        "2": "2",
+        "3": "3",
+        "4": "4",
+        "5": "5",
+        "6": "6",
+        "7": "7",
+        "8": "8",
+        "9": "9",
+        "10": "1",
+        "11": "2",
+        "12": "3",
+        "13": "4",
+        "14": "5",
+        "15": "6",
+        "16": "7",
+        "17": "8",
+        "18": "9",
+      },
+      "persistent-workspaces": {
+        "eDP-1": [ 1, 2, 3, 4, 5, 6, 7, 8, 9 ],
+      },
+      "on-scroll-up": "hyprctl dispatch split-workspace e+1",
+      "on-scroll-down": "hyprctl dispatch split-workspace e-1",
+      "on-click": "activate"
+    },
+    "hyprland/window": {
+      "separate-outputs": true,
+      "format": "{}"
+    },
+    "keyboard-state": {
+        "numlock": true,
+        "capslock": true,
+        "format": " {name} {icon}",
+        "format-icons": {
+            "locked": "",
+            "unlocked": ""
+        }
+    },
+    "mpd": {
+      "format": "{title}",
+      "format-stopped": "",
+      "format-paused": "{title}",
+      "format-disconnected": "",
+      "artist-len": 15,
+      "title-len": 15,
+      //"album-len": 15,
+      //"max-length": 200,
+      "on-click": "mpc toggle"
+    },
+    "idle_inhibitor": {
+        "format": "{icon}",
+        "format-icons": {
+            "activated": "",
+            "deactivated": ""
+        }
+    },
+    "tray": {
+        "icon-size": 20,
+        "spacing": 10
+    },
+    "clock": {
+        // "timezone": "America/New_York",
+        "tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>",
+        "format-alt": "{:%Y-%m-%d}"
+    },
+    "cpu": {
+        "format": "{usage}% ",
+        "tooltip": false
+    },
+    "memory": {
+        "format": "{}% "
+    },
+    "battery": {
+        //"bat": "BAT0",
+        "weighted-average": "true",
+        "interval": 60,
+        "state": {
+            "warning": 30,
+            "critical": 15
+        },
+        "format": "{capacity}%",
+        "max-length": 25
+    },
+    "temperature#cpu": {
+        "thermal-zone": 0,
+        // "hwmon-path": "cat /sys/class/hwmon/hwmon5/temp1_input",
+        "critical-threshold": 110,
+        "format-critical": "{temperatureC}°C",
+        "format": "",
+        "format-icons": ["", "", ""]
+    },
+    "temperature#gpu": {
+        "thermal-zone": 1,
+        // "hwmon-path": "/sys/class/hwmon/hwmon4/temp1_input",
+        "critical-threshold": 126,
+        "format-critical": "{temperatureC}°C",
+        "format": "",
+        "format-icons": ["", "", ""]
+    },
+    "backlight": {
+        // "device": "acpi_video1",
+        "format": "{percent}%"
+        //"format-icons": ["", ""]
+    },
+    "network": {
+        // "interface": "wlp2*", // (Optional) To force the use of this interface
+        "format-wifi": "{essid} ",
+        "format-ethernet": "Connected  ",
+        "tooltip-format": "{ifname} via {gwaddr} ",
+        "format-linked": "{ifname} (No IP) ",
+        "format-disconnected": "Disconnected ⚠",
+        "format-alt": "{ifname}: {ipaddr}/{cidr}",
+        "max-length": 22,
+        "on-click-right": "bash ~/.config/rofi/wifi_menu/rofi_wifi_menu"
+    },
+    "wireplumber": {
+        // "scroll-step": 1, // %, can be a float
+        "format": "{volume}% {icon}",
+        "format-muted": "{volume}% ",
+        "format-icons": ["", "", ""],
+        "on-click": "volsv -t",
+        "scroll-step": 0.1
+    },
+    "custom/launcher":{
+        "format": ">",
+        "on-click": "rofi -show drun",
+        //"on-click-right": "killall rofi"
+    },
+    "custom/power":{
+        "format": "",
+        "on-click": "rofi -show p -modi p:rofi-power-menu",
+        //"on-click-right": "killall rofi"
+    },
+    "custom/snip":{
+        "format": " ",
+        "on-click": "grimshot --notify save area $HOME/Pictures/$(zenity --entry --text 'Set filename:' --entry-text '.png')"
+    }
+}
-- 
cgit v1.2.3


From 983c7b685b8ba20fe8e22ef719388ce36aaa0259 Mon Sep 17 00:00:00 2001
From: zachir <zachir@librem.one>
Date: Fri, 25 Jul 2025 19:30:31 -0500
Subject: Make niri and hyprland the same waybar config

---
 waybar/config      |  15 ++++-
 waybar/config-niri | 161 -----------------------------------------------------
 2 files changed, 14 insertions(+), 162 deletions(-)
 delete mode 100644 waybar/config-niri

(limited to 'waybar')

diff --git a/waybar/config b/waybar/config
index 26b3f75..cc06bb7 100644
--- a/waybar/config
+++ b/waybar/config
@@ -15,6 +15,11 @@
 
     // Modules configuration
 
+    "niri/workspaces": {
+      "format": "{value}",
+      "all-outputs": false,
+      "on-click": "activate"
+    },
     "hyprland/workspaces": {
       "format": "{icon}",
       "active-only": false,
@@ -46,9 +51,17 @@
       "on-scroll-down": "hyprctl dispatch split-workspace e-1",
       "on-click": "activate"
     },
+    "niri/window": {
+      "separate-outputs": true,
+      "icon": true,
+      "format": "{title}",
+      "expand": true
+    },
     "hyprland/window": {
       "separate-outputs": true,
-      "format": "{}"
+      "icon": true,
+      "format": "{title}",
+      "espand": true,
     },
     "keyboard-state": {
         "numlock": true,
diff --git a/waybar/config-niri b/waybar/config-niri
deleted file mode 100644
index 9b36e8e..0000000
--- a/waybar/config-niri
+++ /dev/null
@@ -1,161 +0,0 @@
-{
-    "layer": "bottom",
-    "position": "top",
-    "height": 36,
-    //"output": "%%DISPLAY%%",
-    "spacing": 4,
-    //"margin-top": 5,
-    //"margin-bottom":5,
-
-    // Choose the order of the modules
-
-    "modules-left":[ "niri/workspaces", "custom/launcher", "niri/window"],
-    "modules-center":[],
-    "modules-right":[ "tray", "mpd", "idle_inhibitor", "wireplumber", "cpu", "memory", "battery", "temperature#cpu", "temperature#gpu", "backlight",  "network", "clock", "custom/power"],
-
-    // Modules configuration
-
-    "hyprland/workspaces": {
-      "format": "{icon}",
-      "active-only": false,
-      "all-outputs": false,
-      "format-icons": {
-        "1": "1",
-        "2": "2",
-        "3": "3",
-        "4": "4",
-        "5": "5",
-        "6": "6",
-        "7": "7",
-        "8": "8",
-        "9": "9",
-        "10": "1",
-        "11": "2",
-        "12": "3",
-        "13": "4",
-        "14": "5",
-        "15": "6",
-        "16": "7",
-        "17": "8",
-        "18": "9",
-      },
-      "persistent-workspaces": {
-        "eDP-1": [ 1, 2, 3, 4, 5, 6, 7, 8, 9 ],
-      },
-      "on-scroll-up": "hyprctl dispatch split-workspace e+1",
-      "on-scroll-down": "hyprctl dispatch split-workspace e-1",
-      "on-click": "activate"
-    },
-    "hyprland/window": {
-      "separate-outputs": true,
-      "format": "{}"
-    },
-    "keyboard-state": {
-        "numlock": true,
-        "capslock": true,
-        "format": " {name} {icon}",
-        "format-icons": {
-            "locked": "",
-            "unlocked": ""
-        }
-    },
-    "mpd": {
-      "format": "{title}",
-      "format-stopped": "",
-      "format-paused": "{title}",
-      "format-disconnected": "",
-      "artist-len": 15,
-      "title-len": 15,
-      //"album-len": 15,
-      //"max-length": 200,
-      "on-click": "mpc toggle"
-    },
-    "idle_inhibitor": {
-        "format": "{icon}",
-        "format-icons": {
-            "activated": "",
-            "deactivated": ""
-        }
-    },
-    "tray": {
-        "icon-size": 20,
-        "spacing": 10
-    },
-    "clock": {
-        // "timezone": "America/New_York",
-        "tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>",
-        "format-alt": "{:%Y-%m-%d}"
-    },
-    "cpu": {
-        "format": "{usage}% ",
-        "tooltip": false
-    },
-    "memory": {
-        "format": "{}% "
-    },
-    "battery": {
-        //"bat": "BAT0",
-        "weighted-average": "true",
-        "interval": 60,
-        "state": {
-            "warning": 30,
-            "critical": 15
-        },
-        "format": "{capacity}%",
-        "max-length": 25
-    },
-    "temperature#cpu": {
-        "thermal-zone": 0,
-        // "hwmon-path": "cat /sys/class/hwmon/hwmon5/temp1_input",
-        "critical-threshold": 110,
-        "format-critical": "{temperatureC}°C",
-        "format": "",
-        "format-icons": ["", "", ""]
-    },
-    "temperature#gpu": {
-        "thermal-zone": 1,
-        // "hwmon-path": "/sys/class/hwmon/hwmon4/temp1_input",
-        "critical-threshold": 126,
-        "format-critical": "{temperatureC}°C",
-        "format": "",
-        "format-icons": ["", "", ""]
-    },
-    "backlight": {
-        // "device": "acpi_video1",
-        "format": "{percent}%"
-        //"format-icons": ["", ""]
-    },
-    "network": {
-        // "interface": "wlp2*", // (Optional) To force the use of this interface
-        "format-wifi": "{essid} ",
-        "format-ethernet": "Connected  ",
-        "tooltip-format": "{ifname} via {gwaddr} ",
-        "format-linked": "{ifname} (No IP) ",
-        "format-disconnected": "Disconnected ⚠",
-        "format-alt": "{ifname}: {ipaddr}/{cidr}",
-        "max-length": 22,
-        "on-click-right": "bash ~/.config/rofi/wifi_menu/rofi_wifi_menu"
-    },
-    "wireplumber": {
-        // "scroll-step": 1, // %, can be a float
-        "format": "{volume}% {icon}",
-        "format-muted": "{volume}% ",
-        "format-icons": ["", "", ""],
-        "on-click": "volsv -t",
-        "scroll-step": 0.1
-    },
-    "custom/launcher":{
-        "format": ">",
-        "on-click": "rofi -show drun",
-        //"on-click-right": "killall rofi"
-    },
-    "custom/power":{
-        "format": "",
-        "on-click": "rofi -show p -modi p:rofi-power-menu",
-        //"on-click-right": "killall rofi"
-    },
-    "custom/snip":{
-        "format": " ",
-        "on-click": "grimshot --notify save area $HOME/Pictures/$(zenity --entry --text 'Set filename:' --entry-text '.png')"
-    }
-}
-- 
cgit v1.2.3


From 5580dc2a23376198ebbcdf7156e1ad285158e4ba Mon Sep 17 00:00:00 2001
From: zachir <zachir@librem.one>
Date: Fri, 25 Jul 2025 19:30:48 -0500
Subject: Make launcher prompt >_

---
 waybar/config | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'waybar')

diff --git a/waybar/config b/waybar/config
index cc06bb7..313aed7 100644
--- a/waybar/config
+++ b/waybar/config
@@ -157,7 +157,7 @@
         "scroll-step": 0.1
     },
     "custom/launcher":{
-        "format": ">",
+        "format": ">_",
         "on-click": "rofi -show drun",
         //"on-click-right": "killall rofi"
     },
-- 
cgit v1.2.3


From 0cbbcd5764bedfc0a583d204eb935587a94740b4 Mon Sep 17 00:00:00 2001
From: ZachIR <zachir@librem.one>
Date: Fri, 25 Jul 2025 23:49:27 -0500
Subject: Add background behind tray in waybar

---
 waybar/style.css | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'waybar')

diff --git a/waybar/style.css b/waybar/style.css
index fefb890..59f741f 100644
--- a/waybar/style.css
+++ b/waybar/style.css
@@ -278,7 +278,8 @@ label:focus {
 }
 
 #tray {
-    background-color: transparent;
+    border-radius: 20px;
+    background-color: black;
     color: #ffffff;
 }
 
-- 
cgit v1.2.3


From ff8f57ea7ac4d850adcb3e2ab0bc625bd9552222 Mon Sep 17 00:00:00 2001
From: ZachIR <zachir@librem.one>
Date: Sat, 26 Jul 2025 11:19:47 -0500
Subject: Add configs to use scroll

---
 scroll/config    | 516 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 waybar/config    |  21 +++
 waybar/style.css |   4 +
 3 files changed, 541 insertions(+)
 create mode 100644 scroll/config

(limited to 'waybar')

diff --git a/scroll/config b/scroll/config
new file mode 100644
index 0000000..c715eed
--- /dev/null
+++ b/scroll/config
@@ -0,0 +1,516 @@
+# vim: ft=swayconfig
+#
+# Default config for scroll
+#
+# Copy this to ~/.config/scroll/config and edit it to your liking.
+#
+# Read `man 5 scroll` for a complete reference.
+
+### Variables
+#
+# Logo key. Use Mod1 for Alt.
+set $mod Mod4
+# Home row direction keys, like vim
+set $left Left
+set $down Down
+set $up Up
+set $right Right
+# Your preferred terminal emulator
+set $term kitty
+# Your preferred application launcher
+set $rmenu tofi-drun --drun-launch=true -c ~/.config/tofi/themes/dmenu_vertical
+set $dmenu dmenu_run -l 15
+# Your preferred file manager
+set $filemanager kitty -e lf
+
+bar mode invisible
+exec waybar
+exec hypridle
+exec hyprpaper
+
+### Output configuration
+#
+# Default wallpaper (more resolutions are available in /usr/share/backgrounds/scroll/)
+# output * bg /usr/share/backgrounds/scroll/Sway_Wallpaper_Blue_1920x1080.png fill
+#
+# Example configuration:
+#
+#   output HDMI-A-1 resolution 1920x1080 position 1920,0
+#
+# You can get the names of your outputs by running: scrollmsg -t get_outputs
+
+### Idle configuration
+#
+# Example configuration:
+#
+# exec swayidle -w \
+#          timeout 300 'swaylock -f -c 000000' \
+#          timeout 600 'scrollmsg "output * power off"' resume 'scrollmsg "output * power on"' \
+#          before-sleep 'swaylock -f -c 000000'
+#
+# This will lock your screen after 300 seconds of inactivity, then turn off
+# your displays after another 300 seconds, and turn your screens back on when
+# resumed. It will also lock your screen before your computer goes to sleep.
+
+### Input configuration
+#
+# Example configuration:
+#
+#   input type:touchpad {
+#       dwt enabled
+#       tap enabled
+#       natural_scroll enabled
+#       middle_emulation enabled
+#   }
+#
+#   input type:keyboard {
+#       xkb_layout "eu"
+#   }
+#
+# You can also configure each device individually.
+# Read `man 5 scroll-input` for more information about this section.
+
+### Windows defaults
+default_border pixel 2
+gaps inner 4
+gaps outer 20
+client.focused #15439e #000000 #e0e0e0 #2e9ef4 #15439e
+client.focused_inactive #595959 #000000 #e0e0e0 #2e9ef4 #595959
+client.unfocused #595959 #000000 #e0e0e0 #2e9ef4 #595959
+
+# Idle inhibit for fullscreen windows
+for_window [all] inhibit_idle fullscreen
+
+# Layout settings
+layout_default_width 0.5
+layout_default_height 1.0
+layout_widths [0.33333333 0.5 0.666666667 1.0]
+layout_heights [0.33333333 0.5 0.666666667 1.0]
+
+fullscreen_movefocus true
+
+mouse_warping container
+
+# Animations
+animations {
+    enabled yes
+    default yes 300 var 3 [ 0.215 0.61 0.355 1 ]
+    window_open yes 300 var 3 [ 0 0 1 1 ]
+    window_move yes 300 var 3 [ 0.215 0.61 0.355 1 ] off 0.05 6 [0 0.6 0.4 0 1 0 0.4 -0.6 1 -0.6]
+    window_size yes 300 var 3 [ -0.35 0 0 0.5 ]
+}
+
+### Key bindings
+#
+# Basics:
+#
+    # Start a terminal
+    bindsym $mod+Return exec $term
+
+    # Kill focused window
+    bindsym $mod+Backspace kill
+    bindsym $mod+Shift+Backspace kill unfocused
+    bindsym $mod+Ctrl+Backspace kill all
+
+    # Start your launcher
+    bindsym $mod+r exec $rmenu
+    bindsym $mod+d exec $dmenu
+    
+    bindsym $mod+e exec $filemanager
+
+    # Drag floating windows by holding down $mod and left mouse button.
+    # Resize them with right mouse button + $mod.
+    # Despite the name, also works for non-floating windows.
+    # Change normal to inverse to use left mouse button for resizing and right
+    # mouse button for dragging.
+    floating_modifier $mod normal
+
+    # Reload the configuration file
+    bindsym $mod+Shift+c reload
+
+    # Closes the active application (hopefully)
+    bindsym $mod+Shift+q view_close
+
+    # Exit scroll (logs you out of your Wayland session)
+    bindsym $mod+Shift+e exec scrollnag -t warning -m 'You pressed the exit shortcut. Do you really want to exit scroll? This will end your Wayland session.' -B 'Yes, exit scroll' 'scrollmsg exit'
+
+    # Layout mode
+    bindsym $mod+bracketleft set_mode h
+    bindsym $mod+bracketright set_mode v
+#
+# Moving around:
+#
+    # Move your focus around
+    bindsym $mod+h focus left
+    bindsym $mod+j focus down
+    bindsym $mod+k focus up
+    bindsym $mod+l focus right
+    bindsym $mod+home focus beginning
+    bindsym $mod+end focus end
+    # Move the focused window with the same, but add Ctrl
+    bindsym $mod+Ctrl+h move left
+    bindsym $mod+Ctrl+j move down
+    bindsym $mod+Ctrl+k move up
+    bindsym $mod+Ctrl+l move right
+    bindsym $mod+Ctrl+home move beginning
+    bindsym $mod+Ctrl+end move end
+    # nomode
+    bindsym $mod+Alt+h move left nomode
+    bindsym $mod+Alt+j move down nomode
+    bindsym $mod+Alt+k move up nomode
+    bindsym $mod+Alt+l move right nomode
+    bindsym $mod+Alt+home move beginning nomode
+    bindsym $mod+Alt+end move end nomode
+
+    # Focus other monitors
+    bindsym $mod+Shift+h focus output left
+    bindsym $mod+Shift+j focus output down
+    bindsym $mod+Shift+k focus output up
+    bindsym $mod+Shift+l focus output right
+#
+# Workspaces:
+#
+    # Switch to workspace
+    bindsym $mod+1 workspace number 1
+    bindsym $mod+2 workspace number 2
+    bindsym $mod+3 workspace number 3
+    bindsym $mod+4 workspace number 4
+    bindsym $mod+5 workspace number 5
+    bindsym $mod+6 workspace number 6
+    bindsym $mod+7 workspace number 7
+    bindsym $mod+8 workspace number 8
+    bindsym $mod+9 workspace number 9
+    bindsym $mod+0 workspace number 10
+    # Move focused container to workspace
+    bindsym $mod+Shift+1 move container to workspace number 1; workspace number 1
+    bindsym $mod+Shift+2 move container to workspace number 2; workspace number 2
+    bindsym $mod+Shift+3 move container to workspace number 3; workspace number 3
+    bindsym $mod+Shift+4 move container to workspace number 4; workspace number 4
+    bindsym $mod+Shift+5 move container to workspace number 5; workspace number 5
+    bindsym $mod+Shift+6 move container to workspace number 6; workspace number 6
+    bindsym $mod+Shift+7 move container to workspace number 7; workspace number 7
+    bindsym $mod+Shift+8 move container to workspace number 8; workspace number 8
+    bindsym $mod+Shift+9 move container to workspace number 9; workspace number 9
+    bindsym $mod+Shift+0 move container to workspace number 10; workspace number 10 
+    # Note: workspaces can have any name you want, not just numbers.
+    # We just use 1-10 as the default.
+
+    bindsym $mod+Ctrl+1 move workspace to output left
+    bindsym $mod+Ctrl+2 move workspace to output right
+
+# Scaling
+    # Workspace
+    bindsym $mod+Shift+comma scale_workspace incr -0.05
+    bindsym --whole-window $mod+Shift+button4 scale_workspace incr -0.05
+    bindsym $mod+Shift+period scale_workspace incr 0.05
+    bindsym --whole-window $mod+Shift+button5 scale_workspace incr 0.05
+    bindsym $mod+Shift+Ctrl+period scale_workspace reset
+
+    # Overview
+    bindsym --no-repeat $mod+tab scale_workspace overview
+    bindsym --whole-window button8 scale_workspace overview
+
+    # Jump
+    # jump_labels_color #9e1530FF
+    # jump_labels_background #15309eFF
+    # jump_labels_scale 0.9
+    # jump_labels_keys asdf
+    bindsym --no-repeat $mod+slash jump
+    bindsym --no-repeat $mod+Shift+slash jump container
+    bindsym --no-repeat $mod+Ctrl+slash jump workspaces
+    bindsym --no-repeat $mod+Alt+slash jump floating
+
+    # Content
+    bindsym $mod+comma scale_content incr -0.05
+    bindsym --whole-window $mod+button4 scale_content incr -0.05
+    bindsym $mod+period scale_content incr 0.05
+    bindsym --whole-window $mod+button5 scale_content incr 0.05
+    bindsym $mod+Ctrl+period scale_content reset
+
+#
+# Layout stuff:
+#
+    # Make the current focus fullscreen
+    bindsym $mod+f fullscreen
+    bindsym $mod+Ctrl+f fullscreen global
+    bindsym $mod+Alt+f fullscreen_application toggle
+    bindsym $mod+Ctrl+Alt+f fullscreen_application reset
+
+    # Toggle the current focus between tiling and floating mode
+    bindsym $mod+y focus mode_toggle
+    # Toggle layout type (h<->v)
+    bindsym $mod+Shift+y layout_transpose
+
+    # Float a window
+    bindsym $mod+Shift+f floating toggle
+
+    # Toggle sticky
+    bindsym $mod+Shift+Ctrl+a sticky toggle
+    # Toggle pin
+    bindsym --no-repeat $mod+a pin beginning
+    bindsym --no-repeat $mod+Shift+a pin end
+
+    # Selection
+    bindsym --no-repeat $mod+Insert selection toggle
+    bindsym --no-repeat $mod+Ctrl+Insert selection reset
+    bindsym --no-repeat $mod+Shift+Insert selection move
+    bindsym --no-repeat $mod+Ctrl+Shift+Insert selection workspace
+    bindsym --no-repeat $mod+Alt+Insert selection to_trail
+
+    # Marks
+    # bindsym $mod+m exec scroll-mark-toggle.sh
+    # bindsym $mod+Shift+m exec scroll-mark-remove.sh
+    # bindsym $mod+apostrophe exec scroll-mark-switch.sh
+
+#
+# Scratchpad:
+#
+    # Scroll has a "scratchpad", which is a bag of holding for windows.
+    # You can send windows there and get them back later.
+
+    # Move the currently focused window to the scratchpad
+    bindsym $mod+Shift+z move scratchpad
+
+    # Show the next scratchpad window or hide the focused scratchpad window.
+    # If there are multiple scratchpad windows, this command cycles through them.
+    bindsym $mod+z scratchpad show
+    bindsym --no-repeat $mod+Alt+z scratchpad jump
+
+    bindsym $mod+Ctrl+z workspace back_and_forth
+
+#
+# Mode modifiers
+#
+mode "modifiers" {
+    bindsym $right set_mode after; mode default 
+    bindsym $left set_mode before; mode default 
+    bindsym home set_mode beginning; mode default 
+    bindsym end set_mode end; mode default 
+    bindsym $up set_mode focus; mode default 
+    bindsym $down set_mode nofocus; mode default 
+    bindsym h set_mode center_horiz; mode default 
+    bindsym Shift+h set_mode nocenter_horiz; mode default 
+    bindsym v set_mode center_vert; mode default 
+    bindsym Shift+v set_mode nocenter_vert; mode default 
+    bindsym r set_mode reorder_auto; mode default 
+    bindsym Shift+r set_mode noreorder_auto; mode default 
+
+    # Return to default mode
+    bindsym Escape mode "default"
+}
+bindsym $mod+backslash mode "modifiers"
+
+#
+# Resizing containers:
+#
+bindsym $mod+minus cycle_size h prev
+bindsym $mod+equal cycle_size h next
+bindsym $mod+Shift+minus cycle_size v prev
+bindsym $mod+Shift+equal cycle_size v next
+
+mode "setsizeh" {
+    bindsym 1 set_size h 0.125; mode default
+    bindsym 2 set_size h 0.1666666667; mode default
+    bindsym 3 set_size h 0.25; mode default
+    bindsym 4 set_size h 0.333333333; mode default
+    bindsym 5 set_size h 0.375; mode default
+    bindsym 6 set_size h 0.5; mode default
+    bindsym 7 set_size h 0.625; mode default
+    bindsym 8 set_size h 0.6666666667; mode default
+    bindsym 9 set_size h 0.75; mode default
+    bindsym 0 set_size h 0.833333333; mode default
+    bindsym minus set_size h 0.875; mode default
+    bindsym equal set_size h 1.0; mode default
+
+    # Return to default mode
+    bindsym Escape mode "default"
+}
+bindsym $mod+b mode "setsizeh"
+
+mode "setsizev" {
+    bindsym 1 set_size v 0.125; mode default
+    bindsym 2 set_size v 0.1666666667; mode default
+    bindsym 3 set_size v 0.25; mode default
+    bindsym 4 set_size v 0.333333333; mode default
+    bindsym 5 set_size v 0.375; mode default
+    bindsym 6 set_size v 0.5; mode default
+    bindsym 7 set_size v 0.625; mode default
+    bindsym 8 set_size v 0.6666666667; mode default
+    bindsym 9 set_size v 0.75; mode default
+    bindsym 0 set_size v 0.833333333; mode default
+    bindsym minus set_size v 0.875; mode default
+    bindsym equal set_size v 1.0; mode default
+
+    # Return to default mode
+    bindsym Escape mode "default"
+}
+bindsym $mod+Shift+b mode "setsizev"
+
+mode "resize" {
+    # left will shrink the containers width
+    # right will grow the containers width
+    # up will shrink the containers height
+    # down will grow the containers height
+    bindsym $left resize shrink width 100px
+    bindsym $down resize grow height 100px
+    bindsym $up resize shrink height 100px
+    bindsym $right resize grow width 100px
+
+    # Return to default mode
+    bindsym Escape mode "default"
+}
+bindsym $mod+Shift+r mode "resize"
+
+mode "align" {
+    bindsym c align center; mode default
+    bindsym m align middle; mode default
+    bindsym r align reset; mode default
+    bindsym $left align left; mode default
+    bindsym $right align right; mode default
+    bindsym $up align up; mode default
+    bindsym $down align down; mode default
+    bindsym Escape mode "default"
+}
+bindsym $mod+c mode "align"
+
+mode "fit_size" {
+    bindsym w fit_size h visible proportional; mode default
+    bindsym Shift+w fit_size v visible proportional; mode default
+    bindsym Ctrl+w fit_size h visible equal; mode default
+    bindsym Ctrl+Shift+w fit_size v visible equal; mode default
+
+    bindsym $right fit_size h toend proportional; mode default
+    bindsym Shift+$right fit_size v toend proportional; mode default
+    bindsym Ctrl+$right fit_size h toend equal; mode default
+    bindsym Ctrl+Shift+$right fit_size v toend equal; mode default
+
+    bindsym $left fit_size h tobeg proportional; mode default
+    bindsym Shift+$left fit_size v tobeg proportional; mode default
+    bindsym Ctrl+$left fit_size h tobeg equal; mode default
+    bindsym Ctrl+Shift+$left fit_size v tobeg equal; mode default
+
+    bindsym $up fit_size h active proportional; mode default
+    bindsym Shift+$up fit_size v active proportional; mode default
+    #bindsym Ctrl+$up fit_size h active equal; mode default
+    #bindsym Ctrl+Shift+$up fit_size v active equal; mode default
+
+    bindsym $down fit_size h all proportional; mode default
+    bindsym Shift+$down fit_size v all proportional; mode default
+    bindsym Ctrl+$down fit_size h all equal; mode default
+    bindsym Ctrl+Shift+$down fit_size v all equal; mode default
+    bindsym Escape mode "default"
+}
+bindsym $mod+w mode "fit_size"
+
+mode "trailmark" {
+    bindsym bracketright trailmark next
+    bindsym bracketleft trailmark prev
+    bindsym semicolon trailmark toggle; mode default
+    bindsym Escape mode "default"
+}
+bindsym $mod+semicolon mode "trailmark"
+
+mode "trail" {
+    bindsym bracketright trail next
+    bindsym bracketleft trail prev
+    bindsym semicolon trail new; mode default
+    bindsym d trail delete; mode default
+    bindsym c trail clear; mode default
+    bindsym insert trail to_selection; mode default
+    bindsym Escape mode "default"
+}
+bindsym $mod+Shift+semicolon mode "trail"
+
+mode "spaces" {
+    bindsym 1 space load 1; mode default
+    bindsym 2 space load 2; mode default
+    bindsym 3 space load 3; mode default
+    bindsym 4 space load 4; mode default
+    bindsym 5 space load 5; mode default
+    bindsym 6 space load 6; mode default
+    bindsym 7 space load 7; mode default
+    bindsym 8 space load 8; mode default
+    bindsym 9 space load 9; mode default
+    bindsym 0 space load 0; mode default
+    bindsym Shift+1 space save 1; mode default
+    bindsym Shift+2 space save 2; mode default
+    bindsym Shift+3 space save 3; mode default
+    bindsym Shift+4 space save 4; mode default
+    bindsym Shift+5 space save 5; mode default
+    bindsym Shift+6 space save 6; mode default
+    bindsym Shift+7 space save 7; mode default
+    bindsym Shift+8 space save 8; mode default
+    bindsym Shift+9 space save 9; mode default
+    bindsym Shift+0 space save 0; mode default
+    bindsym Ctrl+1 space restore 1; mode default
+    bindsym Ctrl+2 space restore 2; mode default
+    bindsym Ctrl+3 space restore 3; mode default
+    bindsym Ctrl+4 space restore 4; mode default
+    bindsym Ctrl+5 space restore 5; mode default
+    bindsym Ctrl+6 space restore 6; mode default
+    bindsym Ctrl+7 space restore 7; mode default
+    bindsym Ctrl+8 space restore 8; mode default
+    bindsym Ctrl+9 space restore 9; mode default
+    bindsym Ctrl+0 space restore 0; mode default
+    bindsym Escape mode "default"
+}
+bindsym $mod+g mode "spaces"
+
+#
+# Utilities:
+#
+    # Special keys to adjust volume via PulseAudio
+    bindsym --locked XF86AudioMute exec pactl set-sink-mute \@DEFAULT_SINK@ toggle
+    bindsym --locked XF86AudioLowerVolume exec pactl set-sink-volume \@DEFAULT_SINK@ -5%
+    bindsym --locked XF86AudioRaiseVolume exec pactl set-sink-volume \@DEFAULT_SINK@ +5%
+    bindsym --locked XF86AudioMicMute exec pactl set-source-mute \@DEFAULT_SOURCE@ toggle
+
+    # Special keys to control media via playerctl
+    bindsym --locked XF86AudioPlay exec playerctl play-pause
+    bindsym --locked XF86AudioPause exec playerctl play-pause
+    bindsym --locked XF86AudioPrev exec playerctl previous
+    bindsym --locked XF86AudioNext exec playerctl next
+    bindsym --locked XF86AudioStop exec playerctl stop
+
+    # Special keys to adjust brightness via brightnessctl
+    bindsym --locked XF86MonBrightnessDown exec brightnessctl set 5%-
+    bindsym --locked XF86MonBrightnessUp exec brightnessctl set 5%+
+
+    # Special key to take a screenshot with grim
+    bindsym Print exec grim
+
+
+focus_wrapping no
+
+bindgesture swipe:4:right workspace next
+bindgesture swipe:4:left workspace prev
+
+bindgesture swipe:4:up scale_workspace overview 
+
+#
+# Workspace rules:
+#
+# Opens a terminal when creating workspace 6
+# workspace 6 exec kitty
+
+
+#
+# Status Bar:
+#
+# Read `man 5 scroll-bar` for more information about this section.
+bar {
+    position top
+
+    # When the status_command prints a new line to stdout, scrollbar updates.
+    # The default just shows the current date and time.
+    status_command while date +'%Y-%m-%d %X'; do sleep 1; done
+
+    colors {
+        statusline #ffffff
+        background #323232
+        inactive_workspace #32323200 #32323200 #5c5c5c
+        scroller #2F343AFF #055E20FF #FFFFFFFF
+    }
+}
+#
+# include /etc/scroll/config.d/*
diff --git a/waybar/config b/waybar/config
index 313aed7..74d0fee 100644
--- a/waybar/config
+++ b/waybar/config
@@ -15,6 +15,21 @@
 
     // Modules configuration
 
+    "sway/workspaces": {
+      "all-outputs": false,
+      "persistent-workspaces": {
+        "1": ["eDP-1"],
+        "2": ["eDP-1"],
+        "3": ["eDP-1"],
+        "4": ["eDP-1"],
+        "5": ["eDP-1"],
+        "6": ["eDP-1"],
+        "7": ["eDP-1"],
+        "8": ["eDP-1"],
+        "9": ["eDP-1"],
+      },
+      "format": "{value}",
+    },
     "niri/workspaces": {
       "format": "{value}",
       "all-outputs": false,
@@ -51,6 +66,12 @@
       "on-scroll-down": "hyprctl dispatch split-workspace e-1",
       "on-click": "activate"
     },
+    "sway/window": {
+      "separate-outputs": true,
+      "icon": true,
+      "format": "{title}",
+      "expand": true
+    },
     "niri/window": {
       "separate-outputs": true,
       "icon": true,
diff --git a/waybar/style.css b/waybar/style.css
index 59f741f..9398381 100644
--- a/waybar/style.css
+++ b/waybar/style.css
@@ -56,6 +56,10 @@ window#waybar.hidden {
     background: #198844;
 }
 
+#workspaces button.focused {
+    background: #198844;
+}
+
 /*
 #workspaces button.active:hover {
     background: #6e3c85;
-- 
cgit v1.2.3


From 5407b39d082fef72ac526ac1fe9a98565cdefbaf Mon Sep 17 00:00:00 2001
From: zachir <zachir@librem.one>
Date: Sat, 26 Jul 2025 14:50:20 -0500
Subject: Fix typo in waybar config

---
 waybar/config | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'waybar')

diff --git a/waybar/config b/waybar/config
index 74d0fee..7f07eed 100644
--- a/waybar/config
+++ b/waybar/config
@@ -82,7 +82,7 @@
       "separate-outputs": true,
       "icon": true,
       "format": "{title}",
-      "espand": true,
+      "expand": true,
     },
     "keyboard-state": {
         "numlock": true,
-- 
cgit v1.2.3


From 4f3d058db4b7471755cc7603f5c3b9bb0738a311 Mon Sep 17 00:00:00 2001
From: zachir <zachir@librem.one>
Date: Sat, 26 Jul 2025 19:31:05 -0500
Subject: Fix scrolling on waybar workspaces

---
 waybar/config | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'waybar')

diff --git a/waybar/config b/waybar/config
index 7f07eed..77e7e6d 100644
--- a/waybar/config
+++ b/waybar/config
@@ -62,8 +62,8 @@
       "persistent-workspaces": {
         "eDP-1": [ 1, 2, 3, 4, 5, 6, 7, 8, 9 ],
       },
-      "on-scroll-up": "hyprctl dispatch split-workspace e+1",
-      "on-scroll-down": "hyprctl dispatch split-workspace e-1",
+      "on-scroll-up": "hyprctl dispatch split:workspace r+1",
+      "on-scroll-down": "hyprctl dispatch split:workspace r-1",
       "on-click": "activate"
     },
     "sway/window": {
-- 
cgit v1.2.3


From a0abeab1c719c59f0c97adc3353e832826701938 Mon Sep 17 00:00:00 2001
From: zachir <zachir@librem.one>
Date: Mon, 28 Jul 2025 12:22:27 -0500
Subject: Use swaysome for more awesome scroll workspaces

---
 scroll/config                 | 59 +++++++++++++++++++-----------------
 scroll/config.d/swaysome.conf | 69 +++++++++++++++++++++++++++++++++++++++++++
 waybar/config                 | 51 +++++++++++++++++++++++++-------
 3 files changed, 142 insertions(+), 37 deletions(-)
 create mode 100644 scroll/config.d/swaysome.conf

(limited to 'waybar')

diff --git a/scroll/config b/scroll/config
index e689a61..8117844 100644
--- a/scroll/config
+++ b/scroll/config
@@ -6,7 +6,10 @@
 #
 # Read `man 5 scroll` for a complete reference.
 
-include ~/.config/scroll/config.d/*
+include /etc/scroll/config.d/*
+
+# This includes config.d/user.conf, which should set the $home variable
+include ~/.config/scroll/config.d/user.conf
 
 ### Variables
 #
@@ -179,36 +182,38 @@ animations {
     bindsym $mod+Shift+j focus output down
     bindsym $mod+Shift+k focus output up
     bindsym $mod+Shift+l focus output right
-#
-# Workspaces:
-#
-    # Switch to workspace
-    bindsym $mod+1 workspace number 1
-    bindsym $mod+2 workspace number 2
-    bindsym $mod+3 workspace number 3
-    bindsym $mod+4 workspace number 4
-    bindsym $mod+5 workspace number 5
-    bindsym $mod+6 workspace number 6
-    bindsym $mod+7 workspace number 7
-    bindsym $mod+8 workspace number 8
-    bindsym $mod+9 workspace number 9
-    # Move focused container to workspace
-    bindsym $mod+Shift+1 move container to workspace number 1; workspace number 1
-    bindsym $mod+Shift+2 move container to workspace number 2; workspace number 2
-    bindsym $mod+Shift+3 move container to workspace number 3; workspace number 3
-    bindsym $mod+Shift+4 move container to workspace number 4; workspace number 4
-    bindsym $mod+Shift+5 move container to workspace number 5; workspace number 5
-    bindsym $mod+Shift+6 move container to workspace number 6; workspace number 6
-    bindsym $mod+Shift+7 move container to workspace number 7; workspace number 7
-    bindsym $mod+Shift+8 move container to workspace number 8; workspace number 8
-    bindsym $mod+Shift+9 move container to workspace number 9; workspace number 9
-    # Note: workspaces can have any name you want, not just numbers.
-    # We just use 1-10 as the default.
 
+    # Move window to other monitors
     bindsym $mod+Shift+Ctrl+h move container to output left
     bindsym $mod+Shift+Ctrl+j move container to output down
     bindsym $mod+Shift+Ctrl+k move container to output up
     bindsym $mod+Shift+Ctrl+l move container to output right
+##
+## Workspaces:
+## NOW USING SWAYSOME
+##
+#    # Switch to workspace
+#    bindsym $mod+1 workspace number 1
+#    bindsym $mod+2 workspace number 2
+#    bindsym $mod+3 workspace number 3
+#    bindsym $mod+4 workspace number 4
+#    bindsym $mod+5 workspace number 5
+#    bindsym $mod+6 workspace number 6
+#    bindsym $mod+7 workspace number 7
+#    bindsym $mod+8 workspace number 8
+#    bindsym $mod+9 workspace number 9
+#    # Move focused container to workspace
+#    bindsym $mod+Shift+1 move container to workspace number 1; workspace number 1
+#    bindsym $mod+Shift+2 move container to workspace number 2; workspace number 2
+#    bindsym $mod+Shift+3 move container to workspace number 3; workspace number 3
+#    bindsym $mod+Shift+4 move container to workspace number 4; workspace number 4
+#    bindsym $mod+Shift+5 move container to workspace number 5; workspace number 5
+#    bindsym $mod+Shift+6 move container to workspace number 6; workspace number 6
+#    bindsym $mod+Shift+7 move container to workspace number 7; workspace number 7
+#    bindsym $mod+Shift+8 move container to workspace number 8; workspace number 8
+#    bindsym $mod+Shift+9 move container to workspace number 9; workspace number 9
+#    # Note: workspaces can have any name you want, not just numbers.
+#    # We just use 1-10 as the default.
 
 # Scaling
     # Workspace
@@ -579,4 +584,4 @@ bar {
     #}
 }
 #
-include /etc/scroll/config.d/*
+include ~/.config/scroll/config.d/*
diff --git a/scroll/config.d/swaysome.conf b/scroll/config.d/swaysome.conf
new file mode 100644
index 0000000..eebf6a3
--- /dev/null
+++ b/scroll/config.d/swaysome.conf
@@ -0,0 +1,69 @@
+# vim: ft=swayconfig
+#
+# Use (un)bindcode or (un)bindsym, depending on what you used in your main sway config file.
+# The `--no-warn` setting is only added to shortcuts that exist in the default config. You may want to add or remove
+# that flag on some bindings depending on your config.
+
+
+# Change focus between workspaces
+bindsym --no-warn $mod+1 exec "swaysome focus 1"
+bindsym --no-warn $mod+2 exec "swaysome focus 2"
+bindsym --no-warn $mod+3 exec "swaysome focus 3"
+bindsym --no-warn $mod+4 exec "swaysome focus 4"
+bindsym --no-warn $mod+5 exec "swaysome focus 5"
+bindsym --no-warn $mod+6 exec "swaysome focus 6"
+bindsym --no-warn $mod+7 exec "swaysome focus 7"
+bindsym --no-warn $mod+8 exec "swaysome focus 8"
+bindsym --no-warn $mod+9 exec "swaysome focus 9"
+#bindsym --no-warn $mod+0 exec "swaysome focus 0"
+
+# Move containers between workspaces
+bindsym --no-warn $mod+Shift+1 exec "swaysome move 1"
+bindsym --no-warn $mod+Shift+2 exec "swaysome move 2"
+bindsym --no-warn $mod+Shift+3 exec "swaysome move 3"
+bindsym --no-warn $mod+Shift+4 exec "swaysome move 4"
+bindsym --no-warn $mod+Shift+5 exec "swaysome move 5"
+bindsym --no-warn $mod+Shift+6 exec "swaysome move 6"
+bindsym --no-warn $mod+Shift+7 exec "swaysome move 7"
+bindsym --no-warn $mod+Shift+8 exec "swaysome move 8"
+bindsym --no-warn $mod+Shift+9 exec "swaysome move 9"
+#bindsym --no-warn $mod+Shift+0 exec "swaysome move 0"
+
+# Focus workspace groups
+bindsym $mod+Alt+1 exec "swaysome focus-group 1"
+bindsym $mod+Alt+2 exec "swaysome focus-group 2"
+bindsym $mod+Alt+3 exec "swaysome focus-group 3"
+bindsym $mod+Alt+4 exec "swaysome focus-group 4"
+bindsym $mod+Alt+5 exec "swaysome focus-group 5"
+bindsym $mod+Alt+6 exec "swaysome focus-group 6"
+bindsym $mod+Alt+7 exec "swaysome focus-group 7"
+bindsym $mod+Alt+8 exec "swaysome focus-group 8"
+bindsym $mod+Alt+9 exec "swaysome focus-group 9"
+#bindsym $mod+Alt+0 exec "swaysome focus-group 0"
+
+# Move containers to other workspace groups
+bindsym $mod+Alt+Shift+1 exec "swaysome move-to-group 1"
+bindsym $mod+Alt+Shift+2 exec "swaysome move-to-group 2"
+bindsym $mod+Alt+Shift+3 exec "swaysome move-to-group 3"
+bindsym $mod+Alt+Shift+4 exec "swaysome move-to-group 4"
+bindsym $mod+Alt+Shift+5 exec "swaysome move-to-group 5"
+bindsym $mod+Alt+Shift+6 exec "swaysome move-to-group 6"
+bindsym $mod+Alt+Shift+7 exec "swaysome move-to-group 7"
+bindsym $mod+Alt+Shift+8 exec "swaysome move-to-group 8"
+bindsym $mod+Alt+Shift+9 exec "swaysome move-to-group 9"
+#bindsym $mod+Alt+Shift+0 exec "swaysome move-to-group 0"
+
+# Move focused container to next output
+bindsym $mod+o exec "swaysome next-output"
+# Move focused container to previous output
+bindsym $mod+Shift+o exec "swaysome prev-output"
+
+# Move focused workspace group to next output
+bindsym $mod+Alt+o exec "swaysome workspace-group-next-output"
+# Move focused workspace group to previous output
+bindsym $mod+Alt+Shift+o exec "swaysome workspace-group-prev-output"
+
+# Init workspaces for every screen
+exec "swaysome init 1"
+
+
diff --git a/waybar/config b/waybar/config
index 77e7e6d..b480559 100644
--- a/waybar/config
+++ b/waybar/config
@@ -18,17 +18,48 @@
     "sway/workspaces": {
       "all-outputs": false,
       "persistent-workspaces": {
-        "1": ["eDP-1"],
-        "2": ["eDP-1"],
-        "3": ["eDP-1"],
-        "4": ["eDP-1"],
-        "5": ["eDP-1"],
-        "6": ["eDP-1"],
-        "7": ["eDP-1"],
-        "8": ["eDP-1"],
-        "9": ["eDP-1"],
+        "11": ["DP-2"],
+        "12": ["DP-2"],
+        "13": ["DP-2"],
+        "14": ["DP-2"],
+        "15": ["DP-2"],
+        "16": ["DP-2"],
+        "17": ["DP-2"],
+        "18": ["DP-2"],
+        "19": ["DP-2"],
+      },
+      "format": "{icon}",
+      "format-icons": {
+        "1": "1",
+        "2": "2",
+        "3": "3",
+        "4": "4",
+        "5": "5",
+        "6": "6",
+        "7": "7",
+        "8": "8",
+        "9": "9",
+        "10": "0",
+        "11": "1",
+        "12": "2",
+        "13": "3",
+        "14": "4",
+        "15": "5",
+        "16": "6",
+        "17": "7",
+        "18": "8",
+        "19": "9",
+        "20": "0",
+        "21": "1",
+        "22": "2",
+        "23": "3",
+        "24": "4",
+        "25": "5",
+        "26": "6",
+        "27": "7",
+        "28": "8",
+        "29": "9",
       },
-      "format": "{value}",
     },
     "niri/workspaces": {
       "format": "{value}",
-- 
cgit v1.2.3


From 8a2c32014dc380cf9fc92e60c2ebe5f01f2930e3 Mon Sep 17 00:00:00 2001
From: zachir <zachir@librem.one>
Date: Mon, 28 Jul 2025 13:01:03 -0500
Subject: Fix formatting in waybar cnofig

---
 waybar/config | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'waybar')

diff --git a/waybar/config b/waybar/config
index b480559..d9fcbda 100644
--- a/waybar/config
+++ b/waybar/config
@@ -5,7 +5,7 @@
     //"output": "%%DISPLAY%%",
     "spacing": 4,
     //"margin-top": 5,
-    //"margin-bottom":5,
+    //"margin-bottom": 5,
 
     // Choose the order of the modules
 
-- 
cgit v1.2.3


From 8bc4e11ba7d4ad30f09c376e5ba31d5563471cba Mon Sep 17 00:00:00 2001
From: zachir <zachir@librem.one>
Date: Mon, 28 Jul 2025 13:01:17 -0500
Subject: eDP-1 is the only display in master

---
 waybar/config | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'waybar')

diff --git a/waybar/config b/waybar/config
index d9fcbda..25fb4dc 100644
--- a/waybar/config
+++ b/waybar/config
@@ -18,15 +18,15 @@
     "sway/workspaces": {
       "all-outputs": false,
       "persistent-workspaces": {
-        "11": ["DP-2"],
-        "12": ["DP-2"],
-        "13": ["DP-2"],
-        "14": ["DP-2"],
-        "15": ["DP-2"],
-        "16": ["DP-2"],
-        "17": ["DP-2"],
-        "18": ["DP-2"],
-        "19": ["DP-2"],
+        "11": ["eDP-1"],
+        "12": ["eDP-1"],
+        "13": ["eDP-1"],
+        "14": ["eDP-1"],
+        "15": ["eDP-1"],
+        "16": ["eDP-1"],
+        "17": ["eDP-1"],
+        "18": ["eDP-1"],
+        "19": ["eDP-1"],
       },
       "format": "{icon}",
       "format-icons": {
-- 
cgit v1.2.3


From 0ff1806f2c2d690238c373b8f65ba40f569301d7 Mon Sep 17 00:00:00 2001
From: ZachIR <zachir@librem.one>
Date: Wed, 30 Jul 2025 02:40:49 -0500
Subject: Use JetBrainsMono Nerd Font instead of Fira Code

---
 X11/xresources                  | 8 ++++----
 alacritty/alacritty.yml         | 8 ++++----
 awesome/rc.lua                  | 2 +-
 awesome/themes/zachir/theme.lua | 6 +++---
 dunst/dunstrc                   | 2 +-
 kitty/kitty.conf                | 4 ++--
 rofi/dmenu.rasi                 | 2 +-
 sxhkd/sxhkdrc                   | 4 ++--
 tofi/cosmic                     | 2 +-
 tofi/themes/dmenu               | 2 +-
 tofi/themes/dmenu_vertical      | 2 +-
 waybar/style.css                | 2 +-
 12 files changed, 22 insertions(+), 22 deletions(-)

(limited to 'waybar')

diff --git a/X11/xresources b/X11/xresources
index 13799fc..7d2525a 100644
--- a/X11/xresources
+++ b/X11/xresources
@@ -1,6 +1,6 @@
 !! dmenu
 
-dmenu.font: FiraCode Nerd Font Mono:size=24
+dmenu.font: JetBrainsMono Nerd Font:size=24
 
 !! dwm
 
@@ -30,7 +30,7 @@ st.termname:     st-256color
 st.shell: /usr/bin/tmux
 
 ! The following options options can be reloaded via USR1 signal.
-!st.font:              FiraCode Nerd Font Mono:pixelsize=12:antialias=true:autohint=true;
+!st.font:              JetBrainsMono Nerd Font:pixelsize=12:antialias=true:autohint=true;
 !st.font2:             Symbola:pixelsize=12:antialias=true:autohint=true;
 st.borderpx:          3
 ! st alpha
@@ -76,7 +76,7 @@ URxvt.secondaryScreen: 1
 URxvt.secondaryScroll: 0
 URxvt.secondaryWheel: 1
 ! URxvt font
-URxvt.font: xft:FiraCode:regular:size=8,xft:symbola:regular:size=9
+URxvt.font: xft:JetBrainsMono:regular:size=8,xft:symbola:regular:size=9
 ! fix font spacing
 URxvt.letterSpace: -1
 ! Disable printing
@@ -119,7 +119,7 @@ rofi.width:                          1366
 ! "Number of columns" Set from: Default
 ! rofi.columns:                        1
 ! "Font to use" Set from: Default
-rofi.font:                           FiraCode 9
+rofi.font:                           JetBrainsMono 9
 ! "Border width" Set from: Default
 ! rofi.bw:                             1
 ! "Location on screen" Set from: Default
diff --git a/alacritty/alacritty.yml b/alacritty/alacritty.yml
index 1bd8532..0b30805 100644
--- a/alacritty/alacritty.yml
+++ b/alacritty/alacritty.yml
@@ -115,7 +115,7 @@ font:
     #   - (macOS) Menlo
     #   - (Linux/BSD) monospace
     #   - (Windows) Consolas
-    family: FiraCode Nerd Font Mono
+    family: JetBrainsMono Nerd Font
 
     # The `style` can be specified to pick a specific face.
     style: Regular
@@ -126,7 +126,7 @@ font:
     #
     # If the bold family is not specified, it will fall back to the
     # value specified for the normal font.
-    family: FiraCode Nerd Font Mono
+    family: JetBrainsMono Nerd Font
 
     # The `style` can be specified to pick a specific face.
     style: Bold
@@ -137,7 +137,7 @@ font:
     #
     # If the italic family is not specified, it will fall back to the
     # value specified for the normal font.
-    family: FiraCode Nerd Font Mono
+    family: JetBrainsMono Nerd Font
 
     # The `style` can be specified to pick a specific face.
     style: Italic
@@ -148,7 +148,7 @@ font:
     #
     # If the bold italic family is not specified, it will fall back to the
     # value specified for the normal font.
-    family: FiraCode Nerd Font Mono
+    family: JetBrainsMono Nerd Font
 
     # The `style` can be specified to pick a specific face.
     style: Bold Italic
diff --git a/awesome/rc.lua b/awesome/rc.lua
index fda4f16..7fa49ef 100644
--- a/awesome/rc.lua
+++ b/awesome/rc.lua
@@ -58,7 +58,7 @@ awesome_config_folder = config_dir .. "awesome"
 theme.dir = string.format("%s/awesome/themes/%s", config_dir, theme.name)
 beautiful.init(theme.dir .. "/theme.lua")
 beautiful.useless_gap = 5
-font = beautiful.font or "FiraCode Nerd Font Mono 18"
+font = beautiful.font or "JetBrainsMono Nerd Font 18"
 
 -- Library I'm using for swallowing, but it does much more
 
diff --git a/awesome/themes/zachir/theme.lua b/awesome/themes/zachir/theme.lua
index b54c3c6..30a575a 100644
--- a/awesome/themes/zachir/theme.lua
+++ b/awesome/themes/zachir/theme.lua
@@ -12,8 +12,8 @@ local themes_path = gfs.get_themes_dir()
 
 local theme = {}
 
-theme.font          = "FiraCode Nerd Font Mono 18"
-theme.font2         = "FiraCode Nerd Font Mono 12"
+theme.font          = "JetBrainsMono Nerd Font 18"
+theme.font2         = "JetBrainsMono Nerd Font 12"
 
 theme.bg_normal     = xrdb.background
 theme.bg_focus      = xrdb.color2
@@ -162,7 +162,7 @@ theme.tabbar_disable = false -- disable the tab bar entirely
 theme.tabbar_ontop = false
 theme.tabbar_radius = 0 -- border radius of the tabbar
 theme.tabbar_style = "default" -- style of the tabbar ("default", "boxes" or "modern")
-theme.tabbar_font = "FiraCode Nerd Font Mono 24" -- font of the tabbar
+theme.tabbar_font = "JetBrainsMono Nerd Font 24" -- font of the tabbar
 theme.tabbar_size = 40 -- size of the tabbar
 theme.tabbar_position = "top" -- position of the tabbar
 theme.tabbar_bg_normal = "#000000" -- background color of the focused client on the tabbar
diff --git a/dunst/dunstrc b/dunst/dunstrc
index 4bdcfba..6377f26 100644
--- a/dunst/dunstrc
+++ b/dunst/dunstrc
@@ -86,7 +86,7 @@
 
     ### Text ###
 
-    font = FiraCode Nerd Font Mono 18
+    font = JetBrainsMono Nerd Font 18
 
     # The spacing between lines.  If the height is smaller than the
     # font height, it will get raised to the font height.
diff --git a/kitty/kitty.conf b/kitty/kitty.conf
index 095607b..7afcb30 100644
--- a/kitty/kitty.conf
+++ b/kitty/kitty.conf
@@ -6,7 +6,7 @@
 #: individual font faces and even specify special fonts for particular
 #: characters.
 
-font_family      FiraCode Nerd Font Mono
+font_family      JetBrainsMono Nerd Font
 bold_font        auto
 italic_font      auto
 bold_italic_font auto
@@ -24,7 +24,7 @@ bold_italic_font auto
 #:     italic_font      Operator Mono Book Italic
 #:     bold_italic_font Operator Mono Medium Italic
 
-font_size 11.0
+font_size 15.0
 
 #: Font size (in pts)
 
diff --git a/rofi/dmenu.rasi b/rofi/dmenu.rasi
index 6fd198a..2ac7745 100644
--- a/rofi/dmenu.rasi
+++ b/rofi/dmenu.rasi
@@ -8,7 +8,7 @@
     background-color:      Black;
     border-color:          White;
     text-color:           White;
-    font:            "FiraCode Nerd Font Mono 12";
+    font:            "JetBrainsMono Nerd Font 12";
 }
 window {
     anchor:     north;
diff --git a/sxhkd/sxhkdrc b/sxhkd/sxhkdrc
index a38f356..96ca393 100755
--- a/sxhkd/sxhkdrc
+++ b/sxhkd/sxhkdrc
@@ -12,11 +12,11 @@ super + Escape
 
 # program launcher
 super + d
-        dmenu_run -i -l 15 -h 36 -fn 'FiraCode Nerd Font Mono' -nb '#000' -nf '#c5c8c6' -sb '#198844' -sf '#000'
+        dmenu_run -i -l 15 -h 36 -fn 'JetBrainsMono Nerd Font' -nb '#000' -nf '#c5c8c6' -sb '#198844' -sf '#000'
 
 # desktop application launcher
 super + r
-        j4-dmenu-desktop --dmenu="dmenu -i -l 15 -h 36 -fn 'FiraCode Nerd Font Mono' -nb '#000' -nf '#c5c8c6' -sb '#198844' -sf '#000'"
+        j4-dmenu-desktop --dmenu="dmenu -i -l 15 -h 36 -fn 'JetBrainsMono Nerd Font' -nb '#000' -nf '#c5c8c6' -sb '#198844' -sf '#000'"
 
 # dmenu prompt for recording
 super + control + r
diff --git a/tofi/cosmic b/tofi/cosmic
index 8be1a31..b339f73 100644
--- a/tofi/cosmic
+++ b/tofi/cosmic
@@ -7,7 +7,7 @@ height = 32
 horizontal = true
 font-size = 18
 prompt-text = ""
-font = FiraCode Nerd Font Mono
+font = JetBrainsMono Nerd Font
 outline-width = 0
 border-width = 0
 min-input-width = 424
diff --git a/tofi/themes/dmenu b/tofi/themes/dmenu
index 82cff1d..8af8c80 100644
--- a/tofi/themes/dmenu
+++ b/tofi/themes/dmenu
@@ -7,7 +7,7 @@ height = 36
 horizontal = true
 font-size = 18
 prompt-text = ""
-font = FiraCode Nerd Font Mono
+font = JetBrainsMono Nerd Font
 outline-width = 0
 border-width = 0
 min-input-width = 424
diff --git a/tofi/themes/dmenu_vertical b/tofi/themes/dmenu_vertical
index 6357b5a..2e95559 100644
--- a/tofi/themes/dmenu_vertical
+++ b/tofi/themes/dmenu_vertical
@@ -8,7 +8,7 @@ horizontal = false
 font-size = 18
 prompt-text = ""
 prompt-padding = 18
-font = FiraCode Nerd Font Mono
+font = JetBrainsMono Nerd Font
 outline-width = 0
 border-width = 0
 min-input-width = 424
diff --git a/waybar/style.css b/waybar/style.css
index 9398381..0a4431c 100644
--- a/waybar/style.css
+++ b/waybar/style.css
@@ -3,7 +3,7 @@
     margin: 0px;
     border-radius: 0px;
     /* `otf-font-awesome` is required to be installed for icons */
-    font-family: FiraCode Nerd Font Mono;
+    font-family: JetBrainsMono Nerd Font;
     font-size: 18px;
     min-height: 0px;
     min-width: 0px;
-- 
cgit v1.2.3


From ec330589a41b423950fe49449248edb546961383 Mon Sep 17 00:00:00 2001
From: ZachIR <zachir@librem.one>
Date: Wed, 30 Jul 2025 02:44:19 -0500
Subject: Add json syntax highlighting to waybar config

---
 waybar/config | 1 +
 1 file changed, 1 insertion(+)

(limited to 'waybar')

diff --git a/waybar/config b/waybar/config
index 25fb4dc..5807b92 100644
--- a/waybar/config
+++ b/waybar/config
@@ -1,3 +1,4 @@
+// vim: set filetype=json5 :
 {
     "layer": "bottom",
     "position": "top",
-- 
cgit v1.2.3


From 66a55d31d6cfa115c99a7fe3c93fbbed7901fe8e Mon Sep 17 00:00:00 2001
From: ZachIR <zachir@librem.one>
Date: Wed, 30 Jul 2025 04:23:51 -0500
Subject: Add custom/battery for while battery is broken

---
 waybar/config    | 9 +++++++--
 waybar/style.css | 5 +++++
 2 files changed, 12 insertions(+), 2 deletions(-)

(limited to 'waybar')

diff --git a/waybar/config b/waybar/config
index 5807b92..9246fa2 100644
--- a/waybar/config
+++ b/waybar/config
@@ -160,8 +160,8 @@
         "format": "{}% "
     },
     "battery": {
-        "bat": "BAT0",
-        "interval": 60,
+        //"bat": "BAT0",
+        //"interval": 60,
         "state": {
             "warning": 30,
             "critical": 15
@@ -214,6 +214,11 @@
         "on-click": "rofi -show drun",
         //"on-click-right": "killall rofi"
     },
+    "custom/battery":{
+      "interval": 60,
+      "format": "{}%",
+      "exec": "cat /sys/class/power_supply/BAT0/capacity",
+    },
     "custom/power":{
         "format": "",
         "on-click": "rofi -show p -modi p:rofi-power-menu",
diff --git a/waybar/style.css b/waybar/style.css
index 0a4431c..865e806 100644
--- a/waybar/style.css
+++ b/waybar/style.css
@@ -89,6 +89,7 @@ window#waybar.hidden {
 #custom-media,
 #custom-launcher,
 #custom-power,
+#custom-battery,
 #custom-layout,
 #custom-updater,
 #custom-snip,
@@ -215,7 +216,11 @@ label:focus {
     background-color: #1b1d1c;
     font-size: 18px;
     margin-right: 5px;
+}
 
+#custom-battery{
+    background-color: #1b1d1c;
+    font-size: 18px;
 }
 
 #custom-launcher{
-- 
cgit v1.2.3


From d1412fdffa7388d04c01a26ab89cef8151efde6e Mon Sep 17 00:00:00 2001
From: ZachIR <zachir@librem.one>
Date: Wed, 30 Jul 2025 05:06:22 -0500
Subject: Restore battery waybar settings in case it starts working again

---
 waybar/config | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'waybar')

diff --git a/waybar/config b/waybar/config
index 9246fa2..7775078 100644
--- a/waybar/config
+++ b/waybar/config
@@ -160,8 +160,8 @@
         "format": "{}% "
     },
     "battery": {
-        //"bat": "BAT0",
-        //"interval": 60,
+        "bat": "BAT0",
+        "interval": 60,
         "state": {
             "warning": 30,
             "critical": 15
-- 
cgit v1.2.3


From 218e54aa900ba4e469a405f3e81bf00e024b228d Mon Sep 17 00:00:00 2001
From: ZachIR <zachir@librem.one>
Date: Wed, 30 Jul 2025 05:06:51 -0500
Subject: Expand custom/battery module

---
 waybar/config    |  8 +++++---
 waybar/style.css | 15 +++++++++++++++
 2 files changed, 20 insertions(+), 3 deletions(-)

(limited to 'waybar')

diff --git a/waybar/config b/waybar/config
index 7775078..933dedc 100644
--- a/waybar/config
+++ b/waybar/config
@@ -215,9 +215,11 @@
         //"on-click-right": "killall rofi"
     },
     "custom/battery":{
-      "interval": 60,
-      "format": "{}%",
-      "exec": "cat /sys/class/power_supply/BAT0/capacity",
+      "interval": 15,
+      "format": "{percentage}%",
+      "return-type": "json",
+      "exec": "custom-battery",
+      "tooltip": true,
     },
     "custom/power":{
         "format": "",
diff --git a/waybar/style.css b/waybar/style.css
index 865e806..ff6dc9a 100644
--- a/waybar/style.css
+++ b/waybar/style.css
@@ -223,6 +223,21 @@ label:focus {
     font-size: 18px;
 }
 
+#custom-battery.battery_low{
+    background-color: yellow;
+    color: #1b1d1c;
+}
+
+#custom-battery.battery_crit{
+    background-color: red;
+    color: #1b1d1c;
+}
+
+#custom-battery.battery_charging{
+    background-color: #1d1b1c;
+    color: #198844;
+}
+
 #custom-launcher{
     background-color: #1b1d1c;
     font-size: 20px;
-- 
cgit v1.2.3


From 08655b7b49d8c970b1f0020ccc807209c298c127 Mon Sep 17 00:00:00 2001
From: zachir <zachir@librem.one>
Date: Wed, 30 Jul 2025 07:12:19 -0500
Subject: Add transparent black background to waybar

---
 waybar/style.css | 1 +
 1 file changed, 1 insertion(+)

(limited to 'waybar')

diff --git a/waybar/style.css b/waybar/style.css
index ff6dc9a..6ecb923 100644
--- a/waybar/style.css
+++ b/waybar/style.css
@@ -14,6 +14,7 @@ window#waybar {
     color: #ffffff;
     transition-property: background-color;
     transition-duration: .5s;
+    background: rgba(0, 0, 0, 0.2);
 }
 
 window#waybar.hidden {
-- 
cgit v1.2.3