diff --git a/.gitmodules b/.gitmodules
index 2da3f81a..7dce1d03 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,4 +1,4 @@
-[submodule "depot/trusted"]
-	path = depot/trusted
+[submodule "config/trusted"]
+	path = config/trusted
 	branch = main
 	url = "https://git.kittywit.ch/kat/nixfiles-trusted.git"
diff --git a/depot/hosts/athame/meta.nix b/config/hosts/athame/meta.nix
similarity index 100%
rename from depot/hosts/athame/meta.nix
rename to config/hosts/athame/meta.nix
diff --git a/depot/hosts/athame/nixos.nix b/config/hosts/athame/nixos.nix
similarity index 100%
rename from depot/hosts/athame/nixos.nix
rename to config/hosts/athame/nixos.nix
diff --git a/depot/hosts/beltane/home.nix b/config/hosts/beltane/home.nix
similarity index 100%
rename from depot/hosts/beltane/home.nix
rename to config/hosts/beltane/home.nix
diff --git a/depot/hosts/beltane/home/sway.nix b/config/hosts/beltane/home/sway.nix
similarity index 100%
rename from depot/hosts/beltane/home/sway.nix
rename to config/hosts/beltane/home/sway.nix
diff --git a/depot/hosts/beltane/home/swayidle.nix b/config/hosts/beltane/home/swayidle.nix
similarity index 100%
rename from depot/hosts/beltane/home/swayidle.nix
rename to config/hosts/beltane/home/swayidle.nix
diff --git a/depot/hosts/beltane/meta.nix b/config/hosts/beltane/meta.nix
similarity index 100%
rename from depot/hosts/beltane/meta.nix
rename to config/hosts/beltane/meta.nix
diff --git a/depot/hosts/beltane/nixos.nix b/config/hosts/beltane/nixos.nix
similarity index 100%
rename from depot/hosts/beltane/nixos.nix
rename to config/hosts/beltane/nixos.nix
diff --git a/depot/hosts/dummy/meta.nix b/config/hosts/dummy/meta.nix
similarity index 100%
rename from depot/hosts/dummy/meta.nix
rename to config/hosts/dummy/meta.nix
diff --git a/depot/hosts/dummy/nixos.nix b/config/hosts/dummy/nixos.nix
similarity index 100%
rename from depot/hosts/dummy/nixos.nix
rename to config/hosts/dummy/nixos.nix
diff --git a/depot/hosts/ostara/meta.nix b/config/hosts/ostara/meta.nix
similarity index 100%
rename from depot/hosts/ostara/meta.nix
rename to config/hosts/ostara/meta.nix
diff --git a/depot/hosts/ostara/nixos.nix b/config/hosts/ostara/nixos.nix
similarity index 100%
rename from depot/hosts/ostara/nixos.nix
rename to config/hosts/ostara/nixos.nix
diff --git a/depot/hosts/samhain/home.nix b/config/hosts/samhain/home.nix
similarity index 100%
rename from depot/hosts/samhain/home.nix
rename to config/hosts/samhain/home.nix
diff --git a/depot/hosts/samhain/home/sway.nix b/config/hosts/samhain/home/sway.nix
similarity index 100%
rename from depot/hosts/samhain/home/sway.nix
rename to config/hosts/samhain/home/sway.nix
diff --git a/depot/hosts/samhain/home/swayidle.nix b/config/hosts/samhain/home/swayidle.nix
similarity index 100%
rename from depot/hosts/samhain/home/swayidle.nix
rename to config/hosts/samhain/home/swayidle.nix
diff --git a/depot/hosts/samhain/meta.nix b/config/hosts/samhain/meta.nix
similarity index 100%
rename from depot/hosts/samhain/meta.nix
rename to config/hosts/samhain/meta.nix
diff --git a/depot/hosts/samhain/nixos.nix b/config/hosts/samhain/nixos.nix
similarity index 100%
rename from depot/hosts/samhain/nixos.nix
rename to config/hosts/samhain/nixos.nix
diff --git a/depot/hosts/to-do/mabon/home/default.nix b/config/hosts/to-do/mabon/home/default.nix
similarity index 100%
rename from depot/hosts/to-do/mabon/home/default.nix
rename to config/hosts/to-do/mabon/home/default.nix
diff --git a/depot/hosts/to-do/mabon/meta.nix b/config/hosts/to-do/mabon/meta.nix
similarity index 100%
rename from depot/hosts/to-do/mabon/meta.nix
rename to config/hosts/to-do/mabon/meta.nix
diff --git a/depot/hosts/to-do/mabon/nixos/default.nix b/config/hosts/to-do/mabon/nixos/default.nix
similarity index 100%
rename from depot/hosts/to-do/mabon/nixos/default.nix
rename to config/hosts/to-do/mabon/nixos/default.nix
diff --git a/depot/hosts/to-do/mabon/nixos/hw.nix b/config/hosts/to-do/mabon/nixos/hw.nix
similarity index 100%
rename from depot/hosts/to-do/mabon/nixos/hw.nix
rename to config/hosts/to-do/mabon/nixos/hw.nix
diff --git a/depot/hosts/yule/home.nix b/config/hosts/yule/home.nix
similarity index 100%
rename from depot/hosts/yule/home.nix
rename to config/hosts/yule/home.nix
diff --git a/depot/hosts/yule/home/base16.nix b/config/hosts/yule/home/base16.nix
similarity index 100%
rename from depot/hosts/yule/home/base16.nix
rename to config/hosts/yule/home/base16.nix
diff --git a/depot/hosts/yule/home/sway.nix b/config/hosts/yule/home/sway.nix
similarity index 100%
rename from depot/hosts/yule/home/sway.nix
rename to config/hosts/yule/home/sway.nix
diff --git a/depot/hosts/yule/home/swayidle.nix b/config/hosts/yule/home/swayidle.nix
similarity index 100%
rename from depot/hosts/yule/home/swayidle.nix
rename to config/hosts/yule/home/swayidle.nix
diff --git a/depot/hosts/yule/meta.nix b/config/hosts/yule/meta.nix
similarity index 100%
rename from depot/hosts/yule/meta.nix
rename to config/hosts/yule/meta.nix
diff --git a/depot/hosts/yule/nixos.nix b/config/hosts/yule/nixos.nix
similarity index 100%
rename from depot/hosts/yule/nixos.nix
rename to config/hosts/yule/nixos.nix
diff --git a/depot/modules/home/default.nix b/config/modules/home/default.nix
similarity index 100%
rename from depot/modules/home/default.nix
rename to config/modules/home/default.nix
diff --git a/depot/modules/home/deploy.nix b/config/modules/home/deploy.nix
similarity index 100%
rename from depot/modules/home/deploy.nix
rename to config/modules/home/deploy.nix
diff --git a/depot/modules/home/fvwm.nix b/config/modules/home/fvwm.nix
similarity index 100%
rename from depot/modules/home/fvwm.nix
rename to config/modules/home/fvwm.nix
diff --git a/depot/modules/home/secrets.nix b/config/modules/home/secrets.nix
similarity index 100%
rename from depot/modules/home/secrets.nix
rename to config/modules/home/secrets.nix
diff --git a/depot/modules/home/theme.nix b/config/modules/home/theme.nix
similarity index 100%
rename from depot/modules/home/theme.nix
rename to config/modules/home/theme.nix
diff --git a/depot/modules/home/vim.nix b/config/modules/home/vim.nix
similarity index 100%
rename from depot/modules/home/vim.nix
rename to config/modules/home/vim.nix
diff --git a/depot/modules/meta/default.nix b/config/modules/meta/default.nix
similarity index 100%
rename from depot/modules/meta/default.nix
rename to config/modules/meta/default.nix
diff --git a/depot/modules/meta/deploy.nix b/config/modules/meta/deploy.nix
similarity index 100%
rename from depot/modules/meta/deploy.nix
rename to config/modules/meta/deploy.nix
diff --git a/depot/modules/meta/imports.nix b/config/modules/meta/imports.nix
similarity index 81%
rename from depot/modules/meta/imports.nix
rename to config/modules/meta/imports.nix
index 84fb00ae..bd9d8252 100644
--- a/depot/modules/meta/imports.nix
+++ b/config/modules/meta/imports.nix
@@ -22,12 +22,12 @@ with lib;
   config = {
     network.importing = {
       nixosImports = mkDefault (map (path: toString path) [
-        (root + "/depot/hosts/HN/nixos.nix")
-        (root + "/depot/trusted/hosts/HN/nixos.nix")
+        (root + "/config/hosts/HN/nixos.nix")
+        (root + "/config/trusted/hosts/HN/nixos.nix")
       ]);
       homeImports = mkDefault (map (path: toString path) [
-        (root + "/depot/hosts/HN/home.nix")
-        (root + "/depot/trusted/hosts/HN/home.nix")
+        (root + "/config/hosts/HN/home.nix")
+        (root + "/config/trusted/hosts/HN/home.nix")
       ]);
       users = mkDefault (singleton "kat");
     };
diff --git a/depot/modules/meta/network.nix b/config/modules/meta/network.nix
similarity index 100%
rename from depot/modules/meta/network.nix
rename to config/modules/meta/network.nix
diff --git a/depot/modules/meta/secrets.nix b/config/modules/meta/secrets.nix
similarity index 100%
rename from depot/modules/meta/secrets.nix
rename to config/modules/meta/secrets.nix
diff --git a/depot/modules/nixos/default.nix b/config/modules/nixos/default.nix
similarity index 100%
rename from depot/modules/nixos/default.nix
rename to config/modules/nixos/default.nix
diff --git a/depot/modules/nixos/deploy.nix b/config/modules/nixos/deploy.nix
similarity index 100%
rename from depot/modules/nixos/deploy.nix
rename to config/modules/nixos/deploy.nix
diff --git a/depot/modules/nixos/dyndns.nix b/config/modules/nixos/dyndns.nix
similarity index 100%
rename from depot/modules/nixos/dyndns.nix
rename to config/modules/nixos/dyndns.nix
diff --git a/depot/modules/nixos/secrets.nix b/config/modules/nixos/secrets.nix
similarity index 100%
rename from depot/modules/nixos/secrets.nix
rename to config/modules/nixos/secrets.nix
diff --git a/depot/profiles/base/access.nix b/config/profiles/base/access.nix
similarity index 100%
rename from depot/profiles/base/access.nix
rename to config/profiles/base/access.nix
diff --git a/depot/profiles/base/base16.nix b/config/profiles/base/base16.nix
similarity index 100%
rename from depot/profiles/base/base16.nix
rename to config/profiles/base/base16.nix
diff --git a/depot/profiles/base/default.nix b/config/profiles/base/default.nix
similarity index 100%
rename from depot/profiles/base/default.nix
rename to config/profiles/base/default.nix
diff --git a/depot/profiles/base/dns.nix b/config/profiles/base/dns.nix
similarity index 100%
rename from depot/profiles/base/dns.nix
rename to config/profiles/base/dns.nix
diff --git a/depot/profiles/base/home.nix b/config/profiles/base/home.nix
similarity index 100%
rename from depot/profiles/base/home.nix
rename to config/profiles/base/home.nix
diff --git a/depot/profiles/base/locale.nix b/config/profiles/base/locale.nix
similarity index 100%
rename from depot/profiles/base/locale.nix
rename to config/profiles/base/locale.nix
diff --git a/depot/profiles/base/net.nix b/config/profiles/base/net.nix
similarity index 100%
rename from depot/profiles/base/net.nix
rename to config/profiles/base/net.nix
diff --git a/depot/profiles/base/nix.nix b/config/profiles/base/nix.nix
similarity index 100%
rename from depot/profiles/base/nix.nix
rename to config/profiles/base/nix.nix
diff --git a/depot/profiles/base/packages.nix b/config/profiles/base/packages.nix
similarity index 100%
rename from depot/profiles/base/packages.nix
rename to config/profiles/base/packages.nix
diff --git a/depot/profiles/base/profiles.nix b/config/profiles/base/profiles.nix
similarity index 100%
rename from depot/profiles/base/profiles.nix
rename to config/profiles/base/profiles.nix
diff --git a/depot/profiles/base/secrets.nix b/config/profiles/base/secrets.nix
similarity index 100%
rename from depot/profiles/base/secrets.nix
rename to config/profiles/base/secrets.nix
diff --git a/depot/profiles/base/shell.nix b/config/profiles/base/shell.nix
similarity index 100%
rename from depot/profiles/base/shell.nix
rename to config/profiles/base/shell.nix
diff --git a/depot/profiles/base/ssh.nix b/config/profiles/base/ssh.nix
similarity index 100%
rename from depot/profiles/base/ssh.nix
rename to config/profiles/base/ssh.nix
diff --git a/depot/profiles/base/system.nix b/config/profiles/base/system.nix
similarity index 100%
rename from depot/profiles/base/system.nix
rename to config/profiles/base/system.nix
diff --git a/depot/profiles/gui/adb.nix b/config/profiles/gui/adb.nix
similarity index 100%
rename from depot/profiles/gui/adb.nix
rename to config/profiles/gui/adb.nix
diff --git a/depot/profiles/gui/default.nix b/config/profiles/gui/default.nix
similarity index 100%
rename from depot/profiles/gui/default.nix
rename to config/profiles/gui/default.nix
diff --git a/depot/profiles/gui/dns.nix b/config/profiles/gui/dns.nix
similarity index 100%
rename from depot/profiles/gui/dns.nix
rename to config/profiles/gui/dns.nix
diff --git a/depot/profiles/gui/filesystems.nix b/config/profiles/gui/filesystems.nix
similarity index 100%
rename from depot/profiles/gui/filesystems.nix
rename to config/profiles/gui/filesystems.nix
diff --git a/depot/profiles/gui/fonts.nix b/config/profiles/gui/fonts.nix
similarity index 100%
rename from depot/profiles/gui/fonts.nix
rename to config/profiles/gui/fonts.nix
diff --git a/depot/profiles/gui/fvwm.nix b/config/profiles/gui/fvwm.nix
similarity index 100%
rename from depot/profiles/gui/fvwm.nix
rename to config/profiles/gui/fvwm.nix
diff --git a/depot/profiles/gui/gpg.nix b/config/profiles/gui/gpg.nix
similarity index 100%
rename from depot/profiles/gui/gpg.nix
rename to config/profiles/gui/gpg.nix
diff --git a/depot/profiles/gui/mingetty.nix b/config/profiles/gui/mingetty.nix
similarity index 100%
rename from depot/profiles/gui/mingetty.nix
rename to config/profiles/gui/mingetty.nix
diff --git a/depot/profiles/gui/mpd.nix b/config/profiles/gui/mpd.nix
similarity index 100%
rename from depot/profiles/gui/mpd.nix
rename to config/profiles/gui/mpd.nix
diff --git a/depot/profiles/gui/nfs.nix b/config/profiles/gui/nfs.nix
similarity index 100%
rename from depot/profiles/gui/nfs.nix
rename to config/profiles/gui/nfs.nix
diff --git a/depot/profiles/gui/nix-doc.nix b/config/profiles/gui/nix-doc.nix
similarity index 100%
rename from depot/profiles/gui/nix-doc.nix
rename to config/profiles/gui/nix-doc.nix
diff --git a/depot/profiles/gui/nixpkgs.nix b/config/profiles/gui/nixpkgs.nix
similarity index 100%
rename from depot/profiles/gui/nixpkgs.nix
rename to config/profiles/gui/nixpkgs.nix
diff --git a/depot/profiles/gui/sound.nix b/config/profiles/gui/sound.nix
similarity index 100%
rename from depot/profiles/gui/sound.nix
rename to config/profiles/gui/sound.nix
diff --git a/depot/profiles/gui/sway.nix b/config/profiles/gui/sway.nix
similarity index 100%
rename from depot/profiles/gui/sway.nix
rename to config/profiles/gui/sway.nix
diff --git a/depot/profiles/gui/xdg-portals.nix b/config/profiles/gui/xdg-portals.nix
similarity index 100%
rename from depot/profiles/gui/xdg-portals.nix
rename to config/profiles/gui/xdg-portals.nix
diff --git a/depot/profiles/hardware/amdgpu/default.nix b/config/profiles/hardware/amdgpu/default.nix
similarity index 100%
rename from depot/profiles/hardware/amdgpu/default.nix
rename to config/profiles/hardware/amdgpu/default.nix
diff --git a/depot/profiles/hardware/default.nix b/config/profiles/hardware/default.nix
similarity index 100%
rename from depot/profiles/hardware/default.nix
rename to config/profiles/hardware/default.nix
diff --git a/depot/profiles/hardware/eeepc-1015pem-base/default.nix b/config/profiles/hardware/eeepc-1015pem-base/default.nix
similarity index 100%
rename from depot/profiles/hardware/eeepc-1015pem-base/default.nix
rename to config/profiles/hardware/eeepc-1015pem-base/default.nix
diff --git a/depot/profiles/hardware/hcloud-imperative/default.nix b/config/profiles/hardware/hcloud-imperative/default.nix
similarity index 100%
rename from depot/profiles/hardware/hcloud-imperative/default.nix
rename to config/profiles/hardware/hcloud-imperative/default.nix
diff --git a/depot/profiles/hardware/intel/default.nix b/config/profiles/hardware/intel/default.nix
similarity index 100%
rename from depot/profiles/hardware/intel/default.nix
rename to config/profiles/hardware/intel/default.nix
diff --git a/depot/profiles/hardware/laptop/default.nix b/config/profiles/hardware/laptop/default.nix
similarity index 100%
rename from depot/profiles/hardware/laptop/default.nix
rename to config/profiles/hardware/laptop/default.nix
diff --git a/depot/profiles/hardware/laptop/light.nix b/config/profiles/hardware/laptop/light.nix
similarity index 100%
rename from depot/profiles/hardware/laptop/light.nix
rename to config/profiles/hardware/laptop/light.nix
diff --git a/depot/profiles/hardware/ms-7b86-base/default.nix b/config/profiles/hardware/ms-7b86-base/default.nix
similarity index 100%
rename from depot/profiles/hardware/ms-7b86-base/default.nix
rename to config/profiles/hardware/ms-7b86-base/default.nix
diff --git a/depot/profiles/hardware/rm-310-base/default.nix b/config/profiles/hardware/rm-310-base/default.nix
similarity index 100%
rename from depot/profiles/hardware/rm-310-base/default.nix
rename to config/profiles/hardware/rm-310-base/default.nix
diff --git a/depot/profiles/hardware/ryzen/default.nix b/config/profiles/hardware/ryzen/default.nix
similarity index 100%
rename from depot/profiles/hardware/ryzen/default.nix
rename to config/profiles/hardware/ryzen/default.nix
diff --git a/depot/profiles/hardware/v330-14arr-base/default.nix b/config/profiles/hardware/v330-14arr-base/default.nix
similarity index 100%
rename from depot/profiles/hardware/v330-14arr-base/default.nix
rename to config/profiles/hardware/v330-14arr-base/default.nix
diff --git a/depot/profiles/hardware/wifi/default.nix b/config/profiles/hardware/wifi/default.nix
similarity index 100%
rename from depot/profiles/hardware/wifi/default.nix
rename to config/profiles/hardware/wifi/default.nix
diff --git a/depot/profiles/vfio/default.nix b/config/profiles/vfio/default.nix
similarity index 100%
rename from depot/profiles/vfio/default.nix
rename to config/profiles/vfio/default.nix
diff --git a/depot/profiles/vfio/screenstub.yml b/config/profiles/vfio/screenstub.yml
similarity index 100%
rename from depot/profiles/vfio/screenstub.yml
rename to config/profiles/vfio/screenstub.yml
diff --git a/depot/services/fail2ban/default.nix b/config/services/fail2ban/default.nix
similarity index 100%
rename from depot/services/fail2ban/default.nix
rename to config/services/fail2ban/default.nix
diff --git a/depot/services/filehost/default.nix b/config/services/filehost/default.nix
similarity index 100%
rename from depot/services/filehost/default.nix
rename to config/services/filehost/default.nix
diff --git a/depot/services/fusionpbx/default.nix b/config/services/fusionpbx/default.nix
similarity index 100%
rename from depot/services/fusionpbx/default.nix
rename to config/services/fusionpbx/default.nix
diff --git a/depot/services/gitea/default.nix b/config/services/gitea/default.nix
similarity index 100%
rename from depot/services/gitea/default.nix
rename to config/services/gitea/default.nix
diff --git a/depot/services/gitea/public/img/favicon.svg b/config/services/gitea/public/img/favicon.svg
similarity index 100%
rename from depot/services/gitea/public/img/favicon.svg
rename to config/services/gitea/public/img/favicon.svg
diff --git a/depot/services/gitea/public/img/gitea-lg.png b/config/services/gitea/public/img/gitea-lg.png
similarity index 100%
rename from depot/services/gitea/public/img/gitea-lg.png
rename to config/services/gitea/public/img/gitea-lg.png
diff --git a/depot/services/gitea/public/img/gitea-sm.png b/config/services/gitea/public/img/gitea-sm.png
similarity index 100%
rename from depot/services/gitea/public/img/gitea-sm.png
rename to config/services/gitea/public/img/gitea-sm.png
diff --git a/depot/services/gitea/public/img/logo.svg b/config/services/gitea/public/img/logo.svg
similarity index 100%
rename from depot/services/gitea/public/img/logo.svg
rename to config/services/gitea/public/img/logo.svg
diff --git a/depot/services/gitea/templates/admin/navbar.tmpl b/config/services/gitea/templates/admin/navbar.tmpl
similarity index 100%
rename from depot/services/gitea/templates/admin/navbar.tmpl
rename to config/services/gitea/templates/admin/navbar.tmpl
diff --git a/depot/services/gitea/templates/custom/head.tmpl b/config/services/gitea/templates/custom/head.tmpl
similarity index 100%
rename from depot/services/gitea/templates/custom/head.tmpl
rename to config/services/gitea/templates/custom/head.tmpl
diff --git a/depot/services/gitea/templates/explore/navbar.tmpl b/config/services/gitea/templates/explore/navbar.tmpl
similarity index 100%
rename from depot/services/gitea/templates/explore/navbar.tmpl
rename to config/services/gitea/templates/explore/navbar.tmpl
diff --git a/depot/services/gitea/templates/home.tmpl b/config/services/gitea/templates/home.tmpl
similarity index 100%
rename from depot/services/gitea/templates/home.tmpl
rename to config/services/gitea/templates/home.tmpl
diff --git a/depot/services/gitea/templates/repo/header.tmpl b/config/services/gitea/templates/repo/header.tmpl
similarity index 100%
rename from depot/services/gitea/templates/repo/header.tmpl
rename to config/services/gitea/templates/repo/header.tmpl
diff --git a/depot/services/gitea/templates/repo/home.tmpl b/config/services/gitea/templates/repo/home.tmpl
similarity index 100%
rename from depot/services/gitea/templates/repo/home.tmpl
rename to config/services/gitea/templates/repo/home.tmpl
diff --git a/depot/services/gitea/templates/repo/settings/navbar.tmpl b/config/services/gitea/templates/repo/settings/navbar.tmpl
similarity index 100%
rename from depot/services/gitea/templates/repo/settings/navbar.tmpl
rename to config/services/gitea/templates/repo/settings/navbar.tmpl
diff --git a/depot/services/gitea/templates/user/dashboard/dashboard.tmpl b/config/services/gitea/templates/user/dashboard/dashboard.tmpl
similarity index 100%
rename from depot/services/gitea/templates/user/dashboard/dashboard.tmpl
rename to config/services/gitea/templates/user/dashboard/dashboard.tmpl
diff --git a/depot/services/gitea/templates/user/settings/navbar.tmpl b/config/services/gitea/templates/user/settings/navbar.tmpl
similarity index 100%
rename from depot/services/gitea/templates/user/settings/navbar.tmpl
rename to config/services/gitea/templates/user/settings/navbar.tmpl
diff --git a/depot/services/grafana/default.nix b/config/services/grafana/default.nix
similarity index 100%
rename from depot/services/grafana/default.nix
rename to config/services/grafana/default.nix
diff --git a/depot/services/jellyfin/default.nix b/config/services/jellyfin/default.nix
similarity index 100%
rename from depot/services/jellyfin/default.nix
rename to config/services/jellyfin/default.nix
diff --git a/depot/services/katsplash/default.nix b/config/services/katsplash/default.nix
similarity index 100%
rename from depot/services/katsplash/default.nix
rename to config/services/katsplash/default.nix
diff --git a/depot/services/kattv-ingest/default.nix b/config/services/kattv-ingest/default.nix
similarity index 100%
rename from depot/services/kattv-ingest/default.nix
rename to config/services/kattv-ingest/default.nix
diff --git a/depot/services/kattv/default.nix b/config/services/kattv/default.nix
similarity index 100%
rename from depot/services/kattv/default.nix
rename to config/services/kattv/default.nix
diff --git a/depot/services/logrotate/default.nix b/config/services/logrotate/default.nix
similarity index 100%
rename from depot/services/logrotate/default.nix
rename to config/services/logrotate/default.nix
diff --git a/depot/services/loki/default.nix b/config/services/loki/default.nix
similarity index 100%
rename from depot/services/loki/default.nix
rename to config/services/loki/default.nix
diff --git a/depot/services/mail/default.nix b/config/services/mail/default.nix
similarity index 100%
rename from depot/services/mail/default.nix
rename to config/services/mail/default.nix
diff --git a/depot/services/matrix/default.nix b/config/services/matrix/default.nix
similarity index 100%
rename from depot/services/matrix/default.nix
rename to config/services/matrix/default.nix
diff --git a/depot/services/murmur/default.nix b/config/services/murmur/default.nix
similarity index 100%
rename from depot/services/murmur/default.nix
rename to config/services/murmur/default.nix
diff --git a/depot/services/netdata/default.nix b/config/services/netdata/default.nix
similarity index 100%
rename from depot/services/netdata/default.nix
rename to config/services/netdata/default.nix
diff --git a/depot/services/nfs/default.nix b/config/services/nfs/default.nix
similarity index 100%
rename from depot/services/nfs/default.nix
rename to config/services/nfs/default.nix
diff --git a/depot/services/nginx/default.nix b/config/services/nginx/default.nix
similarity index 100%
rename from depot/services/nginx/default.nix
rename to config/services/nginx/default.nix
diff --git a/depot/services/node-exporter/default.nix b/config/services/node-exporter/default.nix
similarity index 100%
rename from depot/services/node-exporter/default.nix
rename to config/services/node-exporter/default.nix
diff --git a/depot/services/postgres/default.nix b/config/services/postgres/default.nix
similarity index 100%
rename from depot/services/postgres/default.nix
rename to config/services/postgres/default.nix
diff --git a/depot/services/prometheus/default.nix b/config/services/prometheus/default.nix
similarity index 100%
rename from depot/services/prometheus/default.nix
rename to config/services/prometheus/default.nix
diff --git a/depot/services/promtail/default.nix b/config/services/promtail/default.nix
similarity index 100%
rename from depot/services/promtail/default.nix
rename to config/services/promtail/default.nix
diff --git a/depot/services/radicale/default.nix b/config/services/radicale/default.nix
similarity index 100%
rename from depot/services/radicale/default.nix
rename to config/services/radicale/default.nix
diff --git a/depot/services/restic/default.nix b/config/services/restic/default.nix
similarity index 100%
rename from depot/services/restic/default.nix
rename to config/services/restic/default.nix
diff --git a/depot/services/syncplay/default.nix b/config/services/syncplay/default.nix
similarity index 100%
rename from depot/services/syncplay/default.nix
rename to config/services/syncplay/default.nix
diff --git a/depot/services/taskserver/default.nix b/config/services/taskserver/default.nix
similarity index 100%
rename from depot/services/taskserver/default.nix
rename to config/services/taskserver/default.nix
diff --git a/depot/services/transmission/default.nix b/config/services/transmission/default.nix
similarity index 100%
rename from depot/services/transmission/default.nix
rename to config/services/transmission/default.nix
diff --git a/depot/services/tvheadend/default.nix b/config/services/tvheadend/default.nix
similarity index 100%
rename from depot/services/tvheadend/default.nix
rename to config/services/tvheadend/default.nix
diff --git a/depot/services/vaultwarden/default.nix b/config/services/vaultwarden/default.nix
similarity index 100%
rename from depot/services/vaultwarden/default.nix
rename to config/services/vaultwarden/default.nix
diff --git a/depot/services/website/default.nix b/config/services/website/default.nix
similarity index 100%
rename from depot/services/website/default.nix
rename to config/services/website/default.nix
diff --git a/depot/services/weechat/default.nix b/config/services/weechat/default.nix
similarity index 100%
rename from depot/services/weechat/default.nix
rename to config/services/weechat/default.nix
diff --git a/depot/services/xmpp/default.nix b/config/services/xmpp/default.nix
similarity index 100%
rename from depot/services/xmpp/default.nix
rename to config/services/xmpp/default.nix
diff --git a/depot/services/zfs/default.nix b/config/services/zfs/default.nix
similarity index 100%
rename from depot/services/zfs/default.nix
rename to config/services/zfs/default.nix
diff --git a/depot/services/znc/default.nix b/config/services/znc/default.nix
similarity index 100%
rename from depot/services/znc/default.nix
rename to config/services/znc/default.nix
diff --git a/depot/targets/common/default.nix b/config/targets/common/default.nix
similarity index 100%
rename from depot/targets/common/default.nix
rename to config/targets/common/default.nix
diff --git a/depot/targets/infra/default.nix b/config/targets/infra/default.nix
similarity index 100%
rename from depot/targets/infra/default.nix
rename to config/targets/infra/default.nix
diff --git a/depot/targets/personal/default.nix b/config/targets/personal/default.nix
similarity index 100%
rename from depot/targets/personal/default.nix
rename to config/targets/personal/default.nix
diff --git a/config/trusted b/config/trusted
new file mode 160000
index 00000000..97ac097d
--- /dev/null
+++ b/config/trusted
@@ -0,0 +1 @@
+Subproject commit 97ac097d39b25551fca668100774236ce3b24cc8
diff --git a/depot/users/arc/default.nix b/config/users/arc/default.nix
similarity index 100%
rename from depot/users/arc/default.nix
rename to config/users/arc/default.nix
diff --git a/depot/users/hexchen/default.nix b/config/users/hexchen/default.nix
similarity index 100%
rename from depot/users/hexchen/default.nix
rename to config/users/hexchen/default.nix
diff --git a/depot/users/kat/base/base16.nix b/config/users/kat/base/base16.nix
similarity index 100%
rename from depot/users/kat/base/base16.nix
rename to config/users/kat/base/base16.nix
diff --git a/depot/users/kat/base/default.nix b/config/users/kat/base/default.nix
similarity index 100%
rename from depot/users/kat/base/default.nix
rename to config/users/kat/base/default.nix
diff --git a/depot/users/kat/base/git.nix b/config/users/kat/base/git.nix
similarity index 100%
rename from depot/users/kat/base/git.nix
rename to config/users/kat/base/git.nix
diff --git a/depot/users/kat/base/inputrc.nix b/config/users/kat/base/inputrc.nix
similarity index 100%
rename from depot/users/kat/base/inputrc.nix
rename to config/users/kat/base/inputrc.nix
diff --git a/depot/users/kat/base/nano.png b/config/users/kat/base/nano.png
similarity index 100%
rename from depot/users/kat/base/nano.png
rename to config/users/kat/base/nano.png
diff --git a/depot/users/kat/base/packages.nix b/config/users/kat/base/packages.nix
similarity index 100%
rename from depot/users/kat/base/packages.nix
rename to config/users/kat/base/packages.nix
diff --git a/depot/users/kat/base/pass.nix b/config/users/kat/base/pass.nix
similarity index 100%
rename from depot/users/kat/base/pass.nix
rename to config/users/kat/base/pass.nix
diff --git a/depot/users/kat/base/rink.nix b/config/users/kat/base/rink.nix
similarity index 100%
rename from depot/users/kat/base/rink.nix
rename to config/users/kat/base/rink.nix
diff --git a/depot/users/kat/base/secrets.nix b/config/users/kat/base/secrets.nix
similarity index 100%
rename from depot/users/kat/base/secrets.nix
rename to config/users/kat/base/secrets.nix
diff --git a/depot/users/kat/base/ssh.nix b/config/users/kat/base/ssh.nix
similarity index 100%
rename from depot/users/kat/base/ssh.nix
rename to config/users/kat/base/ssh.nix
diff --git a/depot/users/kat/base/tmux.nix b/config/users/kat/base/tmux.nix
similarity index 100%
rename from depot/users/kat/base/tmux.nix
rename to config/users/kat/base/tmux.nix
diff --git a/depot/users/kat/base/vim/default.nix b/config/users/kat/base/vim/default.nix
similarity index 100%
rename from depot/users/kat/base/vim/default.nix
rename to config/users/kat/base/vim/default.nix
diff --git a/depot/users/kat/base/vim/vimrc.nix b/config/users/kat/base/vim/vimrc.nix
similarity index 100%
rename from depot/users/kat/base/vim/vimrc.nix
rename to config/users/kat/base/vim/vimrc.nix
diff --git a/depot/users/kat/base/weechat.nix b/config/users/kat/base/weechat.nix
similarity index 100%
rename from depot/users/kat/base/weechat.nix
rename to config/users/kat/base/weechat.nix
diff --git a/depot/users/kat/base/xdg.nix b/config/users/kat/base/xdg.nix
similarity index 100%
rename from depot/users/kat/base/xdg.nix
rename to config/users/kat/base/xdg.nix
diff --git a/depot/users/kat/base/zsh.nix b/config/users/kat/base/zsh.nix
similarity index 100%
rename from depot/users/kat/base/zsh.nix
rename to config/users/kat/base/zsh.nix
diff --git a/depot/users/kat/base/zshrc-vimode b/config/users/kat/base/zshrc-vimode
similarity index 100%
rename from depot/users/kat/base/zshrc-vimode
rename to config/users/kat/base/zshrc-vimode
diff --git a/depot/users/kat/default.nix b/config/users/kat/default.nix
similarity index 100%
rename from depot/users/kat/default.nix
rename to config/users/kat/default.nix
diff --git a/depot/users/kat/dev/cookiecutter.nix b/config/users/kat/dev/cookiecutter.nix
similarity index 100%
rename from depot/users/kat/dev/cookiecutter.nix
rename to config/users/kat/dev/cookiecutter.nix
diff --git a/depot/users/kat/dev/default.nix b/config/users/kat/dev/default.nix
similarity index 100%
rename from depot/users/kat/dev/default.nix
rename to config/users/kat/dev/default.nix
diff --git a/depot/users/kat/dev/packages.nix b/config/users/kat/dev/packages.nix
similarity index 100%
rename from depot/users/kat/dev/packages.nix
rename to config/users/kat/dev/packages.nix
diff --git a/depot/users/kat/gui/default.nix b/config/users/kat/gui/default.nix
similarity index 100%
rename from depot/users/kat/gui/default.nix
rename to config/users/kat/gui/default.nix
diff --git a/depot/users/kat/gui/firefox/default.nix b/config/users/kat/gui/firefox/default.nix
similarity index 100%
rename from depot/users/kat/gui/firefox/default.nix
rename to config/users/kat/gui/firefox/default.nix
diff --git a/depot/users/kat/gui/firefox/userChrome.css.nix b/config/users/kat/gui/firefox/userChrome.css.nix
similarity index 100%
rename from depot/users/kat/gui/firefox/userChrome.css.nix
rename to config/users/kat/gui/firefox/userChrome.css.nix
diff --git a/depot/users/kat/gui/fonts.nix b/config/users/kat/gui/fonts.nix
similarity index 100%
rename from depot/users/kat/gui/fonts.nix
rename to config/users/kat/gui/fonts.nix
diff --git a/depot/users/kat/gui/foot.nix b/config/users/kat/gui/foot.nix
similarity index 100%
rename from depot/users/kat/gui/foot.nix
rename to config/users/kat/gui/foot.nix
diff --git a/depot/users/kat/gui/gtk.nix b/config/users/kat/gui/gtk.nix
similarity index 100%
rename from depot/users/kat/gui/gtk.nix
rename to config/users/kat/gui/gtk.nix
diff --git a/depot/users/kat/gui/packages.nix b/config/users/kat/gui/packages.nix
similarity index 100%
rename from depot/users/kat/gui/packages.nix
rename to config/users/kat/gui/packages.nix
diff --git a/depot/users/kat/gui/ranger.nix b/config/users/kat/gui/ranger.nix
similarity index 100%
rename from depot/users/kat/gui/ranger.nix
rename to config/users/kat/gui/ranger.nix
diff --git a/depot/users/kat/gui/xdg.nix b/config/users/kat/gui/xdg.nix
similarity index 100%
rename from depot/users/kat/gui/xdg.nix
rename to config/users/kat/gui/xdg.nix
diff --git a/depot/users/kat/media/beets.nix b/config/users/kat/media/beets.nix
similarity index 100%
rename from depot/users/kat/media/beets.nix
rename to config/users/kat/media/beets.nix
diff --git a/depot/users/kat/media/default.nix b/config/users/kat/media/default.nix
similarity index 100%
rename from depot/users/kat/media/default.nix
rename to config/users/kat/media/default.nix
diff --git a/depot/users/kat/media/mpd.nix b/config/users/kat/media/mpd.nix
similarity index 100%
rename from depot/users/kat/media/mpd.nix
rename to config/users/kat/media/mpd.nix
diff --git a/depot/users/kat/media/mpv.nix b/config/users/kat/media/mpv.nix
similarity index 100%
rename from depot/users/kat/media/mpv.nix
rename to config/users/kat/media/mpv.nix
diff --git a/depot/users/kat/media/ncmpcpp.nix b/config/users/kat/media/ncmpcpp.nix
similarity index 100%
rename from depot/users/kat/media/ncmpcpp.nix
rename to config/users/kat/media/ncmpcpp.nix
diff --git a/depot/users/kat/media/obs.nix b/config/users/kat/media/obs.nix
similarity index 100%
rename from depot/users/kat/media/obs.nix
rename to config/users/kat/media/obs.nix
diff --git a/depot/users/kat/media/packages.nix b/config/users/kat/media/packages.nix
similarity index 100%
rename from depot/users/kat/media/packages.nix
rename to config/users/kat/media/packages.nix
diff --git a/depot/users/kat/media/syncplay.nix b/config/users/kat/media/syncplay.nix
similarity index 100%
rename from depot/users/kat/media/syncplay.nix
rename to config/users/kat/media/syncplay.nix
diff --git a/depot/users/kat/nixos.nix b/config/users/kat/nixos.nix
similarity index 100%
rename from depot/users/kat/nixos.nix
rename to config/users/kat/nixos.nix
diff --git a/depot/users/kat/personal/default.nix b/config/users/kat/personal/default.nix
similarity index 100%
rename from depot/users/kat/personal/default.nix
rename to config/users/kat/personal/default.nix
diff --git a/depot/users/kat/personal/email.nix b/config/users/kat/personal/email.nix
similarity index 100%
rename from depot/users/kat/personal/email.nix
rename to config/users/kat/personal/email.nix
diff --git a/depot/users/kat/personal/gpg.nix b/config/users/kat/personal/gpg.nix
similarity index 100%
rename from depot/users/kat/personal/gpg.nix
rename to config/users/kat/personal/gpg.nix
diff --git a/depot/users/kat/personal/packages.nix b/config/users/kat/personal/packages.nix
similarity index 100%
rename from depot/users/kat/personal/packages.nix
rename to config/users/kat/personal/packages.nix
diff --git a/depot/users/kat/personal/weechat.nix b/config/users/kat/personal/weechat.nix
similarity index 100%
rename from depot/users/kat/personal/weechat.nix
rename to config/users/kat/personal/weechat.nix
diff --git a/depot/users/kat/personal/zsh.nix b/config/users/kat/personal/zsh.nix
similarity index 100%
rename from depot/users/kat/personal/zsh.nix
rename to config/users/kat/personal/zsh.nix
diff --git a/depot/users/kat/services/weechat/default.nix b/config/users/kat/services/weechat/default.nix
similarity index 100%
rename from depot/users/kat/services/weechat/default.nix
rename to config/users/kat/services/weechat/default.nix
diff --git a/depot/users/kat/sway/default.nix b/config/users/kat/sway/default.nix
similarity index 100%
rename from depot/users/kat/sway/default.nix
rename to config/users/kat/sway/default.nix
diff --git a/depot/users/kat/sway/gammastep.nix b/config/users/kat/sway/gammastep.nix
similarity index 100%
rename from depot/users/kat/sway/gammastep.nix
rename to config/users/kat/sway/gammastep.nix
diff --git a/depot/users/kat/sway/konawall.nix b/config/users/kat/sway/konawall.nix
similarity index 100%
rename from depot/users/kat/sway/konawall.nix
rename to config/users/kat/sway/konawall.nix
diff --git a/depot/users/kat/sway/mako.nix b/config/users/kat/sway/mako.nix
similarity index 100%
rename from depot/users/kat/sway/mako.nix
rename to config/users/kat/sway/mako.nix
diff --git a/depot/users/kat/sway/packages.nix b/config/users/kat/sway/packages.nix
similarity index 100%
rename from depot/users/kat/sway/packages.nix
rename to config/users/kat/sway/packages.nix
diff --git a/depot/users/kat/sway/sway.nix b/config/users/kat/sway/sway.nix
similarity index 100%
rename from depot/users/kat/sway/sway.nix
rename to config/users/kat/sway/sway.nix
diff --git a/depot/users/kat/sway/wallpapers/left.jpg b/config/users/kat/sway/wallpapers/left.jpg
similarity index 100%
rename from depot/users/kat/sway/wallpapers/left.jpg
rename to config/users/kat/sway/wallpapers/left.jpg
diff --git a/depot/users/kat/sway/wallpapers/main.png b/config/users/kat/sway/wallpapers/main.png
similarity index 100%
rename from depot/users/kat/sway/wallpapers/main.png
rename to config/users/kat/sway/wallpapers/main.png
diff --git a/depot/users/kat/sway/wallpapers/right.jpg b/config/users/kat/sway/wallpapers/right.jpg
similarity index 100%
rename from depot/users/kat/sway/wallpapers/right.jpg
rename to config/users/kat/sway/wallpapers/right.jpg
diff --git a/depot/users/kat/sway/waybar/default.nix b/config/users/kat/sway/waybar/default.nix
similarity index 100%
rename from depot/users/kat/sway/waybar/default.nix
rename to config/users/kat/sway/waybar/default.nix
diff --git a/depot/users/kat/sway/waybar/waybar.css.nix b/config/users/kat/sway/waybar/waybar.css.nix
similarity index 100%
rename from depot/users/kat/sway/waybar/waybar.css.nix
rename to config/users/kat/sway/waybar/waybar.css.nix
diff --git a/default.nix b/default.nix
index a44782f7..f1fd2804 100644
--- a/default.nix
+++ b/default.nix
@@ -12,37 +12,37 @@ let
 
   /*
   This is used to generate specialArgs + the like. It works as such:
-    * A <depotName> can exist at config/<depotName>.
-    * A <depotName> can exist at config/trusted/<depotName>.
+    * A <subconfigName> can exist at config/<subconfigName>.
+    * A <subconfigName> can exist at config/trusted/<subconfigName>.
   If only one exists, the path for that one is returned.
   Otherwise a module is generated which contains both import paths.
   */
-  depotNames = lib.unique (lib.folderList ./depot ["trusted"] ++ lib.folderList ./depot/trusted ["pkgs" "tf"]);
-  depot = lib.mapListToAttrs (folder: lib.nameValuePair folder (lib.domainMerge {
+  subconfigNames = lib.unique (lib.folderList ./config ["trusted"] ++ lib.folderList ./config/trusted ["pkgs" "tf"]);
+  subconfig = lib.mapListToAttrs (folder: lib.nameValuePair folder (lib.domainMerge {
     inherit folder;
-    folderPaths = [ (./depot + "/${folder}") (./depot/trusted + "/${folder}") ];
-  })) depotNames;
+    folderPaths = [ (./config + "/${folder}") (./config/trusted + "/${folder}") ];
+  })) subconfigNames;
 
   /*
   We use this to make the meta runner use this file and to use `--show-trace` on nix-builds.
   We also pass through pkgs to meta this way.
   */
   metaConfig = import ./meta.nix {
-    inherit pkgs lib depot;
+    inherit pkgs lib;
   };
 
   # This is where the meta config is evaluated.
   eval = lib.evalModules {
     modules = lib.singleton metaConfig
-    ++ lib.attrValues (removeAttrs depot.targets ["common"])
-    ++ lib.attrValues depot.hosts
-    ++ lib.optional (builtins.pathExists ./depot/trusted/meta.nix) ./depot/trusted/meta.nix
-    ++ lib.singleton ./depot/modules/meta/default.nix;
+    ++ lib.attrValues (removeAttrs subconfig.targets ["common"])
+    ++ lib.attrValues subconfig.hosts
+    ++ lib.optional (builtins.pathExists ./config/trusted/meta.nix) ./config/trusted/meta.nix
+    ++ lib.singleton ./config/modules/meta/default.nix;
 
     specialArgs = {
       inherit sources root;
       meta = self;
-    } // depot;
+    } // subconfig;
   };
 
   # The evaluated meta config.
@@ -50,7 +50,7 @@ let
 
 /*
   Please note all specialArg generated specifications use the folder common to both import paths.
-  Those import paths are as mentioned above next to `depotNames`.
+  Those import paths are as mentioned above next to `subconfigNames`.
 
   This provides us with a ./. that contains (most relevantly):
     * deploy.targets -> a mapping of target name to host names
@@ -61,5 +61,5 @@ let
       * do not use common, it is tf-nix specific config ingested at line 66 of config/modules/meta/deploy.nix for every target.
     * services -> the specialArg generated from services/
 */
-self = config // { inherit pkgs lib sourceCache sources; } // depot;
+self = config // { inherit pkgs lib sourceCache sources; } // subconfig;
 in self
diff --git a/depot/trusted b/depot/trusted
deleted file mode 160000
index 67087730..00000000
--- a/depot/trusted
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 6708773084feede47c13793902f66b432b12ed19