diff --git a/hosts/yodaNas/configuration.nix b/hosts/yodaNas/configuration.nix
index 5bfefc7..31f8f61 100644
--- a/hosts/yodaNas/configuration.nix
+++ b/hosts/yodaNas/configuration.nix
@@ -26,6 +26,7 @@ in
       #../../modules/yodaNas.nix
 
       ../../modules/base.nix
+      ../../modules/base-headless.nix
       #../../modules/base-gnome.nix
       #../../modules/programs.nix
       #../../modules/autostart.nix
diff --git a/hosts/yodaTab/configuration.nix b/hosts/yodaTab/configuration.nix
index 46a45e3..faf5c1d 100644
--- a/hosts/yodaTab/configuration.nix
+++ b/hosts/yodaTab/configuration.nix
@@ -24,6 +24,7 @@ in
       ../../modules/nur.nix
 
       ../../modules/base.nix
+      #../../modules/base-headless.nix
       ../../modules/base-gnome.nix
       ../../modules/programs.nix
       ../../modules/autostart.nix
diff --git a/hosts/yodaTux/configuration.nix b/hosts/yodaTux/configuration.nix
index 312e420..ce9b451 100644
--- a/hosts/yodaTux/configuration.nix
+++ b/hosts/yodaTux/configuration.nix
@@ -24,6 +24,7 @@ in
       ../../modules/nur.nix
 
       ../../modules/base.nix
+      #../../modules/base-headless.nix
       ../../modules/base-gnome.nix
       ../../modules/programs.nix
       ../../modules/autostart.nix
diff --git a/hosts/yodaYoga/configuration.nix b/hosts/yodaYoga/configuration.nix
index 51c6632..9b6dc98 100644
--- a/hosts/yodaYoga/configuration.nix
+++ b/hosts/yodaYoga/configuration.nix
@@ -26,6 +26,7 @@ in
       ../../modules/yodaYoga.nix
 
       ../../modules/base.nix
+      ../../modules/base-headless.nix
       #../../modules/base-gnome.nix
       #../../modules/programs.nix
       #../../modules/autostart.nix
diff --git a/modules/base-headless.nix b/modules/base-headless.nix
new file mode 100644
index 0000000..edaef81
--- /dev/null
+++ b/modules/base-headless.nix
@@ -0,0 +1,10 @@
+{ config, pkgs, ... }:
+
+{
+  users.users.yoda = {
+    packages = with pkgs; [
+      htop
+      screen
+    ];
+  };
+}
diff --git a/modules/yodaYoga.nix b/modules/yodaYoga.nix
index b9052e2..dd6107a 100644
--- a/modules/yodaYoga.nix
+++ b/modules/yodaYoga.nix
@@ -3,9 +3,8 @@
 {
   users.users.yoda = {
     packages = with pkgs; [
+      # TODO: Is git required for home-manager "builtins.fetchGit"
       git
-      htop
-      screen
     ];
   };