diff --git a/hosts/neodymium/default.nix b/hosts/neodymium/default.nix
index e4b8371..61f63fc 100644
--- a/hosts/neodymium/default.nix
+++ b/hosts/neodymium/default.nix
@@ -1,5 +1,5 @@
 { pkgs, ... }: {
-  imports = [ ./system ];
+  imports = [ ./system ./services ];
 
   # shorter timeout for systemd services
   systemd.extraConfig = ''
diff --git a/hosts/neodymium/system/borgbackup/default.nix b/hosts/neodymium/services/borgbackup/default.nix
similarity index 100%
rename from hosts/neodymium/system/borgbackup/default.nix
rename to hosts/neodymium/services/borgbackup/default.nix
diff --git a/hosts/neodymium/services/default.nix b/hosts/neodymium/services/default.nix
new file mode 100644
index 0000000..25ab436
--- /dev/null
+++ b/hosts/neodymium/services/default.nix
@@ -0,0 +1 @@
+{ ... }: { imports = [ ./borgbackup ./greetd ]; }
diff --git a/hosts/neodymium/system/greetd/default.nix b/hosts/neodymium/services/greetd/default.nix
similarity index 57%
rename from hosts/neodymium/system/greetd/default.nix
rename to hosts/neodymium/services/greetd/default.nix
index 7de8df3..eaec9cc 100644
--- a/hosts/neodymium/system/greetd/default.nix
+++ b/hosts/neodymium/services/greetd/default.nix
@@ -4,7 +4,8 @@
 
     settings = {
       default_session = {
-        command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --cmd Hyprland";
+        command =
+          "${pkgs.greetd.tuigreet}/bin/tuigreet --time --cmd Hyprland"; # TODO: use nix pkgs
         user = "greeter";
       };
     };
diff --git a/hosts/neodymium/system/default.nix b/hosts/neodymium/system/default.nix
index e6adb36..f283a24 100644
--- a/hosts/neodymium/system/default.nix
+++ b/hosts/neodymium/system/default.nix
@@ -12,10 +12,8 @@
     ./age
     ./audio
     ./boot
-    ./borgbackup
     ./docker
     ./fonts
-    ./greetd
     ./hardware
     ./i18n
     ./networking