diff --git a/modules/desktop/beets.nix b/modules/desktop/beets.nix
new file mode 100644
index 0000000..bd42ffa
--- /dev/null
+++ b/modules/desktop/beets.nix
@@ -0,0 +1,18 @@
+{config, ...}: {
+  flake.modules.nixos.desktop = {pkgs, ...}: {
+    environment.systemPackages = with pkgs; [beets];
+  };
+
+  flake.modules.homeManager.desktop = {
+    programs.beets = {
+      enable = true;
+      settings = {
+        directory = "/home/${config.flake.meta.user.name}/Music";
+        import.move = true;
+        import.copy = false;
+        paths.default = "$albumartist/$album/$track $title";
+        plugins = ["fetchart" "musicbrainz"];
+      };
+    };
+  };
+}
diff --git a/modules/desktop/printing.nix b/modules/desktop/printing.nix
index 5965b82..e1a53fd 100644
--- a/modules/desktop/printing.nix
+++ b/modules/desktop/printing.nix
@@ -1,5 +1,16 @@
 {...}: {
   flake.modules.nixos.desktop = {
-    services.printing.enable = true;
+    services.printing = {
+      enable = true;
+      extraConf = ''
+        Browsing On
+        BrowseLocalProtocols dnssd
+      '';
+    };
+
+    services.avahi = {
+      enable = true;
+      nssmdns = true;
+    };
   };
 }