From cbcb45221dec6299311089ac1f7f5967bf1042d4 Mon Sep 17 00:00:00 2001
From: Bloxx12 <charlie@charlieroot.dev>
Date: Thu, 12 Jun 2025 20:12:47 +0200
Subject: [PATCH] niri: enable if isGraphical is true

---
 modules/wms/wayland/niri/module.nix | 50 ++++++++++++++++-------------
 1 file changed, 27 insertions(+), 23 deletions(-)

diff --git a/modules/wms/wayland/niri/module.nix b/modules/wms/wayland/niri/module.nix
index 6c731d0..ced7ddb 100644
--- a/modules/wms/wayland/niri/module.nix
+++ b/modules/wms/wayland/niri/module.nix
@@ -7,35 +7,39 @@
   inherit (lib.modules) mkForce mkIf;
   inherit (lib.options) mkEnableOption;
 
+  inherit (config.modules.system) isGraphical;
   cfg = config.modules.desktops.niri;
 in {
   options.modules.desktops.niri.enable = mkEnableOption "Niri, a scolling tiling wayland compositor";
-  config = mkIf cfg.enable {
-    programs.niri = {
-      enable = true;
-      package = pkgs.niri;
-    };
-    #  The niri module auto enables the gnome keyring,
-    #  which is something I direly want to avoid.
-    services.gnome.gnome-keyring.enable = mkForce false;
 
-    # set niri's config location to /etc/niri/config.kdl.
-    environment.etc."niri/config.kdl".source = ./config.kdl;
+  config =
+    mkIf (cfg.enable
+      || isGraphical)
+    {
+      programs.niri = {
+        enable = true;
+        package = pkgs.niri;
+      };
+      #  The niri module auto enables the gnome keyring,
+      #  which is something I direly want to avoid.
+      services.gnome.gnome-keyring.enable = mkForce false;
 
-    environment.systemPackages = builtins.attrValues {
-      inherit (pkgs) xwayland-satellite avizo;
-    };
+      environment.etc."niri/config.kdl".source = ./config.kdl;
 
-    xdg.portal = {
-      enable = true;
-      xdgOpenUsePortal = true;
-      extraPortals = [
-        pkgs.xdg-desktop-portal-gtk
-      ];
-      config = {
-        common.default = ["*"];
-        hyprland.default = ["gtk"];
+      environment.systemPackages = builtins.attrValues {
+        inherit (pkgs) xwayland-satellite avizo;
+      };
+
+      xdg.portal = {
+        enable = true;
+        xdgOpenUsePortal = true;
+        extraPortals = [
+          pkgs.xdg-desktop-portal-gtk
+        ];
+        config = {
+          common.default = ["*"];
+          hyprland.default = ["gtk"];
+        };
       };
     };
-  };
 }