diff --git a/hardware/zenix.nix b/hardware/zenix.nix
index 3a3cd19..22ea30e 100644
--- a/hardware/zenix.nix
+++ b/hardware/zenix.nix
@@ -64,7 +64,7 @@ in {
   networking.useDHCP = lib.mkDefault true;
   # networking.interfaces.enp5s0.useDHCP = lib.mkDefault true;
 
-  networking.networkmanager.insertNameservers = ["1.1.1.1" "1.0.0.1"];
+  networking.networkmanager.appendNameservers = ["1.1.1.1" "1.0.0.1"];
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
   hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
diff --git a/home/desktop/cosmic/default.nix b/home/desktop/cosmic/default.nix
index 6a12893..c8281d5 100644
--- a/home/desktop/cosmic/default.nix
+++ b/home/desktop/cosmic/default.nix
@@ -53,13 +53,16 @@ in {
           start = [
             "com.system76.CosmicAppletWorkspaces"
           ];
-          center = [];
+          center = [
+            "com.system76.CosmicAppletMinimize"
+          ];
           end = [
             "com.system76.CosmicAppletTime"
             "com.system76.CosmicAppletTiling"
             "com.system76.CosmicAppletAudio"
+            "com.system76.CosmicAppletNetwork"
             "com.system76.CosmicAppletNotifications"
-            "com.system76.CosmicAppletMinimize"
+            "com.system76.CosmicAppletStatusArea"
             "com.system76.CosmicAppletPower"
           ];
         };
diff --git a/home/programs/graphical.nix b/home/programs/graphical.nix
index 6c5050f..9dc9f03 100644
--- a/home/programs/graphical.nix
+++ b/home/programs/graphical.nix
@@ -9,7 +9,7 @@
     # system
     selectdefaultapplication
     easyeffects
-    pavucontrol
+    pwvucontrol
     helvum
 
     # tools
@@ -32,7 +32,10 @@
 
   programs.obs-studio = {
     enable = true;
-    plugins = [pkgs.obs-studio-plugins.wlrobs];
+    plugins = [
+      pkgs.obs-studio-plugins.wlrobs
+      pkgs.obs-studio-plugins.obs-pipewire-audio-capture
+    ];
   };
 
   xdg.mimeApps.defaultApplications = {
diff --git a/home/workstation.nix b/home/workstation.nix
index 88ebdcf..41b0d7c 100644
--- a/home/workstation.nix
+++ b/home/workstation.nix
@@ -36,6 +36,7 @@
 
   programs.rbw.settings.pinentry = pkgs.pinentry-gnome3;
 
+      # https://docs.pipewire.org/page_module_raop_discover.html
   xdg.configFile."pipewire/pipewire.conf.d/raop-discover.conf".text = ''
     context.modules = [
       {
@@ -44,6 +45,30 @@
       }
     ]
   '';
+  xdg.configFile."pipewire/pipewire.conf.d/raop-sink.conf".text = ''
+       context.modules = [
+          {   name = libpipewire-module-raop-sink
+              args = {
+                  # Set the remote address to tunnel to
+                  raop.ip = "127.0.0.1"
+                  raop.port = 8190
+                  raop.name = "my-raop-device"
+                  raop.hostname = "My Service"
+                  #raop.transport = "udp"
+                  raop.encryption.type = "RSA"
+                  #raop.audio.codec = "PCM"
+                  #raop.password = "****"
+                  #audio.format = "S16"
+                  #audio.rate = 44100
+                  #audio.channels = 2
+                  #audio.position = [ FL FR ]
+                  stream.props = {
+                      # extra sink properties
+                  }
+              }
+          }
+        ]
+  '';
 
   services.gnome-keyring.enable = true;
 }
diff --git a/nixos/default.nix b/nixos/default.nix
index 68a84c1..8cc8a39 100644
--- a/nixos/default.nix
+++ b/nixos/default.nix
@@ -45,12 +45,6 @@ in {
       }
     ];
   };
-  networking.hosts = {
-    "100.65.29.110" = ["zenix"];
-    "100.106.241.122" = ["alpine" "tristans.cloud"];
-    "100.71.130.111" = ["fcs-tristan-nixbook"];
-    "100.69.60.83" = ["google-pixel-8"];
-  };
 
   time.timeZone = lib.mkDefault "Europe/London";
 
@@ -59,7 +53,10 @@ in {
     useXkbConfig = true;
   };
 
-  services.avahi.enable = true;
+  services.avahi = {
+    enable = true;
+    nssmdns4 = true;
+  };
 
   i18n.defaultLocale = lib.mkDefault "en_GB.UTF-8";
 
diff --git a/nixos/programs/pipewire.nix b/nixos/programs/pipewire.nix
index 57a8694..4650c3c 100644
--- a/nixos/programs/pipewire.nix
+++ b/nixos/programs/pipewire.nix
@@ -1,4 +1,4 @@
-{
+{pkgs, ...}: {
   hardware.pulseaudio.enable = false;
   security.rtkit.enable = true;
   services.pipewire = {
diff --git a/nixos/workstation.nix b/nixos/workstation.nix
index b997b05..d358c77 100644
--- a/nixos/workstation.nix
+++ b/nixos/workstation.nix
@@ -13,15 +13,10 @@
 
   hardware.opentabletdriver.enable = true;
 
-  programs.nm-applet.enable = true;
-
-  services.printing.enable = true;
-
   services.dbus = {
     enable = true;
     packages = [pkgs.gcr];
   };
-  programs.light.enable = true;
   programs.dconf.enable = true;
 
   hardware.bluetooth.enable = true;