diff --git a/flake.nix b/flake.nix
index bd3ff18..85e9d9c 100644
--- a/flake.nix
+++ b/flake.nix
@@ -35,7 +35,6 @@
     valheim-server.inputs.nixpkgs.follows = "nixpkgs";
 
     nix-flatpak.url = "github:gmodena/nix-flatpak?ref=latest";
-    nix-flatpak.inputs.nixpkgs.follows = "nixpkgs";
   };
 
   outputs = inputs @ {
diff --git a/hosts/muon/home.nix b/hosts/muon/home.nix
index 101a66b..8df37b0 100644
--- a/hosts/muon/home.nix
+++ b/hosts/muon/home.nix
@@ -73,6 +73,7 @@ in {
   # SSH: auto-add work key to gpg-agent on first use
   programs.ssh = {
     enable = true;
+    enableDefaultConfig = false;
     matchBlocks."*" = {
       identityFile = "~/.ssh/work_ed25519";
       addKeysToAgent = "yes";
diff --git a/hosts/muop/configuration.nix b/hosts/muop/configuration.nix
index 64a4640..4fcd725 100644
--- a/hosts/muop/configuration.nix
+++ b/hosts/muop/configuration.nix
@@ -89,7 +89,7 @@ in {
     graphics = {
       enable = true;
       enable32Bit = true;
-      extraPackages = with pkgs; [ vaapiVdpau libvdpau-va-gl ];
+      extraPackages = with pkgs; [ libva-vdpau-driver libvdpau-va-gl ];
     };
 
     nvidia = {
@@ -110,9 +110,10 @@ in {
         nvidiaBusId = "PCI:1:0:0";
       };
     };
-    pulseaudio.support32Bit = true;
   };
 
+  services.pulseaudio.support32Bit = true;
+
   ## Mouse
   services.libinput.mouse.accelProfile = "flat";
 
diff --git a/modules/home/desktop/default.nix b/modules/home/desktop/default.nix
index 2184001..6a0fe6e 100644
--- a/modules/home/desktop/default.nix
+++ b/modules/home/desktop/default.nix
@@ -1,6 +1,7 @@
 {
   pkgs,
   lib,
+  config,
   osConfig,
   ...
 }: let
@@ -19,4 +20,7 @@ in {
 
   mods.hyprland.enable = lib.mkIf cfg.wayland.enable true;
   mods.i3.enable = lib.mkIf osConfig.services.xserver.windowManager.i3.enable true;
+
+  # Silence stateVersion < 26.05 deprecation warnings by pinning the old defaults.
+  gtk.gtk4.theme = lib.mkDefault config.gtk.theme;
 }
diff --git a/modules/home/xdg.nix b/modules/home/xdg.nix
index 3215032..2ecf08a 100644
--- a/modules/home/xdg.nix
+++ b/modules/home/xdg.nix
@@ -35,6 +35,7 @@
       enable = true;
       userDirs = {
         enable = true;
+        setSessionVariables = true;
         documents = "$HOME/documents";
         download = "$HOME/downloads";
         videos = "$HOME/misc/videos";
diff --git a/modules/nixos/core/home.nix b/modules/nixos/core/home.nix
index 8829fd5..f76daf3 100644
--- a/modules/nixos/core/home.nix
+++ b/modules/nixos/core/home.nix
@@ -8,6 +8,11 @@ in {
   config = {
     home-manager = {
       extraSpecialArgs = { inherit system pkgs inputs sources; };
+      # When stylix is enabled it injects its own HM module (and followSystem
+      # copyModules) via homeManagerIntegration.autoImport.  Only add it here
+      # for hosts where stylix is disabled so that stylix options are still
+      # declared (even if unused) in every home-manager context.
+      sharedModules = lib.optional (!config.stylix.enable) inputs.stylix.homeModules.stylix;
       users."${cfg.user.name}" = {
         imports =
           [ cfg.home.file inputs.self.outputs.homeManagerModules.default ];
diff --git a/modules/nixos/server/audio.nix b/modules/nixos/server/audio.nix
index 7cb6714..2897306 100644
--- a/modules/nixos/server/audio.nix
+++ b/modules/nixos/server/audio.nix
@@ -39,7 +39,6 @@ in with lib; {
       enable = true;
       openFirewall = true;
       openRPCPort = true;
-      port = arr.torrent.port;
       package = pkgs.transmission_4;
       settings = {
         download-dir = "/storage1/download";
diff --git a/utils.nix b/utils.nix
index b3c1b7d..e1b6890 100644
--- a/utils.nix
+++ b/utils.nix
@@ -28,7 +28,7 @@ in {
       modules = [
         homeFile
         inputs.self.outputs.homeManagerModules.default
-        inputs.stylix.homeManagerModules.stylix
+        inputs.stylix.homeModules.stylix
         ({ osConfig, ... }: {
           home.username = username;
           home.homeDirectory = "/home/${username}";