diff --git a/modules/desktop/addons/alacritty/default.nix b/modules/desktop/addons/alacritty/default.nix
index 4384bf9..7099414 100644
--- a/modules/desktop/addons/alacritty/default.nix
+++ b/modules/desktop/addons/alacritty/default.nix
@@ -13,7 +13,7 @@ in {
   };
 
   config = mkIf cfg.enable {
-    aa.desktop.addons.fonts.enable = true;
+    aa.system.fonts.enable = true;
 
     # alacritty won't start without opengl
     hardware.opengl.enable = true;
diff --git a/modules/desktop/addons/mako/default.nix b/modules/desktop/addons/mako/default.nix
index 4364666..1387f2e 100644
--- a/modules/desktop/addons/mako/default.nix
+++ b/modules/desktop/addons/mako/default.nix
@@ -13,7 +13,7 @@ in {
   };
 
   config = mkIf cfg.enable {
-    aa.desktop.addons.fonts.enable = true;
+    aa.system.fonts.enable = true;
 
     environment.systemPackages = with pkgs; [mako libnotify];
 
diff --git a/modules/desktop/addons/waybar/default.nix b/modules/desktop/addons/waybar/default.nix
index 1b313ee..87a1d7a 100644
--- a/modules/desktop/addons/waybar/default.nix
+++ b/modules/desktop/addons/waybar/default.nix
@@ -13,7 +13,7 @@ in {
   };
 
   config = mkIf cfg.enable {
-    aa.desktop.addons.fonts.enable = true;
+    aa.system.fonts.enable = true;
 
     aa.home = {
       extraOptions = {
@@ -77,7 +77,7 @@ in {
               };
 
               cpu = {
-                format = "{usage}%  ";
+                format = "{usage}%  ";
                 tooltip = false;
               };
 
@@ -129,8 +129,8 @@ in {
               };
 
               network = {
-                format-wifi = "直 ";
-                format-ethernet = "{ifname}: {ipaddr}/{cidr}  ";
+                format-wifi = "  ";
+                format-ethernet = "{ifname}: {ipaddr}/{cidr} 󰈀 ";
                 format-linked = "{ifname} (No IP)  ";
                 format-disconnected = "睊 ";
                 format-alt = "{ifname}: {ipaddr}/{cidr}";
diff --git a/modules/desktop/sway/default.nix b/modules/desktop/sway/default.nix
index 818a952..d53b822 100644
--- a/modules/desktop/sway/default.nix
+++ b/modules/desktop/sway/default.nix
@@ -35,7 +35,6 @@ in {
   config = mkIf cfg.enable {
     aa.desktop.addons = {
       alacritty.enable = true;
-      fonts.enable = true;
       gammastep.enable = true;
       mako.enable = true;
       playerctl.enable = true;
@@ -49,6 +48,8 @@ in {
       # pamixer
     };
 
+    aa.system.fonts.enable = true;
+
     environment.systemPackages = with pkgs; [wl-clipboard];
 
     aa.home.dataFile = {
diff --git a/modules/desktop/addons/fonts/default.nix b/modules/system/fonts/default.nix
similarity index 72%
rename from modules/desktop/addons/fonts/default.nix
rename to modules/system/fonts/default.nix
index 9260b5b..8c2e14a 100644
--- a/modules/desktop/addons/fonts/default.nix
+++ b/modules/system/fonts/default.nix
@@ -6,9 +6,9 @@
   ...
 }:
 with lib; let
-  cfg = config.aa.desktop.addons.fonts;
+  cfg = config.aa.system.fonts;
 in {
-  options.aa.desktop.addons.fonts = with types; {
+  options.aa.system.fonts = with types; {
     enable = mkEnableOption "manage fonts";
   };
 
diff --git a/systems/x86_64-linux/carbon/default.nix b/systems/x86_64-linux/carbon/default.nix
index b533b62..7302a9d 100644
--- a/systems/x86_64-linux/carbon/default.nix
+++ b/systems/x86_64-linux/carbon/default.nix
@@ -33,10 +33,6 @@
 
   time.timeZone = "America/Los_Angeles";
 
-  fonts.fonts = with pkgs; [
-    (nerdfonts.override {fonts = ["Hack"];})
-  ];
-
   # List packages installed in system profile. To search, run:
   # $ nix search wget
   environment.systemPackages = with pkgs; [