feat: reorganizing

modules/base/profiles.nix

@@ -12,7 +12,10 @@ in {
     # Universal - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
     {
       programs = {
+        curl = enabled;
         fish = enabled;
+        jq = enabled;
+        less = enabled;
         neovim = enabled;
       };
     }

modules/base/programs/default.nix

@@ -1,6 +1,9 @@
 {
   imports = [
+    ./curl.nix
     ./fish.nix
+    ./jq.nix
+    ./less.nix
     ./neovim.nix
   ];
 }

modules/darwin/default.nix

@@ -9,5 +9,7 @@
 
     ./system
     ./programs
+
+    ./profiles.nix
   ];
 }

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;
+    };
+  };
+}

modules/darwin/programs/default.nix

@@ -1,6 +1,7 @@
 {
   imports = [
     ./fish.nix
+    ./nh.nix
     ./wezterm.nix
     ./wireguard.nix
   ];

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";
-    };
   };
 }

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";
+    };
   };
 }

modules/nixos/profiles.nix

@@ -12,10 +12,7 @@ in {
     # Universal - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
     {
       programs = {
-        curl = enabled;
         fish = enabled;
-        jq = enabled;
-        less = enabled;
         nh = enabled;
       };
 

modules/nixos/programs/default.nix

@@ -1,9 +1,6 @@
 {
   imports = [
-    ./curl.nix
     ./fish.nix
-    ./jq.nix
-    ./less.nix
     ./nh.nix
     ./waybar.nix
   ];