From 66e104d402fa2ad0518070db16cb085d76f11244 Mon Sep 17 00:00:00 2001
From: punkfairie <marley@punkfairie.net>
Date: Tue, 27 May 2025 17:20:12 -0700
Subject: [PATCH] feat: move apps to global options

---
 modules/home/option-inheritance.nix | 8 +-------
 modules/home/options/default.nix    | 1 -
 modules/{home => }/options/apps.nix | 5 -----
 modules/options/default.nix         | 1 +
 4 files changed, 2 insertions(+), 13 deletions(-)
 rename modules/{home => }/options/apps.nix (96%)

diff --git a/modules/home/option-inheritance.nix b/modules/home/option-inheritance.nix
index d665a40..906e1df 100644
--- a/modules/home/option-inheritance.nix
+++ b/modules/home/option-inheritance.nix
@@ -3,13 +3,7 @@
 in {
   config = {
     marleycfg = {
-      profiles = {
-        inherit (cfg.profiles) desktop server;
-      };
-
-      my = {
-        inherit (cfg.my) name fullName username email git;
-      };
+      inherit (cfg) apps my profiles;
     };
   };
 }
diff --git a/modules/home/options/default.nix b/modules/home/options/default.nix
index bb259b7..6b0ed34 100644
--- a/modules/home/options/default.nix
+++ b/modules/home/options/default.nix
@@ -1,6 +1,5 @@
 {
   imports = [
-    ./apps.nix
     ./shellAbbrs.nix
   ];
 }
diff --git a/modules/home/options/apps.nix b/modules/options/apps.nix
similarity index 96%
rename from modules/home/options/apps.nix
rename to modules/options/apps.nix
index 65ab0d5..2c55c39 100644
--- a/modules/home/options/apps.nix
+++ b/modules/options/apps.nix
@@ -86,14 +86,9 @@
   };
 
   # config = lib.mkIf pkgs.stdenv.isLinux {
-  #
   #   # 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/options/default.nix b/modules/options/default.nix
index 652c21b..53a6407 100644
--- a/modules/options/default.nix
+++ b/modules/options/default.nix
@@ -1,5 +1,6 @@
 {
   imports = [
+    ./apps.nix
     ./my.nix
     ./profiles.nix
   ];