From cb3e7623ae3dfa5d385dd86d586c97ee9f34e80f Mon Sep 17 00:00:00 2001
From: Colin <colin@uninsane.org>
Date: Mon, 30 Jan 2023 01:49:51 +0000
Subject: [PATCH] refactor: modules/gui/default.nix: fold into
 hosts/modules/gui/default.nix

---
 hosts/modules/gui/default.nix | 27 ++++++++++++++++++++++++++-
 modules/default.nix           |  1 -
 modules/gui/default.nix       | 23 -----------------------
 3 files changed, 26 insertions(+), 25 deletions(-)
 delete mode 100644 modules/gui/default.nix

diff --git a/hosts/modules/gui/default.nix b/hosts/modules/gui/default.nix
index 02e299f9..40f23159 100644
--- a/hosts/modules/gui/default.nix
+++ b/hosts/modules/gui/default.nix
@@ -1,4 +1,9 @@
-{ ... }:
+{ lib, config, ... }:
+
+let
+  inherit (lib) mkDefault mkIf mkOption types;
+  cfg = config.sane.gui;
+in
 {
   imports = [
     ./gnome.nix
@@ -7,4 +12,24 @@
     ./plasma-mobile.nix
     ./sway.nix
   ];
+
+  options = {
+    sane.gui.enable = mkOption {
+      default = false;
+      type = types.bool;
+      description = ''
+        enables config used by any GUI, like display management or select packages.
+        the user should prefer to interact with specific GUIs like `sane.gui.sway`
+        and let those modules auto-set this flag when necessary.
+      '';
+    };
+  };
+
+  config = mkIf cfg.enable {
+    sane.packages.enableGuiPkgs = mkDefault true;
+
+    # preserve backlight brightness across power cycles
+    # see `man systemd-backlight`
+    sane.persist.sys.plaintext = [ "/var/lib/systemd/backlight" ];
+  };
 }
diff --git a/modules/default.nix b/modules/default.nix
index 31b9e21a..4e819ec7 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -4,7 +4,6 @@
   imports = [
     ./feeds.nix
     ./fs
-    ./gui
     ./home-manager
     ./ids.nix
     ./packages.nix
diff --git a/modules/gui/default.nix b/modules/gui/default.nix
deleted file mode 100644
index 9b00f63a..00000000
--- a/modules/gui/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ lib, config, ... }:
-
-with lib;
-let
-  cfg = config.sane.gui;
-in
-{
-  options = {
-    # doesn't directly create outputs. consumed by e.g. home-manager.nix module
-    sane.gui.enable = mkOption {
-      default = false;
-      type = types.bool;
-    };
-  };
-
-  config = lib.mkIf cfg.enable {
-    sane.packages.enableGuiPkgs = lib.mkDefault true;
-
-    # preserve backlight brightness across power cycles
-    # see `man systemd-backlight`
-    sane.persist.sys.plaintext = [ "/var/lib/systemd/backlight" ];
-  };
-}