From 8c014a0a97ef799e8af05b6b3a415ebb9bf07ea2 Mon Sep 17 00:00:00 2001
From: punkfairie <marley@punkfairie.net>
Date: Sun, 25 May 2025 20:28:54 -0700
Subject: [PATCH] feat: apps options

---
 modules/home/default.nix                      |  1 +
 .../home/options/apps.nix                     | 45 ++++++++-----------
 modules/home/options/default.nix              |  5 +++
 3 files changed, 24 insertions(+), 27 deletions(-)
 rename snowflake/modules/home/options/apps/default.nix => modules/home/options/apps.nix (77%)
 create mode 100644 modules/home/options/default.nix

diff --git a/modules/home/default.nix b/modules/home/default.nix
index 088352c..77578f2 100644
--- a/modules/home/default.nix
+++ b/modules/home/default.nix
@@ -2,6 +2,7 @@
   imports = [
     ../options
     ./option-inheritance.nix
+    ./options
 
     ./home-manager.nix
     ./profile.nix
diff --git a/snowflake/modules/home/options/apps/default.nix b/modules/home/options/apps.nix
similarity index 77%
rename from snowflake/modules/home/options/apps/default.nix
rename to modules/home/options/apps.nix
index 865950f..e8e8b6c 100644
--- a/snowflake/modules/home/options/apps/default.nix
+++ b/modules/home/options/apps.nix
@@ -2,14 +2,9 @@
   lib,
   config,
   pkgs,
-  system,
   ...
-}: let
-  inherit (lib.snowfall.system) is-linux;
-
-  cfg = config.marleyos.apps;
-in {
-  options.marleyos.apps = {
+}: {
+  options.marleycfg.apps = {
     pinentry = lib.mkOption {
       type = lib.types.package;
       default = pkgs.pinentry-gtk2;
@@ -46,7 +41,7 @@ in {
           };
         };
 
-        default = default;
+        inherit default;
       };
 
     terminal = lib.mkOption {
@@ -77,15 +72,10 @@ in {
         options = {
           package = lib.mkOption {
             type = lib.types.package;
-            default =
-              if config.marleyos.wayland.hyprland.enable
-              then config.programs.wofi.package
-              else config.programs.rofi.package;
             description = "The launcher to use.";
           };
           command = lib.mkOption {
             type = lib.types.str;
-            default = "--show drun";
             description = ''
               The command appended after the launcher binary to run it.
             '';
@@ -95,18 +85,19 @@ in {
     };
   };
 
-  config = lib.mkIf (is-linux system) {
-    home.packages = [
-      cfg.pinentry
-      cfg.clipboard.package
-    ];
-
-    programs.rbw = lib.mkDefault {
-      settings.pinentry = cfg.pinentry;
-    };
-
-    services.gpg-agent = lib.mkDefault {
-      pinentryPackage = cfg.pinentry;
-    };
-  };
+  # config = lib.mkIf pkgs.stdenv.isLinux {
+  #   home.packages = [
+  #     cfg.pinentry
+  #     cfg.clipboard.package
+  #   ];
+  #
+  #   # TODO: move these to respective modules
+  #   programs.rbw = lib.mkDefault {
+  #     settings.pinentry = cfg.pinentry;
+  #   };
+  #
+  #   services.gpg-agent = lib.mkDefault {
+  #     pinentryPackage = cfg.pinentry;
+  #   };
+  # };
 }
diff --git a/modules/home/options/default.nix b/modules/home/options/default.nix
new file mode 100644
index 0000000..d16581a
--- /dev/null
+++ b/modules/home/options/default.nix
@@ -0,0 +1,5 @@
+{
+  imports = [
+    ./apps.nix
+  ];
+}