diff --git a/apps/run-workflow-with-vm/configuration.nix b/apps/run-workflow-with-vm/configuration.nix index cd3a0405..80d3eef4 100644 --- a/apps/run-workflow-with-vm/configuration.nix +++ b/apps/run-workflow-with-vm/configuration.nix @@ -1,6 +1,7 @@ # A very basic NixOS VM configuration intended for testing out the given # workflow module. It's a good thing the baseline for the configuration is not -# tedious to set up for simpler configs like this. +# tedious to set up for simpler configs like this. Just take note this is +# executed on a separate directory as its own so relative paths are moot. { workflow, extraModules ? [ ], extraHomeModules ? [ ] }: let @@ -33,6 +34,10 @@ import { ]; config = { + # Enable the display manager of choice. + services.xserver.displayManager.gdm.enable = true; + + # Configure home-manager-related stuff. home-manager.useUserPackages = lib.mkDefault true; home-manager.useGlobalPkgs = lib.mkDefault true; home-manager.sharedModules = extraHomeModules ++ [ @@ -46,9 +51,11 @@ import { }) ]; + # Set up our own library. _module.args.foodogsquaredLib = import ../../lib/extras/nixos-set.nix { inherit lib; }; + # The main function of the configuration. workflows.workflows.${workflow}.enable = true; nixpkgs.overlays = [ diff --git a/configs/nixos/ni/default.nix b/configs/nixos/ni/default.nix index c9a31f4a..c7d7565c 100644 --- a/configs/nixos/ni/default.nix +++ b/configs/nixos/ni/default.nix @@ -24,6 +24,9 @@ }; }; + # Enable the display manager of choice. + services.xserver.displayManager.gdm.enable = true; + disko.devices = import ./disko.nix { disks = [ "/dev/nvme0n1" ]; }; diff --git a/modules/nixos/workflows/a-happy-gnome/default.nix b/modules/nixos/workflows/a-happy-gnome/default.nix index 5016493f..4c5e8628 100644 --- a/modules/nixos/workflows/a-happy-gnome/default.nix +++ b/modules/nixos/workflows/a-happy-gnome/default.nix @@ -85,7 +85,6 @@ in # Enable GNOME and GDM. services.xserver = { enable = true; - displayManager.gdm.enable = true; desktopManager.gnome.enable = true; }; diff --git a/modules/nixos/workflows/knome/default.nix b/modules/nixos/workflows/knome/default.nix index 9c72e45d..3ac7f61b 100644 --- a/modules/nixos/workflows/knome/default.nix +++ b/modules/nixos/workflows/knome/default.nix @@ -9,7 +9,6 @@ in config = lib.mkIf cfg.enable { services.xserver = { enable = true; - displayManager.sddm.enable = true; desktopManager.plasma5 = { enable = true;