Update some more symbols and spacing (waybar and starship)

home/starship/default.nix

@@ -3,7 +3,6 @@
     enable = true;
     enableTransience = true;
     settings = {
-      c = {symbol = " ";};
       command_timeout = 1000;
       container = {symbol = " ";};
       add_newline = false;
@@ -14,50 +13,46 @@
       directory = {
         truncation_length = 2;
         fish_style_pwd_dir_length = 1;
-        read_only = "󰉐 ";
+        read_only = " ";
         truncate_to_repo = false;
       };
       line_break.disabled = false;
       git_branch = {
-        symbol = " ";
+        symbol = " ";
         only_attached = true;
         ignore_branches = ["master" "main"];
       };
       git_commit = {
-        format = "[󰜘 $hash | $tag]($style) ";
-        tag_symbol = "󰓹 ";
+        format = "[  $hash | $tag]($style) ";
+        tag_symbol = " ";
         tag_disabled = false;
       };
       git_metrics.disabled = false;
       git_status = {
-        stashed = "󰁯 ";
-        ahead = "󰁝 ";
-        behind = "󰁅 ";
+        stashed = " ";
+        ahead = " ";
+        behind = " ";
         up_to_date = "";
-        diverged = "󰹹 ";
-        conflicted = "󰦎 ";
-        deleted = " ";
-        renamed = " ";
-        modified = " ";
-        staged = " ";
-        untracked = " ";
-        typechanged = " ";
+        diverged = " ";
+        conflicted = " ";
+        deleted = " ";
+        renamed = " ";
+        modified = " ";
+        staged = " ";
+        untracked = " ";
+        typechanged = " ";
       };
-      golang = {symbol = " ";};
-      guix_shell = {symbol = " ";};
-      haskell = {symbol = " ";};
       hostname = {
         ssh_only = true;
-        ssh_symbol = "󰢹 ";
+        ssh_symbol = " ";
       };
-      java = {symbol = " ";};
       localip = {disabled = false;};
       lua = {symbol = " ";};
       memory_usage = {
         disabled = false;
-        symbol = "󰍛 ";
+        symbol = " ";
       };
-      nix_shell.symbol = "󱄅 ";
+      nix_shell.symbol = " ";
       os = {
         disabled = false;
         format = "on [$symbol]($style) ";
@@ -76,7 +71,6 @@
           Linux = " ";
           Macos = " ";
           Manjaro = " ";
-          Mint = "󰣭 ";
           NixOS = " ";
           OpenBSD = " ";
           openSUSE = " ";
@@ -91,31 +85,20 @@
           Windows = " ";
         };
       };
-      package = {symbol = "󰏗 ";};
+      package = {symbol = " ";};
       python = {
-        symbol = "󰌠 ";
+        symbol = " ";
         python_binary = "python3";
       };
-      rust = {symbol = "󱘗 ";};
+      rust = {symbol = " ";};
       shell = {
         disabled = false;
         format = "using [$indicator ]($style)";
         nu_indicator = "ν";
       };
-      status = {
-        disabled = false;
-        map_symbol = true;
-        pipestatus = true;
-        symbol = "󰙧 ";
-        success_symbol = "";
-        not_executable_symbol = "󰂭 ";
-        not_found_symbol = "󰍉 ";
-        sigint_symbol = "󰟾 ";
-        signal_symbol = "󱐋 ";
-      };
       sudo = {
         disabled = false;
-        symbol = "󰪋 ";
+        symbol = " ";
       };
     };
   };

home/waybar/default.nix

@@ -35,21 +35,10 @@
       # Module config
       "hyprland/window" = {
         "format" = "{title}";
-        # TODO workspace rewrites
         "rewrite" = {
-          "(.*) - GNU Emacs at (.*)" = "  $1 [$2]";
-          "(Alacritty.*)" = "  $1";
-          "(.*) - mpv" = "  $1";
-          "(btm)" = "  Resource Usage [$1]";
-          "(cava)" = "  Music Visualiser [$1]";
-          "(.*) - Thunar" = "  $1";
-          "Nyxt - (.*)" = "  $1";
-          "Mozilla Firefox" = "  $1";
-          "(.*) — Mozilla Firefox" = "  $1";
-          "((?:.*)WebCord.*)" = "  $1";
-          "(Signal.*)" = "  $1";
-          "(WhatsApp for Linux.*)" = "  $1";
-          "([Ss]team)" = "  $1";
+          "(Alacritty.*)" = "  $1";
+          "(btm)" = "Resource Usage [$1]";
+          "(cava)" = "Music Visualiser [$1]";
         };
         "separate-outputs" = true;
       };
@@ -67,19 +56,16 @@
           "4" = [];
           "5" = [];
           "6" = [];
+          "7" = [];
+          "8" = [];
+          "9" = [];
         };
       };
       mpris = {
-        "format" = "> {player_icon} {player}";
+        "format" = "  {player}";
         "tooltip-format" = "{player_icon} ({player}) {dynamic}";
         "interval" = 1;
         "dynamic-order" = ["album" "artist" "title" "position" "length"];
-        "player-icons" = {
-          "default" = " ";
-          "emms" = " ";
-          "firefox" = " ";
-          "mpv" = " ";
-        };
         "status-icons" = {
           "playing" = " ";
           "paused" = " ";
@@ -89,7 +75,7 @@
       };
       pulseaudio = {
         scroll-step = 5;
-        format = "{format_source} {icon}{volume}%";
+        format = "{format_source} {icon} {volume}%";
         format-muted = "{format_source}  ";
         format-source = " ";
         format-source-muted = " ";
@@ -162,7 +148,7 @@
         swaync = pkgs.swaynotificationcenter;
       in {
         "tooltip" = false;
-        "format" = "{icon}{}";
+        "format" = "{icon} {}";
         "format-icons" = {
           "notification" = " ";
           "none" = " ";