diff --git a/hosts/desktop/configuration.nix b/hosts/desktop/configuration.nix
index dd8cf58..2a70c27 100644
--- a/hosts/desktop/configuration.nix
+++ b/hosts/desktop/configuration.nix
@@ -58,6 +58,8 @@
     liberation_ttf
     fira-code
     fira-code-symbols
-    (nerdfonts.override { fonts = [ "FiraCode" "JetBrainsMono" "Iosevka" ]; })
+    nerd-fonts.fira-code
+    nerd-fonts.jetbrains-mono
+    nerd-fonts.iosevka
   ];
 }
diff --git a/hosts/laptop/configuration.nix b/hosts/laptop/configuration.nix
index e4f7f78..63d3165 100644
--- a/hosts/laptop/configuration.nix
+++ b/hosts/laptop/configuration.nix
@@ -80,6 +80,8 @@
     liberation_ttf
     fira-code
     fira-code-symbols
-    (nerdfonts.override { fonts = [ "FiraCode" "JetBrainsMono" "Iosevka" ]; })
+    nerd-fonts.fira-code
+    nerd-fonts.jetbrains-mono
+    nerd-fonts.iosevka
   ];
 }
diff --git a/system/common.nix b/system/common.nix
index a1aef4f..729b5d4 100644
--- a/system/common.nix
+++ b/system/common.nix
@@ -26,7 +26,7 @@
   };
 
   # Enable sound
-  hardware.pulseaudio.enable = false;
+  services.pulseaudio.enable = false;
   security.rtkit.enable = true;
   services.pipewire = {
     enable = true;