diff --git a/modules/nixos/common/fonts/default.nix b/modules/nixos/common/fonts/default.nix
index 7c7a9d7..3284cc9 100644
--- a/modules/nixos/common/fonts/default.nix
+++ b/modules/nixos/common/fonts/default.nix
@@ -12,7 +12,7 @@ in {
     enable = mkEnableOption "Enable system font management";
     fonts = mkOption {
       type = listOf package;
-      default = with pkgs; [ noto-fonts noto-fonts-cjk-sans noto-fonts-cjk-serif noto-fonts-emoji nerdfonts ];
+      default = with pkgs; [ noto-fonts noto-fonts-cjk-sans noto-fonts-cjk-serif noto-fonts-emoji nerd-fonts.bigblue-terminal nerd-fonts.zed-mono monocraft ];
       example = [ noto-fonts noto-fonts-emoji ];
       description = "Install additional font packages";
     };
diff --git a/systems/x86_64-linux/puzzlevision/default.nix b/systems/x86_64-linux/puzzlevision/default.nix
index 609ce1f..741689d 100644
--- a/systems/x86_64-linux/puzzlevision/default.nix
+++ b/systems/x86_64-linux/puzzlevision/default.nix
@@ -52,12 +52,18 @@
   # Set system configuration
   puzzlevision = {
     archetypes.workstation.enable = true;
-    security.yubikey.enable = true;
+    security.yubikey = {
+        enable = true;
+        enable-agent = true;
+    };
   };
 
   # Enable flatpak support.
   services.flatpak.enable = true;
 
+  # Set trusted users (Primarily used for cachix)
+  nix.settings.trusted-users = [ "root" "jo" ];
+
   # Configure users.
   snowfallorg.users.jo.admin = true;
   users.users.jo.isNormalUser = true;