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

@@ -28,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"
+        scroll-method "two-finger"
-        // disabled-on-external-mouse
+        disabled-on-external-mouse
+        click-method "clickfinger"
     }
 
     mouse {
@@ -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
@@ -155,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 {}
 
@@ -278,10 +298,11 @@ 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 "waybar"
-spawn-at-startup "swaybg" "-m" "fill" "-i" "/usr/share/backgrounds/gnome/swoosh-l.jxl"
+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 "swayidle" "-w" "timeout" "601" "niri msg action power-off-monitors" "timeout" "600" "swaylock -f -i /usr/share/backgrounds/gnome/swoosh-l.jxl" "before-sleep" "swaylock -f -i /usr/share/backgrounds/gnome/swoosh-l.jxl"
+spawn-at-startup "flatpak" "run" "com.nextcloud.desktopclient.nextcloud"
+spawn-at-startup "cosmic-app-library"
 
 environment {
     DISPLAY ":0"
@@ -323,7 +344,7 @@ animations {
     // 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$"#
-    // default-column-width {}
+    // default-column-width { }
 // }
 
 // Open the Firefox picture-in-picture player as floating by default.
@@ -384,7 +405,8 @@ 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://"; }
     Super+Alt+L hotkey-overlay-title="Lock the Screen: swaylock" { spawn "swaylock" "-f" "-i" "/usr/share/backgrounds/gnome/swoosh-l.jxl"; }
 

waybar/config.jsonc

@@ -1,6 +1,6 @@
 {
     "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": 36, // Waybar height (to be removed for auto height)
     // Choose the order of the modules
@@ -27,6 +27,7 @@
         "cpu",
         "memory",
         "temperature",
+        "battery",
         "custom/pl-stats",
         "pulseaudio",
         "custom/pl-pulse",
@@ -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": "{capacity}% {icon}",
-        "format-charging": "󱐋",
+        "format-charging": "{capacity}% 󱐋",
-        "format-plugged": "",
+        "format-plugged": "{capacity}% ",
         "format-alt": "{capacity}% {time}",
         "format-icons": ["", "", "", "", ""]
     },

waybar/icons/logo.svg

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

waybar/style.css

@@ -43,6 +43,7 @@
 #clock,
 #idle_inhibitor,
 #cpu,
+#battery,
 #memory,
 #temperature,
 #pulseaudio,
@@ -149,6 +150,7 @@
 
 #cpu,
 #memory,
+#battery,
 #temperature {
   background: @peach;
   padding: 0px 6px;

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