From 5fbd147cc40c6c6bbac6f3a8f08a32fc397de510 Mon Sep 17 00:00:00 2001 From: Dan MacLeod Date: Thu, 26 Jun 2025 14:01:04 +0930 Subject: [PATCH] Updated waybar fuzzel and niri configs for the laptop --- fuzzel/fuzzel.ini | 2 +- niri/config.kdl | 28 +++++++++++++++++++++++----- waybar/config.jsonc | 7 ++++--- waybar/icons/cachy-logo.svg | 1 + waybar/icons/logo.svg | 2 +- waybar/style.css | 2 ++ 6 files changed, 32 insertions(+), 10 deletions(-) create mode 100644 waybar/icons/cachy-logo.svg diff --git a/fuzzel/fuzzel.ini b/fuzzel/fuzzel.ini index bff56c3..615f04c 100644 --- a/fuzzel/fuzzel.ini +++ b/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 diff --git a/niri/config.kdl b/niri/config.kdl index d6b731b..d55422d 100644 --- a/niri/config.kdl +++ b/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" - // disabled-on-external-mouse + scroll-method "two-finger" + 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 @@ -282,6 +296,9 @@ layout { spawn-at-startup "swaybg" "-m" "fill" "-i" "/usr/share/backgrounds/gnome/swoosh-l.jxl" 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 "xrdb" "/home/danmac/.Xresources" +spawn-at-startup "flatpak" "run" "com.nextcloud.desktopclient.nextcloud" +spawn-at-startup "cosmic-app-library" environment { DISPLAY ":0" @@ -384,7 +401,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"; } diff --git a/waybar/config.jsonc b/waybar/config.jsonc index 1b0da6d..53cb1ed 100644 --- a/waybar/config.jsonc +++ b/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,7 +116,7 @@ "warning": 30, "critical": 15 }, - "format": "{icon}", + "format": "{capacity}% {icon}", "format-charging": "󱐋", "format-plugged": "", "format-alt": "{capacity}% {time}", diff --git a/waybar/icons/cachy-logo.svg b/waybar/icons/cachy-logo.svg new file mode 100644 index 0000000..7dd8384 --- /dev/null +++ b/waybar/icons/cachy-logo.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/waybar/icons/logo.svg b/waybar/icons/logo.svg index 1418deb..f9eb63b 120000 --- a/waybar/icons/logo.svg +++ b/waybar/icons/logo.svg @@ -1 +1 @@ -pika-logo.svg \ No newline at end of file +cachy-logo.svg \ No newline at end of file diff --git a/waybar/style.css b/waybar/style.css index 05002d2..b3bf182 100644 --- a/waybar/style.css +++ b/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;