diff --git a/nixos/configuration.nix b/nixos/configuration.nix
index 5ff89f23..9de73fbb 100644
--- a/nixos/configuration.nix
+++ b/nixos/configuration.nix
@@ -35,6 +35,7 @@
     ./rabbitmq.nix
     ./secrets.nix
     ./ssh.nix
+    ./sni.nix
     ./syncthing.nix
     ./tts.nix
     ./user-specific.nix
diff --git a/nixos/sni.nix b/nixos/sni.nix
new file mode 100644
index 00000000..0c03f7cc
--- /dev/null
+++ b/nixos/sni.nix
@@ -0,0 +1,40 @@
+{ config, makeEnable, ... }:
+makeEnable config "myModules.sni" true {
+  home-manager.sharedModules = [
+    {
+      services.blueman-applet = {
+        enable = true;
+      };
+
+      services.kdeconnect = {
+        enable = true;
+        indicator = true;
+      };
+
+      services.network-manager-applet.enable = true;
+
+      # Disable the XDG autostart for nm-applet since we're managing it via systemd.
+      # The XDG autostart races with the systemd service and doesn't use --indicator.
+      xdg.configFile."autostart/nm-applet.desktop".text = ''
+        [Desktop Entry]
+        Hidden=true
+      '';
+
+      services.udiskie = {
+        enable = true;
+        tray = "always";
+      };
+
+      services.status-notifier-watcher = {
+        enable = true;
+        flags = ["--log-level" "DEBUG"];
+      };
+
+      services.pasystray.enable = true;
+
+      services.flameshot = {
+        enable = true;
+      };
+    }
+  ];
+}
diff --git a/nixos/xmonad.nix b/nixos/xmonad.nix
index f19e347d..4ad4c4a4 100644
--- a/nixos/xmonad.nix
+++ b/nixos/xmonad.nix
@@ -38,39 +38,11 @@ makeEnable config "myModules.xmonad" true  {
     {
       imports = [ ./dunst.nix ];
 
-      services.blueman-applet = {
-        enable = true;
-      };
-
       services.taffybar = {
         enable = true;
         package = inputs.imalison-taffybar.defaultPackage."${pkgs.stdenv.hostPlatform.system}";
       };
 
-      services.kdeconnect = {
-        enable = true;
-        indicator = true;
-      };
-
-      services.network-manager-applet.enable = true;
-
-      # Disable the XDG autostart for nm-applet since we're managing it via systemd.
-      # The XDG autostart races with the systemd service and doesn't use --indicator.
-      xdg.configFile."autostart/nm-applet.desktop".text = ''
-        [Desktop Entry]
-        Hidden=true
-      '';
-
-      services.udiskie = {
-        enable = true;
-        tray = "always";
-      };
-
-      services.status-notifier-watcher = {
-        enable = true;
-        flags = ["--log-level" "DEBUG"];
-      };
-
       services.autorandr.enable = true;
 
       services.random-background = {
@@ -82,17 +54,11 @@ makeEnable config "myModules.xmonad" true  {
 
       services.xsettingsd.enable = true;
 
-      services.pasystray.enable = true;
-
       # services.parcellite = {
       #   enable = true;
       #   package = pkgs.clipit;
       # };
 
-      services.flameshot = {
-        enable = true;
-      };
-
       # Completely disable home-manager's picom - we manage everything ourselves
       # to work around the libconfig list vs array syntax issue for animations
       services.picom.enable = false;