oysteikt/nix-dotfiles
oysteikt
/
nix-dotfiles
2
1
Fork 0
Code Issues Pull Requests Activity

common.nix: fix weird headless-var recursion issue

This commit is contained in:
Oystein Kristoffer Tveit 2023-02-25 18:05:57 +01:00
parent 42938295ac
commit 7f416ed5b8
Signed by: oysteikt
GPG Key ID: 9F2F7D8250F35146
1 changed files with 4 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
hosts/common.nix
View File

@ -1,8 +1,6 @@
{ pkgs, unstable-pkgs, lib, extendedLib, config, inputs, secrets, ... }: { pkgs, unstable-pkgs, lib, extendedLib, config, inputs, secrets, ... }:
let let
# inherit (specialArgs) machineVars;
inherit (config) machineVars; inherit (config) machineVars;
# has_graphics = !config.machineVars.headless;
in { in {
nixpkgs.config = { nixpkgs.config = {
allowUnfree = true; allowUnfree = true;
@ -243,7 +241,7 @@ in {
pcscd.enable = true; pcscd.enable = true;
dbus = { dbus = {
# enable = !machineVars.headless; enable = true;
packages = with pkgs; [ packages = with pkgs; [
gcr gcr
dconf dconf
@ -251,17 +249,7 @@ in {
}; };
xserver = { xserver = {
# TODO: What is going on here? enable = !config.machineVars.headless;
# For some reason, this leads to infinite recursion.
# This needs to be fixed!
# Same with `displayManager.lightdm.enable`
# options are defined in each hosts config file for the time being.
#
# I have a hypothesis that there are some asserts within xserver that
# makes it so that other software can not be activated at the same time
# and that those asserts triggers some kind of evaluation chain that
# recurses infinitely.
# enable = true;
layout = "us"; layout = "us";
xkbOptions = "caps:escape"; xkbOptions = "caps:escape";
@ -272,7 +260,7 @@ in {
desktopManager = { desktopManager = {
xterm.enable = false; xterm.enable = false;
xfce.enable = !config.machineVars.headless; xfce.enable = true;
}; };
windowManager.xmonad = { windowManager.xmonad = {
@ -284,9 +272,7 @@ in {
]; ];
}; };
# displayManager.startx.enable = true; displayManager.lightdm.enable = true;
# displayManager.gdm.enable = true;
# displayManager.lightdm.enable = true;
displayManager.defaultSession = "none+xmonad"; displayManager.defaultSession = "none+xmonad";
}; };