diff --git a/base/default.nix b/base/default.nix
index 3331a09..123b658 100644
--- a/base/default.nix
+++ b/base/default.nix
@@ -1,6 +1,7 @@
 { ... }:
 {
   imports = [
+    ./gui-programs.nix
     ./networking.nix
     ./nix.nix
     ./programs.nix
diff --git a/base/gui-programs.nix b/base/gui-programs.nix
index 9f6f862..1815fe3 100644
--- a/base/gui-programs.nix
+++ b/base/gui-programs.nix
@@ -1,31 +1,35 @@
-{ pkgs, ... }:
+{ pkgs, lib, config, ... }:
 {
-  environment.systemPackages = with pkgs; [
-    element-desktop
-    feh
-    firefox
-    ffmpeg
-    gimp
-    gnome.nautilus
-    imagemagick
-    mpv
-    obs-studio
-    pavucontrol
-    slack
-    spotify
-    tdesktop
-    teams
-    thunderbird
-    virt-manager
-    zathura
+  options.my.gui.enable = lib.mkEnableOption "System has some kind of screen attached";
 
-    unstable.discord
-  ];
+  config = lib.mkIf config.my.gui.enable {
+    environment.systemPackages = with pkgs; [
+      element-desktop
+      feh
+      firefox
+      ffmpeg
+      gimp
+      gnome.nautilus
+      imagemagick
+      mpv
+      obs-studio
+      pavucontrol
+      slack
+      spotify
+      tdesktop
+      teams
+      thunderbird
+      virt-manager
+      zathura
 
-  networking.networkmanager.enable = true;
-  programs.nm-applet.enable = true;
-  programs.steam.enable = true;
+      unstable.discord
+    ];
 
-  # NOTE: needed for home emacs configuration
-  nixpkgs.config.input-fonts.acceptLicense = true;
+    networking.networkmanager.enable = true;
+    programs.nm-applet.enable = true;
+    programs.steam.enable = true;
+
+    # NOTE: needed for home emacs configuration
+    nixpkgs.config.input-fonts.acceptLicense = true;
+  };
 }
diff --git a/boreal.nix b/boreal.nix
index 498c76a..63b89d5 100644
--- a/boreal.nix
+++ b/boreal.nix
@@ -3,7 +3,6 @@
   imports = [
     # Default configuration
     ./base
-    ./base/gui-programs.nix
 
     # Module definitions
     ./modules
diff --git a/hosts/boreal/default.nix b/hosts/boreal/default.nix
index 089f3d1..439cde1 100644
--- a/hosts/boreal/default.nix
+++ b/hosts/boreal/default.nix
@@ -102,6 +102,7 @@ in
     };
   };
   my.displayManager.sddm.enable = true;
+  my.gui.enable = true;
 
   my.wakeonwlan.interfaces.phy0.methods = [
     "magic-packet"
diff --git a/hosts/zephyrus/default.nix b/hosts/zephyrus/default.nix
index e57efc2..a66c770 100644
--- a/hosts/zephyrus/default.nix
+++ b/hosts/zephyrus/default.nix
@@ -62,6 +62,7 @@ in
     fwupd.enable = true;
   };
   my.displayManager.sddm.enable = true;
+  my.gui.enable = true;
 
   environment.systemPackages = with pkgs; [
     arandr
diff --git a/zephyrus.nix b/zephyrus.nix
index 45f0074..e355eb3 100644
--- a/zephyrus.nix
+++ b/zephyrus.nix
@@ -3,7 +3,6 @@
   imports = [
     # Default configuration
     ./base
-    ./base/gui-programs.nix
 
     # Module definitions
     ./modules