diff --git a/home/lsd.nix b/home/lsd.nix
index 71971a7..2d3c247 100644
--- a/home/lsd.nix
+++ b/home/lsd.nix
@@ -1,6 +1,6 @@
 { ... }: {
   programs.lsd = {
     enable = true;
-    enableAliases = true;
+    enableZshIntegration = true;
   };
 }
diff --git a/home/zsh.nix b/home/zsh.nix
index f50c52d..9a2b296 100644
--- a/home/zsh.nix
+++ b/home/zsh.nix
@@ -35,7 +35,7 @@
       GOROOT = "$HOME/go";
       PATH = "$PATH:$HOME/.cargo/bin:$GOROOT/bin:$GOPATH/bin";
     };
-    initExtra = ''
+    initContent = ''
       [ -f $HOME/.nix-profile/etc/profile.d/nix.sh ] && . $HOME/.nix-profile/etc/profile.d/nix.sh
       source ${pkgs.antigen}/share/antigen/antigen.zsh
       # TODO: remove on NixOS
diff --git a/machines/common.nix b/machines/common.nix
index ace13b7..bd7762c 100644
--- a/machines/common.nix
+++ b/machines/common.nix
@@ -31,12 +31,6 @@ inputs:
   hardware = {
     # TODO: remove
     enableAllFirmware = true;
-    #pulseaudio = {
-      # TODO: pipewire
-      #enable = true;
-      # stop mumble from muting other processes
-      #extraConfig = "unload-module module-role-cork";
-    #};
     graphics = {
       enable = true;
       # driSupport = true;
@@ -143,7 +137,6 @@ inputs:
     gvfs
 
     # yubikey packages
-    yubikey-manager-qt
     yubikey-personalization-gui
     yubioath-flutter
   ];
@@ -170,10 +163,10 @@ inputs:
   virtualisation.libvirtd.enable = false;
   programs.virt-manager.enable = false;
   #dconf.settings = {
-    #"org/virt-manager/virt-manager/connections" = {
-      #autoconnect = ["qemu:///system"];
-      #uris = ["qemu:///system"];
-    #};
+  #"org/virt-manager/virt-manager/connections" = {
+  #autoconnect = ["qemu:///system"];
+  #uris = ["qemu:///system"];
+  #};
   #};
 
 
@@ -194,7 +187,7 @@ inputs:
 
   environment.sessionVariables = {
     XKB_DEFAULT_OPTIONS = "caps:escape";
-    XKB_DEFAULT_LAYOUT  = "eu";
+    XKB_DEFAULT_LAYOUT = "eu";
   };
 
   # required for i3
@@ -204,13 +197,14 @@ inputs:
     enableDefaultPackages = true;
     packages = with pkgs; [
       font-awesome
-      nerdfonts
       noto-fonts
       noto-fonts-cjk-sans
       noto-fonts-emoji
       powerline-fonts
       material-icons
-    ];
+    ]
+    # TODO: only install selected/needed fonts
+    ++ builtins.filter lib.attrsets.isDerivation (builtins.attrValues pkgs.nerd-fonts);
     fontconfig = {
       defaultFonts = {
         monospace = [ "JetBrainsMono Nerd Font" "Noto Color Emoji" "FontAwesome" ];
diff --git a/machines/entertainment.nix b/machines/entertainment.nix
index 684cf93..dbcccfb 100644
--- a/machines/entertainment.nix
+++ b/machines/entertainment.nix
@@ -24,7 +24,7 @@ inputs:
 
   # needed for steam
   hardware.graphics.enable32Bit = true;
-  hardware.pulseaudio.support32Bit = true;
+  services.pulseaudio.support32Bit = true;
 
   programs.steam.enable = true;
 }