diff --git a/deployment/local.nix b/colmena/local.nix
similarity index 80%
rename from deployment/local.nix
rename to colmena/local.nix
index 752e9ce..7bf35f3 100644
--- a/deployment/local.nix
+++ b/colmena/local.nix
@@ -1,6 +1,7 @@
 { name, nodes, config, lib, pkgs, ... }:
 
-{
+let sources = import ../npins;
+in {
   deployment = {
     allowLocalDeployment = true;
     targetHost = null;
diff --git a/deployment/remote.nix b/colmena/remote.nix
similarity index 100%
rename from deployment/remote.nix
rename to colmena/remote.nix
diff --git a/hive.nix b/hive.nix
index 43603b8..d4d1560 100644
--- a/hive.nix
+++ b/hive.nix
@@ -35,7 +35,7 @@ in {
     time.timeZone = "Europe/London";
 
     imports = [
-      ./deployment/local.nix
+      ./colmena/local.nix
       ./hosts/tohru/configuration.nix
     ];
   };
@@ -45,7 +45,7 @@ in {
     time.timeZone = "Etc/UTC";
 
     imports = [
-      ./deployment/remote.nix
+      ./colmena/remote.nix
       ./hosts/yevaud/configuration.nix
     ];
   };
@@ -55,7 +55,7 @@ in {
     time.timeZone = "Etc/UTC";
 
     imports = [
-      ./deployment/remote.nix
+      ./colmena/remote.nix
       ./hosts/orm/configuration.nix
     ];
   };
diff --git a/hosts/shaw/home.nix b/hosts/shaw/home.nix
deleted file mode 100644
index 67c36e0..0000000
--- a/hosts/shaw/home.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-{
-  services.syncthing = {
-    enable = true;
-    extraOptions = [
-      "--gui-address=:8385"
-      "--home=/home/qenya/state/syncthing"
-    ];
-  };
-}
diff --git a/hosts/tohru/configuration.nix b/hosts/tohru/configuration.nix
index bc9f644..1d1977e 100644
--- a/hosts/tohru/configuration.nix
+++ b/hosts/tohru/configuration.nix
@@ -1,10 +1,14 @@
 { config, lib, pkgs, ... }:
 
 {
-  imports = [
-    ./hardware-configuration.nix
-    ./syncthing.nix
-  ];
+  imports =
+    [
+      ./hardware-configuration.nix
+      ./home.nix
+      ../../services/fonts.nix
+      ../../services/steam.nix
+      ./syncthing.nix
+    ];
 
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
@@ -22,12 +26,6 @@
   qenya.services.fonts.enable = true;
   qenya.services.steam.enable = true;
 
-  home-manager.users.qenya = { pkgs, ... }: {
-    imports = [
-      ./home.nix
-    ];
-  };
-
   networking.networkmanager.enable = true;
 
   i18n.defaultLocale = "en_GB.UTF-8";
diff --git a/hosts/tohru/home.nix b/hosts/tohru/home.nix
index 20526df..a9b0532 100644
--- a/hosts/tohru/home.nix
+++ b/hosts/tohru/home.nix
@@ -1,31 +1,33 @@
 { config, lib, pkgs, ... }:
 
 {
-  dconf.enable = true;
+  home-manager.users.qenya = { pkgs, ... }: {
+    dconf.enable = true;
 
-  programs = {
-    firefox.enable = true; # TODO: config is not yet nix-ified
-    vscode.enable = true;
+    programs = {
+      firefox.enable = true; # TODO: config is not yet nix-ified
+      vscode.enable = true;
+    };
+
+    home.packages = (with pkgs; [
+      bitwarden
+      discord
+      foliate
+      gimp-with-plugins
+      jellyfin-media-player
+      keepassxc
+      tor-browser-bundle-bin
+
+      # libreoffice
+      libreoffice
+      hunspell
+      hunspellDicts.en_GB-ise
+
+      # games
+      openttd
+      prismlauncher
+      nur.repos.qenya.digital-a-love-story
+      nur.repos.qenya.dont-take-it-personally-babe
+    ]);
   };
-
-  home.packages = with pkgs; [
-    bitwarden
-    discord
-    foliate
-    gimp-with-plugins
-    jellyfin-media-player
-    keepassxc
-    tor-browser-bundle-bin
-
-    # libreoffice
-    libreoffice
-    hunspell
-    hunspellDicts.en_GB-ise
-
-    # games
-    openttd
-    prismlauncher
-    nur.repos.qenya.digital-a-love-story
-    nur.repos.qenya.dont-take-it-personally-babe
-  ];
 }
diff --git a/hosts/yevaud/configuration.nix b/hosts/yevaud/configuration.nix
index a0747c4..0c21462 100644
--- a/hosts/yevaud/configuration.nix
+++ b/hosts/yevaud/configuration.nix
@@ -15,36 +15,6 @@
     privateKeyFile = config.age.secrets.wireguard-peer-yevaud.path;
   };
 
-  services.bind = {
-    enable = true;
-    cacheNetworks = [ "10.127.0.0/16" "fd70:81ca:0f8f::/48" ];
-    forwarders = [ ];
-    listenOn = [ config.birdsong.hosts.yevaud.ipv4 ];
-    listenOnIpv6 = [ config.birdsong.hosts.yevaud.ipv6 ];
-    zones = {
-      "birdsong.internal" = {
-        master = true;
-        # TODO: pick better email address for SOA record
-        file = pkgs.writeText "birdsong.internal.zone" ''
-          $TTL 60
-          $ORIGIN birdsong.internal.
-
-          birdsong.internal. IN SOA ns.birdsong.internal. accounts.katherina.rocks. ( 2024080401 7200 3600 1209600 3600 )
-          birdsong.internal. IN NS ns.birdsong.internal.
-
-          yevaud.c.birdsong.internal. IN A 10.127.1.1
-          yevaud.c.birdsong.internal. IN AAAA fd70:81ca:0f8f:1::1
-
-          ns.birdsong.internal. IN A 10.127.1.1
-          ns.birdsong.internal. IN AAAA fd70:81ca:0f8f:1::1
-        '';
-      };
-    };
-  };
-  networking.resolvconf.useLocalResolver = false;
-  networking.firewall.allowedTCPPorts = [ 53 ];
-  networking.firewall.allowedUDPPorts = [ 53 ];
-
   qenya.services.forgejo = {
     enable = true;
     domain = "git.qenya.tel";