Finalised tweaks to waybar niri and wezterm

fuzzel/fuzzel.ini

@@ -24,7 +24,7 @@ font=NotoSans Nerd Font
 # x-margin=0
 # y-margin=0
 # lines=15
-width=80
+width=40
 # tabs=8
 # horizontal-pad=40
 # vertical-pad=8

niri/config.kdl

@@ -4,7 +4,6 @@
 // https://github.com/YaLTeR/niri/wiki/Configuration:-Introduction
 
 hotkey-overlay {
-    // Skip showing the hotkeys
     skip-at-startup
 }
 
@@ -29,17 +28,18 @@ input {
     // Next sections include libinput settings.
     // Omitting settings disables them, or leaves them at their default values.
     touchpad {
-        off
+        // off
         // tap
         // dwt
         // dwtp
         // drag false
         // drag-lock
-        // natural-scroll
+        natural-scroll
         // accel-speed 0.2
         // accel-profile "flat"
-        // scroll-method "two-finger"
-        // disabled-on-external-mouse
+        scroll-method "two-finger"
+        disabled-on-external-mouse
+        click-method "clickfinger"
     }
 
     mouse {
@@ -52,6 +52,7 @@ input {
 
     trackpoint {
         // off
+
         // natural-scroll
         // accel-speed 0.2
         // accel-profile "flat"
@@ -60,6 +61,18 @@ input {
         // middle-emulation
     }
 
+    touch {
+        // off
+        map-to-output "eDP-1"
+    }
+
+    tablet {
+        // off
+        map-to-output "eDP-1"
+        // left-handed
+        // calibration-matrix 1.0 0.0 0.0 0.0 1.0 0.0
+    }
+
     // Uncomment this to make the mouse warp to the center of newly focused windows.
     warp-mouse-to-focus
 
@@ -69,6 +82,7 @@ input {
 
     // Change the Mod key to Alt
     mod-key "Alt"
+    mod-key-nested "Super"
 }
 
 // You can configure outputs by their name, which you can find
@@ -122,6 +136,12 @@ output "ViewSonic Corporation VX2758-Series VVF190100000" {
     focus-at-startup
 }
 
+output "AU Optronics 0x583D Unknown" {
+    mode "1920x1080"
+    scale 1.25
+    transform "normal"
+}
+
 // Settings that influence how windows are positioned and sized.
 // Find more information on the wiki:
 // https://github.com/YaLTeR/niri/wiki/Configuration:-Layout
@@ -145,20 +165,17 @@ layout {
         proportion 0.33333
         proportion 0.5
         proportion 0.66667
+        proportion 1.0
 
         // Fixed sets the width in logical pixels exactly.
         // fixed 1920
     }
 
     // You can also customize the heights that "switch-preset-window-height" (Mod+Shift+R) toggles between.
-    preset-window-heights {
-        proportion 0.333333
-        proportion 0.5
-        proportion 0.666667
-    }
+    // 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 {}
 
@@ -281,9 +298,10 @@ layout {
 // See the binds section below for more spawn examples.
 
 // This line starts waybar, a commonly used bar for Wayland compositors.
-// spawn-at-startup "waybar"
-spawn-at-startup "/home/danmac/.config/niri/sway_startup" "/home/danmac/Pictures/Nextcloud/IMG_8409-Enhanced-NR.jpg"
-// spawn-at-startup "xwayland-satellite"
+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 "flatpak" "run" "com.nextcloud.desktopclient.nextcloud"
 spawn-at-startup "cosmic-app-library"
 
 environment {
@@ -343,11 +361,6 @@ window-rule {
     open-floating true
 }
 
-window-rule {
-    match app-id=r#"org.pulseaudio.pavucontrol"#
-    default-column-width { proportion 0.333333; }
-}
-
 window-rule {
     // Zed and Zen should be 66% wide
     match app-id="dev.zed.Zed"
@@ -356,26 +369,6 @@ window-rule {
     default-column-width { proportion 0.66667; }
 }
 
-window-rule {
-    // Solve space property manager
-    match app-id="solvespace"
-
-    default-column-width { proportion 0.75; }
-}
-
-window-rule {
-    // Solve space property manager
-    match title="Property Browser — SolveSpace"
-
-    default-column-width { proportion 0.25; }
-}
-
-window-rule {
-    // Nautilus open file window
-    match app-id="org.gnome.Nautilus" title="Open Folder"
-    open-floating true
-}
-
 // Example: block out two password managers from screen capture.
 // (This example rule is commented out with a "/-" in front.)
 /-window-rule {
@@ -412,11 +405,10 @@ binds {
 
     // Suggested binds for running programs: terminal, app launcher, screen locker.
     Mod+T hotkey-overlay-title="Open a Terminal: wezterm" { spawn "wezterm"; }
-    Mod+D hotkey-overlay-title="Run an Application: cosmic-apps" { spawn "cosmic-app-library"; }
+    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://"; }
-    Mod+X hotkey-overlay-title="Open the Default File Manager" { spawn "xdg-open" "/home/danmac/"; }
-    Super+Alt+L hotkey-overlay-title="Lock the Screen: swaylock" { spawn "swaylock" "-f" "-i" "/tmp/blurred_IMG_8618-Enhanced-NR.jpg"; }
+    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"; }
@@ -431,8 +423,6 @@ binds {
     XF86AudioMute        allow-when-locked=true { spawn "wpctl" "set-mute" "@DEFAULT_AUDIO_SINK@" "toggle"; }
     XF86AudioMicMute     allow-when-locked=true { spawn "wpctl" "set-mute" "@DEFAULT_AUDIO_SOURCE@" "toggle"; }
     XF86AudioPlay        allow-when-locked=true { spawn "playerctl" "play-pause"; }
-    XF86AudioPrev        allow-when-locked=true { spawn "playerctl" "previous"; }
-    XF86AudioNext        allow-when-locked=true { spawn "playerctl" "next"; }
 
     // Open/close the Overview: a zoomed-out view of workspaces and windows.
     // You can also move the mouse into the top-left hot corner,
@@ -577,21 +567,12 @@ binds {
     Mod+Shift+7 { move-column-to-workspace 7; }
     Mod+Shift+8 { move-column-to-workspace 8; }
     Mod+Shift+9 { move-column-to-workspace 9; }
-    Mod+Ctrl+1 { move-window-to-workspace 1; }
-    Mod+Ctrl+2 { move-window-to-workspace 2; }
-    Mod+Ctrl+3 { move-window-to-workspace 3; }
-    Mod+Ctrl+4 { move-window-to-workspace 4; }
-    Mod+Ctrl+5 { move-window-to-workspace 5; }
-    Mod+Ctrl+6 { move-window-to-workspace 6; }
-    Mod+Ctrl+7 { move-window-to-workspace 7; }
-    Mod+Ctrl+8 { move-window-to-workspace 8; }
-    Mod+Ctrl+9 { move-window-to-workspace 9; }
 
     // Alternatively, there are commands to move just a single window:
     // Mod+Ctrl+1 { move-window-to-workspace 1; }
 
     // Switches focus between the current and the previous workspace.
-    Mod+Tab { focus-workspace-previous; }
+    // Mod+Tab { focus-workspace-previous; }
 
     // The following binds move the focused window in and out of a column.
     // If the window is alone, they will consume it into the nearby column to the side.

waybar/config.jsonc

@@ -1,8 +1,8 @@
 {
     "layer": "top", // Waybar at top layer
-    "output": "DP-1", // Only display on on monitor
+    "output": ["eDP-1", "DP-1"], // Only display on on monitor
     "position": "top", // Waybar position (top|bottom|left|right)
-    "height": 28, // Waybar height (to be removed for auto height)
+    "height": 36, // Waybar height (to be removed for auto height)
     // Choose the order of the modules
     "modules-left": [
         "custom/logo",
@@ -27,6 +27,7 @@
         "cpu",
         "memory",
         "temperature",
+        "battery",
         "custom/pl-stats",
         "pulseaudio",
         "custom/pl-pulse",
@@ -41,7 +42,7 @@
     },
     "wlr/taskbar": {
         "active-first": true,
-        "icon-size": 20,
+        "icon-size": 24,
         "on-click": "activate",
         "on-click-middle": "close",
         "app_ids-mapping": {
@@ -58,7 +59,7 @@
         }
     },
     "tray": {
-        "icon-size": 20,
+        // "icon-size": 21,
         "spacing": 10
     },
     "clock": {
@@ -91,7 +92,7 @@
         "on-click-right": "exec wezterm -e btm"
     },
     "memory": {
-        "format": "{percentage}% / {used:0.1f}GiB / {avail:0.1f}GiB ",
+        "format": "{percentage}% / {used:0.1f}GiB ",
         "on-click-right": "exec wezterm -e btm"
     },
     "temperature": {
@@ -115,9 +116,9 @@
             "warning": 30,
             "critical": 15
         },
-        "format": "{icon}",
-        "format-charging": "󱐋",
-        "format-plugged": "",
+        "format": "{capacity}% {icon}",
+        "format-charging": "{capacity}% 󱐋",
+        "format-plugged": "{capacity}% ",
         "format-alt": "{capacity}% {time}",
         "format-icons": ["", "", "", "", ""]
     },

waybar/icons/logo.svg

@@ -1 +1 @@
-pika-logo.svg
+cachy-logo.svg

waybar/style.css

@@ -12,7 +12,6 @@
 #waybar {
   background-color: alpha(@base, 0.7);
   /* background: transparent; */
-  margin: 0px;
 }
 
 #custom-logo {
@@ -20,7 +19,7 @@
   background-color: @base;
   background-position: center;
   background-repeat: no-repeat;
-  background-size: 40%;
+  background-size: 24px;
   padding: 0px 8px 0px 24px;
 }
 
@@ -35,7 +34,7 @@
 #custom-pl-pulse,
 #custom-pl-idle-before,
 #custom-pl-tray {
-  font-size: 21px;
+  font-size: 26px;
 }
 
 #workspaces *,
@@ -44,6 +43,7 @@
 #clock,
 #idle_inhibitor,
 #cpu,
+#battery,
 #memory,
 #temperature,
 #pulseaudio,
@@ -150,6 +150,7 @@
 
 #cpu,
 #memory,
+#battery,
 #temperature {
   background: @peach;
   padding: 0px 6px;

wezterm/wezterm.lua

@@ -1,16 +1,16 @@
-local wezterm = require 'wezterm'
+local wezterm = require("wezterm")
 local c = {}
 
 -- Display Configuration
 
-c.font = wezterm.font 'NotoMono Nerd Font'
-c.color_scheme = 'Catppuccin Macchiato'
+c.font = wezterm.font("NotoMono Nerd Font")
+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_out_function = 'EaseOut',
+	fade_out_function = "EaseOut",
 	fade_out_duration_ms = 150,
 }
 
@@ -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