maple mono, fix waybar spacing

flake.lock

···
         ]
       },
       "locked": {
-        "lastModified": 1770476834,
-        "narHash": "sha256-cyxgVsNfHnJ4Zn6G1EOzfTXbjTy7Ds9zMOsZaX7VZWs=",
+        "lastModified": 1770491427,
+        "narHash": "sha256-8b+0vixdqGnIIcgsPhjdX7EGPdzcVQqYxF+ujjex654=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "6cee0821577643e0b34e2c5d9a90d0b1b5cdca70",
+        "rev": "cbd8a72e5fe6af19d40e2741dc440d9227836860",
         "type": "github"
       },
       "original": {
···
         "xwayland-satellite-unstable": "xwayland-satellite-unstable"
       },
       "locked": {
-        "lastModified": 1770400632,
-        "narHash": "sha256-TsOt49sYfzmxSTj2wKHKK2ZToCByLJLxPbwbu1brDt0=",
+        "lastModified": 1770493836,
+        "narHash": "sha256-UPG9xFnVkqHF5e2GOucQO8BXXzwp8BwwON2g+WBXLMA=",
         "owner": "sodiboo",
         "repo": "niri-flake",
-        "rev": "652dbeb0ac2c481dee5b57be972c6fd6feb38adc",
+        "rev": "a17befde0c0ca25617fb3da505294deb45cef170",
         "type": "github"
       },
       "original": {
···
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1770136044,
-        "narHash": "sha256-tlFqNG/uzz2++aAmn4v8J0vAkV3z7XngeIIB3rM3650=",
+        "lastModified": 1770464364,
+        "narHash": "sha256-z5NJPSBwsLf/OfD8WTmh79tlSU8XgIbwmk6qB1/TFzY=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "e576e3c9cf9bad747afcddd9e34f51d18c855b4e",
+        "rev": "23d72dabcb3b12469f57b37170fcbc1789bd7457",
         "type": "github"
       },
       "original": {

homeModules/waybar.nix

···
           settings = [
             {
               battery = {
-                format = "{icon} {capacity}󰏰";
-                format-charging = "{icon} {capacity}󰏰";
+                format = "{icon}{capacity}%";
+                format-charging = "{icon}{capacity}%";
                 format-icons = {
                   charging = [
                     "󰢜"
···
               bluetooth = {
                 format = "󰂯";
                 format-connected = "󰂱";
-                format-connected-battery = "󰂱 {device_battery_percentage}󰏰";
+                format-connected-battery = "󰂱 {device_battery_percentage}%";
                 format-disabled = "󰂲";
                 format-off = "󰂲";
                 on-click-right = "rfkill toggle bluetooth";
···
                 tooltip-disconnected = "Disconnected";
                 tooltip-format = "{ifname} via {gwaddr}";
                 tooltip-format-ethernet = "󱎔 {ifname}";
-                tooltip-format-wifi = "Connected to {essid} ({signalStrength}󰏰 Strength) over {ifname} via {gwaddr}";
+                tooltip-format-wifi = "Connected to {essid} ({signalStrength}% Strength) over {ifname} via {gwaddr}";
               };
               position = "top";
               privacy = {
···
                 transition-duration = 200;
               };
               pulseaudio = {
-                format = "{icon} {volume:2}󰏰";
-                format-bluetooth = "{icon}  {volume}󰏰";
+                format = "{icon} {volume:2}%";
+                format-bluetooth = "{icon} {volume}%";
                 format-icons = {
                   car = "";
                   default = [
···
                 title-len = 35;
               };
               cpu = {
-                format = "󰍛 {usage}󰏰";
+                format = "󰍛 {usage}%";
                 states = {
                   critical = 95;
                   warning = 80;
···
               };
               layer = "top";
               memory = {
-                format = " {}󰏰 ({used:0.1f}/{total:0.1f} GiB)";
+                format = " {}% ({used:0.1f}/{total:0.1f} GiB)";
                 states = {
                   critical = 90;
                   warning = 70;
···
               position = "bottom";
               temperature = {
                 critical-threshold = 80;
-                format = "{icon} {temperatureC} °C";
-                format-critical = "{icon}! {temperatureC} °C";
+                format = "{icon} {temperatureC}°C";
+                format-critical = "{icon}! {temperatureC}°C";
                 format-icons = [
                   "󱃃"
                   "󰔏"

nixosModules/fonts.nix

···
       enableDefaultPackages = true;
       packages = with pkgs; [
         fira-code
-        # fira-go
+        maple-mono.NF-CN
         noto-fonts
-        noto-fonts-lgc-plus
-        noto-fonts-cjk-sans
-        noto-fonts-cjk-serif
-        nerd-fonts.symbols-only
-        noto-fonts-color-emoji
-        corefonts
-        unifont
-        liberation_ttf
       ];
       fontconfig = {
         enable = true;
         defaultFonts = {
           serif = [
             "Noto Serif"
-            "Symbols Nerd Font"
           ];
           sansSerif = [
             "FiraGO"
-            "Symbols Nerd Font"
           ];
           monospace = [
-            "Fira Code"
-            "Symbols Nerd Font"
+            "Maple Mono NF CN"
           ];
           emoji = [
             "Noto Color Emoji"
-            "Symbols Nerd Font"
           ];
         };
       };

res/bat_display.nu

···
     $icons | get "default" | get $idx
 }
 
-echo $" | ($icon) ($percent)󰏰"
+echo $" | ($icon) ($percent)%"

res/custom_waybar_modules/kdeconnect.nu

···
         });
 
         let percent = if $battery_info.charge? != null and $battery_info.charge != -1 {
-            $" ($battery_info.charge)󰏰"
+            $" ($battery_info.charge)%"
         } else { "" };
 
         {

res/custom_waybar_modules/weather.nu

···
 
     let icon = get_icon $condition $night
 
-    let text = $"($icon) ($current_condition.temp_F) °F"
+    let text = $"($icon) ($current_condition.temp_F)°F"
     let tooltip = [
         $condition,
         $"Temperature: ($current_condition.temp_F) °F",

res/waybar.css

···
 @import "catppuccin.css";
 
 * {
-  font-family: sans-serif;
+  font-family: monospace;
 }
 
 window#waybar {
···
 #mpris.paused.kdeconnect {
   opacity: 0;
 }
+
+
+/* Some fixes for icon spacing */
+
+#custom-notification {
+  padding: 0 1em 0 .9em;
+}
+
+#idle_inhibitor {
+  padding: 0 1em 0 .7em;
+}
+
+#power-profiles-daemon {
+  padding: 0 1em 0 .8em;
+}
+
+
+
+