diff --git a/home/alacritty.nix b/home/alacritty.nix
index aac7b1ff..f024392b 100644
--- a/home/alacritty.nix
+++ b/home/alacritty.nix
@@ -1,7 +1,6 @@
 { pkgs, catppuccin-themes, ... }:
 
 {
-  home.packages = [ (pkgs.nerdfonts.override { fonts = [ "FiraCode" ]; }) ];
   programs.alacritty = {
     enable = true;
     settings = {
@@ -16,7 +15,7 @@
         opacity = 0.8;
       };
       font = {
-        normal.family = "FiraCode Nerd Font";
+        normal.family = "Fira Sans Mono";
         size = 14.0;
       };
       selection.save_to_clipboard = true;
diff --git a/home/hyprland/dunst.nix b/home/hyprland/dunst.nix
index c5d2fc64..ecf1a34c 100644
--- a/home/hyprland/dunst.nix
+++ b/home/hyprland/dunst.nix
@@ -1,4 +1,4 @@
-{...}: {
+{ ... }: {
   services.dunst = {
     enable = true;
     settings = {
@@ -13,7 +13,7 @@
         indicate_hidden = "yes";
         transparency = 16;
         separator_color = "frame";
-        font = "FiraCode Nerd Font 10";
+        font = "Fira Sans Mono 10";
         ellipsize = "end";
         ignore_newline = "no";
         stack_duplicates = true;
diff --git a/home/hyprland/mako.nix b/home/hyprland/mako.nix
index 2bff44e6..2d421bfe 100644
--- a/home/hyprland/mako.nix
+++ b/home/hyprland/mako.nix
@@ -1,13 +1,12 @@
 { pkgs, ... }:
 
 {
-  home.packages = [ (pkgs.nerdfonts.override { fonts = [ "FiraCode" ]; }) ];
   services.mako = {
     enable = true;
     actions = true;
     anchor = "top-right";
     defaultTimeout = 5000;
-    font = "FiraCode Nerd Font 10";
+    font = "Fira Sans 10";
     icons = true;
     layer = "overlay";
     margin = "20";
diff --git a/home/hyprland/rofi/theme.rasi b/home/hyprland/rofi/theme.rasi
index 53e7348a..722909e3 100644
--- a/home/hyprland/rofi/theme.rasi
+++ b/home/hyprland/rofi/theme.rasi
@@ -10,7 +10,7 @@
     grey: #6e738d;
 
     width: 75%;
-    font: "FiraCode Nerd Font 18";
+    font: "Fira Sans Mono 18";
 }
 
 element-text, element-icon , mode-switcher {
diff --git a/home/hyprland/waybar/default.nix b/home/hyprland/waybar/default.nix
index e7a41f87..0a25e219 100644
--- a/home/hyprland/waybar/default.nix
+++ b/home/hyprland/waybar/default.nix
@@ -1,9 +1,5 @@
 { pkgs, ... }: {
-  home.packages = with pkgs; [
-    (nerdfonts.override { fonts = [ "FiraCode" ]; })
-    networkmanagerapplet
-    bluez
-  ];
+  home.packages = with pkgs; [ networkmanagerapplet bluez ];
   programs.waybar = {
     enable = true;
     style = ./style.css;