diff --git a/home-manager/core/dotfiles.nix b/home-manager/core/dotfiles.nix
index d19eaf2..8f8d089 100644
--- a/home-manager/core/dotfiles.nix
+++ b/home-manager/core/dotfiles.nix
@@ -6,18 +6,11 @@
   pkgs,
   unstablePkgs,
   ...
-}: let
-  monaspaceFont = pkgs.callPackage ../../modules/monaspice_font.nix {};
-in {
+}: {
   home.file = {
     ".bashrc" = lib.mkIf (!config.programs.bash.enable) {
       source = ./dotfiles/dot_bashrc;
     };
-    "monaspice" = {
-      source = "${monaspaceFont}/share/fonts/";
-      target = ".local/share/fonts/";
-      recursive = true;
-    };
     "nushell" = {
       source = ./dotfiles/dot_config/nushell;
       target = ".config/nushell";
diff --git a/home-manager/core/packages.nix b/home-manager/core/packages.nix
index 7f460a4..00cda19 100644
--- a/home-manager/core/packages.nix
+++ b/home-manager/core/packages.nix
@@ -6,9 +6,7 @@
   pkgs,
   unstablePkgs,
   ...
-}: let
-  monaspaceFont = pkgs.callPackage ../../modules/monaspice_font.nix {};
-in {
+}: {
   home.packages =
     (with pkgs; [
       alejandra
@@ -22,8 +20,5 @@ in {
       lazygit
       nixd
       nushell
-    ])
-    ++ [
-      monaspaceFont
-    ];
+    ]);
 }
diff --git a/modules/monaspice_font.nix b/modules/monaspice_font.nix
deleted file mode 100644
index 78b7763..0000000
--- a/modules/monaspice_font.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  stdenv,
-  pkgs,
-}:
-stdenv.mkDerivation {
-  name = "monaspace-nerd-font";
-  src = pkgs.fetchurl {
-    url = "https://github.com/ryanoasis/nerd-fonts/releases/latest/download/Monaspace.tar.xz";
-    sha256 = "sha256-+uuQeCeioHrmTI+hpcpIzZ5gyQhKJMSNd5owz2vQaTo=";
-  };
-
-  unpackPhase = ''
-    mkdir -p $out/share/fonts/
-    chmod +rw $out/share/fonts/
-    tar -xf $src -C $out/share/fonts/
-  '';
-
-  installPhase = ''
-    find $out/share/fonts -name '*.ttf' -exec mv {} $out/share/fonts/truetype/ \;
-    find $out/share/fonts -name '*.otf' -exec mv {} $out/share/fonts/opentype/ \;
-  '';
-}
diff --git a/nixos/homeserver/configuration.nix b/nixos/homeserver/configuration.nix
index a3b2a7a..ea7ca03 100644
--- a/nixos/homeserver/configuration.nix
+++ b/nixos/homeserver/configuration.nix
@@ -165,8 +165,6 @@
       xcp
       zellij
       zoxide
-      monaspace
-      nerdfonts
       brotli
       gcc
       gnumake
@@ -263,5 +261,8 @@
     enableDefaultPackages = true;
     fontDir.enable = true;
     fontconfig.defaultFonts.monospace = ["MonaspiceArNerdFontMono"];
+    packages = with pkgs; [
+      nerdfonts
+    ];
   };
 }
diff --git a/nixos/worklaptop/theming.nix b/nixos/worklaptop/theming.nix
index 4a304c9..faf61c0 100644
--- a/nixos/worklaptop/theming.nix
+++ b/nixos/worklaptop/theming.nix
@@ -23,20 +23,21 @@
         monospace = ["MonaspiceArNerdFontMono"];
       };
     };
+
+    packages = with pkgs; [
+      corefonts
+      liberation_ttf
+      nerdfonts
+      nerd-font-patcher
+      noto-fonts
+      noto-fonts-color-emoji
+      vistafonts
+      winePackages.fonts
+    ];
   };
 
   # Theming packages
   environment.systemPackages = with pkgs; [
-    # fonts
-    corefonts
-    liberation_ttf
-    monaspace
-    nerdfonts
-    nerd-font-patcher
-    noto-fonts
-    noto-fonts-color-emoji
-    vistafonts
-    winePackages.fonts
     # Cursor
     hyprcursor
     # QT