Finalised tweaks to waybar niri and wezterm

niri/config.kdl

@@ -3,6 +3,10 @@
 // Check the wiki for a full description of the configuration:
 // https://github.com/YaLTeR/niri/wiki/Configuration:-Introduction
 
+hotkey-overlay {
+    skip-at-startup
+}
+
 // Input device configuration.
 // Find the full list of options on the wiki:
 // https://github.com/YaLTeR/niri/wiki/Configuration:-Input
@@ -117,35 +121,25 @@ input {
     // automatically.
     position x=1280 y=0
 }
-output "HDMI-A-1" {
+output "Acer Technologies KG272U TP1SA002851C" {
-    // Uncomment this line to disable this output.
+    mode "2560x1440"
-    // off
-
-    // Resolution and, optionally, refresh rate of the output.
-    // The format is "<width>x<height>" or "<width>x<height>@<refresh rate>".
-    // If the refresh rate is omitted, niri will pick the highest refresh rate
-    // for the resolution.
-    // If the mode is omitted altogether or is invalid, niri will pick one automatically.
-    // Run `niri msg outputs` while inside a niri instance to list all outputs and their modes.
-    mode "2560x1440@74.924"
-
-    // You can use integer or fractional scale, for example use 1.5 for 150% scale.
     scale 1
-
-    // Transform allows to rotate the output counter-clockwise, valid values are:
-    // normal, 90, 180, 270, flipped, flipped-90, flipped-180 and flipped-270.
     transform "90"
+    position x=0 y=0
+}
 
-    // Position of the output in the global coordinate space.
+output "ViewSonic Corporation VX2758-Series VVF190100000" {
-    // This affects directional monitor actions like "focus-monitor-left", and cursor movement.
+    mode "2560x1440"
-    // The cursor can only move between directly adjacent outputs.
+    scale 1
-    // Output scale and rotation has to be taken into account for positioning:
+    transform "normal"
-    // outputs are sized in logical, or scaled, pixels.
+    position x=1440 y=755
-    // For example, a 3840×2160 output with scale 2.0 will have a logical size of 1920×1080,
+    focus-at-startup
-    // so to put another output directly adjacent to it on the right, set its x to 1920.
+}
-    // If the position is unset or results in an overlap, the output is instead placed
+
-    // automatically.
+output "AU Optronics 0x583D Unknown" {
-    position x=0 y=-730
+    mode "1920x1080"
+    scale 1.25
+    transform "normal"
 }
 
 // Settings that influence how windows are positioned and sized.
@@ -181,7 +175,7 @@ layout {
     // preset-window-heights { }
 
     // You can change the default width of the new windows.
-    default-column-width { proportion 0.5; }
+    default-column-width { proportion 0.66667; }
     // If you leave the brackets empty, the windows themselves will decide their initial width.
     // default-column-width {}
 
@@ -307,14 +301,11 @@ layout {
 spawn-at-startup "waybar"
 spawn-at-startup "/home/danmac/.config/niri/sway_startup" "/home/danmac/Pictures/Nextcloud/IMG_8826-Enhanced-NR.jpg"
 spawn-at-startup "xwayland-satellite"
-spawn-at-startup "xrdb" "/home/danmac/.Xresources"
 spawn-at-startup "flatpak" "run" "com.nextcloud.desktopclient.nextcloud"
 spawn-at-startup "cosmic-app-library"
 
 environment {
     DISPLAY ":0"
-    XCURSOR_THEME "Pop"
-    XCURSOR_SIZE "24"
 }
 // Uncomment this line to ask the clients to omit their client-side decorations if possible.
 // If the client will specifically ask for CSD, the request will be honored.
@@ -348,13 +339,13 @@ animations {
 
 // Work around WezTerm's initial configure bug
 // by setting an empty default-column-width.
-window-rule {
+// window-rule {
     // This regular expression is intentionally made as specific as possible,
     // since this is the default config, and we want no false positives.
     // You can get away with just app-id="wezterm" if you want.
-    match app-id=r#"^org\.wezfurlong\.wezterm$"#
+    // match app-id=r#"^org\.wezfurlong\.wezterm$"#
-    default-column-width {}
+    // default-column-width { }
-}
+// }
 
 // Open the Firefox picture-in-picture player as floating by default.
 window-rule {
@@ -370,6 +361,14 @@ window-rule {
     open-floating true
 }
 
+window-rule {
+    // Zed and Zen should be 66% wide
+    match app-id="dev.zed.Zed"
+    match app-id="zen"
+
+    default-column-width { proportion 0.66667; }
+}
+
 // Example: block out two password managers from screen capture.
 // (This example rule is commented out with a "/-" in front.)
 /-window-rule {
@@ -409,8 +408,10 @@ binds {
     Mod+D hotkey-overlay-title="Open the COSMIC App Launcher" { spawn "cosmic-app-library"; }
     Mod+Shift+D hotkey-overlay-title="Run an Application: fuzzel" { spawn "fuzzel"; }
     Mod+B hotkey-overlay-title="Open the Default Browser" { spawn "xdg-open" "http://"; }
-    Super+Alt+L hotkey-overlay-title="Lock the Screen: swaylock" { spawn "swaylock"; }
+    Super+Alt+L hotkey-overlay-title="Lock the Screen: swaylock" { spawn "swaylock" "-f" "-i" "/usr/share/backgrounds/gnome/swoosh-l.jxl"; }
 
+    // toggle notification panel
+    Mod+Shift+N hotkey-overlay-title="Toggle notification window" { spawn "swaync-client" "-t"; }
     // You can also use a shell. Do this if you need pipes, multiple commands, etc.
     // Note: the entire command goes as a single argument in the end.
     // Mod+T { spawn "bash" "-c" "notify-send hello && exec alacritty"; }
@@ -588,6 +589,7 @@ binds {
     Mod+Shift+R { switch-preset-window-height; }
     Mod+Ctrl+R { reset-window-height; }
     Mod+F { maximize-column; }
+    Mod+G { reset-window-height; }
     Mod+Shift+F { fullscreen-window; }
 
     // Expand the focused column to space not taken up by other fully visible columns.

waybar/config.jsonc

@@ -117,8 +117,8 @@
             "critical": 15
         },
         "format": "{capacity}% {icon}",
-        "format-charging": "󱐋",
+        "format-charging": "{capacity}% 󱐋",
-        "format-plugged": "",
+        "format-plugged": "{capacity}% ",
         "format-alt": "{capacity}% {time}",
         "format-icons": ["", "", "", "", ""]
     },

wezterm/wezterm.lua

@@ -1,17 +1,17 @@
-local wezterm = require 'wezterm'
+local wezterm = require("wezterm")
 local c = {}
 
 -- Display Configuration
 
-c.font = wezterm.font 'NotoMono Nerd Font'
+c.font = wezterm.font("NotoMono Nerd Font")
-c.color_scheme = 'Catppuccin Macchiato'
+c.color_scheme = "Catppuccin Macchiato"
 c.window_background_opacity = 0.7
-c.window_decorations = 'RESIZE'
+c.window_decorations = "NONE"
 c.visual_bell = {
-  fade_in_function = 'EaseIn',
+	fade_in_function = "EaseIn",
-  fade_in_duration_ms = 150,
+	fade_in_duration_ms = 150,
-  fade_out_function = 'EaseOut',
+	fade_out_function = "EaseOut",
-  fade_out_duration_ms = 150,
+	fade_out_duration_ms = 150,
 }
 
 -- Tab Configuration
@@ -23,6 +23,6 @@ c.switch_to_last_active_tab_when_closing_tab = true
 
 -- Stop Confirming shit please
 
-c.window_close_confirmation = 'NeverPrompt'
+c.window_close_confirmation = "NeverPrompt"
 
 return c