diff --git a/hosts/yodaTab/configuration.nix b/hosts/yodaTab/configuration.nix
index 0402856..e18950a 100644
--- a/hosts/yodaTab/configuration.nix
+++ b/hosts/yodaTab/configuration.nix
@@ -20,6 +20,7 @@
 
       ../../modules/gnome-base.nix
       ../../modules/gnome-config.nix
+      ../../modules/gnome-terminal.nix
       ../../modules/gnome-extensions.nix
       # Not required as display scale is set 2.0 (multiple of 1).
       #../../modules/gnome-fractional-scaling.nix
diff --git a/hosts/yodaTux/configuration.nix b/hosts/yodaTux/configuration.nix
index 8a408af..3b3bffe 100644
--- a/hosts/yodaTux/configuration.nix
+++ b/hosts/yodaTux/configuration.nix
@@ -20,6 +20,7 @@
 
       ../../modules/gnome-base.nix
       ../../modules/gnome-config.nix
+      ../../modules/gnome-terminal.nix
       ../../modules/gnome-extensions.nix
       ../../modules/gnome-fractional-scaling.nix
       ../../modules/fwupd-gnome.nix
diff --git a/modules/gnome-config.nix b/modules/gnome-config.nix
index ad27382..8da9e05 100644
--- a/modules/gnome-config.nix
+++ b/modules/gnome-config.nix
@@ -31,43 +31,6 @@
       "Templates/new.txt".text = "";
     };
 
-    programs.gnome-terminal.enable = true;
-    programs.gnome-terminal.profile."74b90a31-5123-4a64-91a3-3cb31eb5cdb6" = {
-      default = true;
-      visibleName = "Yoda's Terminal";
-      font = "DejaVu Sans Mono 11";
-      audibleBell = false;
-
-      # Theme: https://github.com/chriskempson/base16-default-schemes/blob/master/default-light.yaml
-      # Where to place theme values: https://github.com/knopki/devops-at-home/blob/307921320d6147347e830d2c709f142b809d55b4/home/modules/theme/theme-gnome-terminal.nix#L16-L41
-      colors = {
-        backgroundColor = "#f8f8f8";
-        foregroundColor = "#383838";
-        cursor = {
-          background = "#383838";
-          foreground = "#f8f8f8";
-        };
-        palette = [
-          "#f8f8f8"
-          "#ab4642"
-          "#a1b56c"
-          "#f7ca88"
-          "#7cafc2"
-          "#ba8baf"
-          "#86c1b9"
-          "#383838"
-          "#b8b8b8"
-          "#dc9656"
-          "#e8e8e8"
-          "#d8d8d8"
-          "#585858"
-          "#282828"
-          "#a16946"
-          "#181818"
-        ];
-      };
-    };
-
     dconf.settings = {
       "org/gnome/desktop/media-handling" = {
         # Settings > Removable Media > Never promt or start apps on media insertion
diff --git a/modules/gnome-terminal.nix b/modules/gnome-terminal.nix
new file mode 100644
index 0000000..f7e7b5d
--- /dev/null
+++ b/modules/gnome-terminal.nix
@@ -0,0 +1,47 @@
+{ config, pkgs, ... }:
+{
+#  users.users.yoda = {
+#    packages = with pkgs; [
+#      gnome.gnome-terminal
+#    ];
+#  };
+
+  home-manager.users.yoda = { osConfig, config, pkgs, ... }: {
+    programs.gnome-terminal.enable = true;
+    programs.gnome-terminal.profile."74b90a31-5123-4a64-91a3-3cb31eb5cdb6" = {
+      default = true;
+      visibleName = "Yoda's Terminal";
+      font = "DejaVu Sans Mono 11";
+      audibleBell = false;
+
+      # Theme: https://github.com/chriskempson/base16-default-schemes/blob/master/default-light.yaml
+      # Where to place theme values: https://github.com/knopki/devops-at-home/blob/307921320d6147347e830d2c709f142b809d55b4/home/modules/theme/theme-gnome-terminal.nix#L16-L41
+      colors = {
+        backgroundColor = "#f8f8f8";
+        foregroundColor = "#383838";
+        cursor = {
+          background = "#383838";
+          foreground = "#f8f8f8";
+        };
+        palette = [
+          "#f8f8f8"
+          "#ab4642"
+          "#a1b56c"
+          "#f7ca88"
+          "#7cafc2"
+          "#ba8baf"
+          "#86c1b9"
+          "#383838"
+          "#b8b8b8"
+          "#dc9656"
+          "#e8e8e8"
+          "#d8d8d8"
+          "#585858"
+          "#282828"
+          "#a16946"
+          "#181818"
+        ];
+      };
+    };
+  };
+}
diff --git a/modules/programs.nix b/modules/programs.nix
index 51b7a3c..8dabf97 100644
--- a/modules/programs.nix
+++ b/modules/programs.nix
@@ -15,7 +15,6 @@
       colmena
 
       # Graphical apps
-      gnome.gnome-terminal # Terminal. For now, we use this instead of gnome-console.
       gnome.gnome-tweaks
       gnome.dconf-editor
       meld # Diff and merge tool