reorganize programs, move functions to library, and remove the rest of hyprland (all sway now)

1 files changed, 10 insertions, 19 deletions

diff --git a/modules/desktop/options.nix b/modules/desktop/options.nix
index 0301373..9bc4099 100644
--- a/modules/desktop/options.nix
+++ b/modules/desktop/options.nix
@@ -1,21 +1,11 @@
 {
   config,
   lib,
+  my-lib,
   ...
 }: let
   inherit (lib) mkOption mkEnableOption types;
-
-  mkProgramOption' = name: extraOpts:
-    {
-      enable = mkEnableOption "whether to enable ${name}";
-      theme = mkOption {
-        type = types.enum ["catppuccin" "adwaita"];
-        default = config.collinux.terminal.theme;
-      };
-    }
-    // extraOpts;
-
-  mkProgramOption = name: mkProgramOption' name {};
+  inherit (my-lib.options {inherit lib config;}) mkProgramOption;
 in {
   options = {
     collinux.desktop = {
@@ -24,21 +14,22 @@ in {
         default = let
           cfg = config.collinux.desktop;
         in
-          if ((cfg.hyprland.enable || cfg.sway.enable) && !cfg.gnome.enable)
+          if (cfg.sway.enable && !cfg.gnome.enable)
           then "greetd"
           else "gdm";
       };
 
+      wallpaper = mkOption {
+        type = types.path;
+      };
+
       components = {
         waybar = mkProgramOption "waybar";
         dunst = mkProgramOption "dunst";
         fuzzel = mkProgramOption "fuzzel";
       };
 
-      sway = {
-        enable = mkEnableOption "sway";
-      };
-
+      sway.enable = mkEnableOption "sway";
       gnome.enable = mkEnableOption "gnome";
 
       gtk.theme = mkOption {
@@ -58,9 +49,9 @@ in {
             default = config.collinux.theme;
           };
         };
-        foot.enable = mkEnableOption "foot";
 
-        musescore.enable = mkEnableOption "musescore";
+        foot.enable = mkEnableOption "foot";
+        blackbox.enable = mkEnableOption "blackbox";
       };
     };
   };