From 68c0738d05884a02534c47521b8c065a7b4c4bbd Mon Sep 17 00:00:00 2001
From: punkfairie <marley@punkfairie.net>
Date: Tue, 27 May 2025 18:31:34 -0700
Subject: [PATCH] feat: reorganizing

---
 modules/base/profiles.nix                            |  3 +++
 modules/{nixos => base}/programs/curl.nix            |  0
 modules/base/programs/default.nix                    |  3 +++
 modules/{nixos => base}/programs/jq.nix              |  0
 modules/{nixos => base}/programs/less.nix            |  0
 modules/darwin/default.nix                           |  2 ++
 modules/darwin/profiles.nix                          | 12 ++++++++++++
 modules/darwin/programs/default.nix                  |  1 +
 .../nh/default.nix => modules/darwin/programs/nh.nix |  9 +--------
 modules/home/programs/nh.nix                         |  7 +++++++
 modules/nixos/profiles.nix                           |  3 ---
 modules/nixos/programs/default.nix                   |  3 ---
 12 files changed, 29 insertions(+), 14 deletions(-)
 rename modules/{nixos => base}/programs/curl.nix (100%)
 rename modules/{nixos => base}/programs/jq.nix (100%)
 rename modules/{nixos => base}/programs/less.nix (100%)
 create mode 100644 modules/darwin/profiles.nix
 rename snowflake/modules/home/programs/cli/nh/default.nix => modules/darwin/programs/nh.nix (59%)

diff --git a/modules/base/profiles.nix b/modules/base/profiles.nix
index 33de935..1d4e3e0 100644
--- a/modules/base/profiles.nix
+++ b/modules/base/profiles.nix
@@ -12,7 +12,10 @@ in {
     # Universal - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
     {
       programs = {
+        curl = enabled;
         fish = enabled;
+        jq = enabled;
+        less = enabled;
         neovim = enabled;
       };
     }
diff --git a/modules/nixos/programs/curl.nix b/modules/base/programs/curl.nix
similarity index 100%
rename from modules/nixos/programs/curl.nix
rename to modules/base/programs/curl.nix
diff --git a/modules/base/programs/default.nix b/modules/base/programs/default.nix
index fd98f72..7f005bb 100644
--- a/modules/base/programs/default.nix
+++ b/modules/base/programs/default.nix
@@ -1,6 +1,9 @@
 {
   imports = [
+    ./curl.nix
     ./fish.nix
+    ./jq.nix
+    ./less.nix
     ./neovim.nix
   ];
 }
diff --git a/modules/nixos/programs/jq.nix b/modules/base/programs/jq.nix
similarity index 100%
rename from modules/nixos/programs/jq.nix
rename to modules/base/programs/jq.nix
diff --git a/modules/nixos/programs/less.nix b/modules/base/programs/less.nix
similarity index 100%
rename from modules/nixos/programs/less.nix
rename to modules/base/programs/less.nix
diff --git a/modules/darwin/default.nix b/modules/darwin/default.nix
index 16ec023..e74f04c 100644
--- a/modules/darwin/default.nix
+++ b/modules/darwin/default.nix
@@ -9,5 +9,7 @@
 
     ./system
     ./programs
+
+    ./profiles.nix
   ];
 }
diff --git a/modules/darwin/profiles.nix b/modules/darwin/profiles.nix
new file mode 100644
index 0000000..e2abc74
--- /dev/null
+++ b/modules/darwin/profiles.nix
@@ -0,0 +1,12 @@
+{marleylib, ...}: let
+  inherit (marleylib.module) enabled;
+in {
+  marleyos = {
+    programs = {
+      fish = enabled;
+      nh = enabled;
+      wezterm = enabled;
+      wireguard = enabled;
+    };
+  };
+}
diff --git a/modules/darwin/programs/default.nix b/modules/darwin/programs/default.nix
index e98a65a..04d920e 100644
--- a/modules/darwin/programs/default.nix
+++ b/modules/darwin/programs/default.nix
@@ -1,6 +1,7 @@
 {
   imports = [
     ./fish.nix
+    ./nh.nix
     ./wezterm.nix
     ./wireguard.nix
   ];
diff --git a/snowflake/modules/home/programs/cli/nh/default.nix b/modules/darwin/programs/nh.nix
similarity index 59%
rename from snowflake/modules/home/programs/cli/nh/default.nix
rename to modules/darwin/programs/nh.nix
index 2aef342..901376a 100644
--- a/snowflake/modules/home/programs/cli/nh/default.nix
+++ b/modules/darwin/programs/nh.nix
@@ -1,11 +1,10 @@
 {
-  lib,
   config,
+  lib,
   pkgs,
   ...
 }: let
   cfg = config.marleyos.programs.nh;
-  home = config.home.homeDirectory;
 in {
   options.marleyos.programs.nh.enable = lib.mkEnableOption "nh";
 
@@ -13,11 +12,5 @@ in {
     home.packages = with pkgs; [
       nh
     ];
-
-    home.sessionVariables.FLAKE = lib.mkDefault "${home}/marleyos";
-
-    home.shellAbbrs = {
-      nhs = "nh search";
-    };
   };
 }
diff --git a/modules/home/programs/nh.nix b/modules/home/programs/nh.nix
index 0108445..5b267e0 100644
--- a/modules/home/programs/nh.nix
+++ b/modules/home/programs/nh.nix
@@ -15,6 +15,7 @@ in {
   config = lib.mkIf cfg.enable {
     programs.nh = {
       enable = true;
+
       clean =
         osConfig.programs.nh.clean
         or {
@@ -23,5 +24,11 @@ in {
           extraArgs = "--keep-since 7d --keep 3";
         };
     };
+
+    home.sessionVariables.FLAKE = "${config.home.homeDirectory}/marleyos";
+
+    home.shellAbbrs = {
+      nhs = "nh search";
+    };
   };
 }
diff --git a/modules/nixos/profiles.nix b/modules/nixos/profiles.nix
index 8951ca2..44ca8b1 100644
--- a/modules/nixos/profiles.nix
+++ b/modules/nixos/profiles.nix
@@ -12,10 +12,7 @@ in {
     # Universal - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
     {
       programs = {
-        curl = enabled;
         fish = enabled;
-        jq = enabled;
-        less = enabled;
         nh = enabled;
       };
 
diff --git a/modules/nixos/programs/default.nix b/modules/nixos/programs/default.nix
index 2f467c3..eb2502c 100644
--- a/modules/nixos/programs/default.nix
+++ b/modules/nixos/programs/default.nix
@@ -1,9 +1,6 @@
 {
   imports = [
-    ./curl.nix
     ./fish.nix
-    ./jq.nix
-    ./less.nix
     ./nh.nix
     ./waybar.nix
   ];