diff --git a/common/auth.nix b/common/auth.nix
index 0a92033c..98f21856 100644
--- a/common/auth.nix
+++ b/common/auth.nix
@@ -1,6 +1,7 @@
 {
   pkgs,
   inputs,
+device,
   ...
 }: {
   # import the home-manager module
@@ -8,7 +9,7 @@
   programs = {
     _1password-shell-plugins = {
       # enable 1Password shell plugins for bash, zsh, and fish shell
-      enable = true;
+      enable = device.hasGui;
       # the specified packages as well as 1Password CLI will be
       # automatically installed and configured to use shell plugins
       plugins = with pkgs; [awscli2 cachix cargo];
diff --git a/linux/default.nix b/linux/default.nix
index fed2cc8d..d8bb1fa8 100644
--- a/linux/default.nix
+++ b/linux/default.nix
@@ -1,17 +1,20 @@
 {
   pkgs,
+  lib,
   device,
   ...
 }: {
-  imports = [
-    ../common/firefox.nix
-    ../linux/hyprland.nix
-    ../linux/gtk.nix
-    ../linux/anyrun.nix
-    ../linux/ironbar
-    ../linux/foot.nix
-    ../linux/mpd.nix
-  ];
+  imports =
+    []
+    ++ (lib.optionals device.hasGui [
+      ../common/firefox.nix
+      ../linux/hyprland.nix
+      ../linux/gtk.nix
+      ../linux/anyrun.nix
+      ../linux/ironbar
+      ../linux/foot.nix
+      ../linux/mpd.nix
+    ]);
 
   services.kdeconnect.enable = device.hasGui;
   services.kdeconnect.indicator = device.hasGui;
diff --git a/linux/hyprland.nix b/linux/hyprland.nix
index 67c7b342..5a3699d7 100644
--- a/linux/hyprland.nix
+++ b/linux/hyprland.nix
@@ -10,7 +10,8 @@
   programs.hyprpaper = let
     wallpapers = import ../utils/wallhaven.nix {inherit pkgs;};
   in {
-    enable = device.hasGui;
+    # enable = device.hasGui;
+    enable = false;
     systemd.enable = true;
     systemd.target = "hyprland-session.target";
     settings.preload = wallpapers.all;