From cc03b643766bedfb3bf0572a422df93f62e24d34 Mon Sep 17 00:00:00 2001 From: h7x4 Date: Mon, 8 May 2023 02:29:38 +0200 Subject: [PATCH] common: use machinevars to determine whether to use x11 --- hosts/common.nix | 4 ++-- hosts/tsuki/configuration.nix | 4 ---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/hosts/common.nix b/hosts/common.nix index 93008ef..ff804ea 100644 --- a/hosts/common.nix +++ b/hosts/common.nix @@ -259,7 +259,7 @@ in { desktopManager = { xterm.enable = false; - xfce.enable = true; + xfce.enable = !config.machineVars.headless; }; windowManager.xmonad = { @@ -271,7 +271,7 @@ in { ]; }; - displayManager.lightdm.enable = true; + displayManager.lightdm.enable = !config.machineVars.headless; displayManager.defaultSession = "none+xmonad"; }; diff --git a/hosts/tsuki/configuration.nix b/hosts/tsuki/configuration.nix index 9d2e893..0103ae7 100644 --- a/hosts/tsuki/configuration.nix +++ b/hosts/tsuki/configuration.nix @@ -25,10 +25,6 @@ ./services/vscode-server.nix ]; - # TODO: See ../common.nix - services.xserver.enable = false; - services.xserver.displayManager.lightdm.enable = false; - machineVars = { headless = true; dataDrives = {