From b5b20c7b19e525f3cd669092cb693fb8693e9d04 Mon Sep 17 00:00:00 2001
From: Donovan Glover <donovan@dglover.co>
Date: Sat, 18 May 2024 23:56:31 -0400
Subject: [PATCH] tests: Test neovim with config

Fixes an issue where previously the home-manager config for neovim
wasn't actually being tested.
---
 modules/desktop.nix |  2 +-
 tests/neovim.nix    | 10 +++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/modules/desktop.nix b/modules/desktop.nix
index 799e8d6d..235b3e9d 100644
--- a/modules/desktop.nix
+++ b/modules/desktop.nix
@@ -70,7 +70,7 @@ in
         mountOnMedia = true;
       };
 
-      xserver = {
+      xserver = mkIf (!container) {
         enable = true;
         excludePackages = [ pkgs.xterm ];
       };
diff --git a/tests/neovim.nix b/tests/neovim.nix
index 3ab8bd83..bc7dae09 100644
--- a/tests/neovim.nix
+++ b/tests/neovim.nix
@@ -6,7 +6,15 @@ in
 
   nodes.machine = { nix-config, ... }: {
     imports = attrValues {
-      inherit (nix-config.nixosModules) system shell;
+      inherit (nix-config.nixosModules) desktop system shell;
+
+      customConfig = {
+        modules.desktop.container = true;
+      };
+    };
+
+    home-manager.sharedModules = attrValues {
+      inherit (nix-config.homeManagerModules) neovim;
     };
   };