feat(home): Categorize programs; create bundles

homes/aarch64-darwin/marley@mairley/default.nix

@@ -1,46 +1,8 @@
-{
-  lib,
-  ...
-}:
-let
+{lib, ...}: let
   inherit (lib.marleyos) enabled;
-in
-{
+in {
   marleyos = {
-    isDesktop = true;
-
-    programs = {
-      amfora = enabled;
-      bat = enabled;
-      btop = enabled;
-      cheat = enabled;
-      curl = enabled;
-      eza = enabled;
-      figlet = enabled;
-      fish = enabled;
-      fzf = enabled;
-      gh = enabled;
-      git = enabled;
-      glow = enabled;
-      gpg = enabled;
-      hyfetch = enabled;
-      just = enabled;
-      lazygit = enabled;
-      less = enabled;
-      man = enabled;
-      neo = enabled;
-      neovim = enabled;
-      nh = enabled;
-      rbw = enabled;
-      ripgrep = enabled;
-      ssh = enabled;
-      starship = enabled;
-      tea = enabled;
-      tmux = enabled;
-      wezterm = enabled;
-      wget = enabled;
-      zoxide = enabled;
-    };
+    bundles.mac = enabled;
   };
 
   home.stateVersion = "24.05";

homes/x86_64-linux/marley@nyx/default.nix

@@ -2,58 +2,8 @@
   inherit (lib.marleyos) enabled;
 in {
   marleyos = {
-    isDesktop = true;
+    bundles.desktop = enabled;
 
-    appearance = {
-      base = enabled;
-      gtk = enabled;
-      qt = enabled;
-    };
-    # TODO: Seperate out into graphical/shell/tui?
-    programs = {
-      amfora = enabled;
-      bat = enabled;
-      btop = enabled;
-      calibre = enabled;
-      cava = enabled;
-      cheat = enabled;
-      curl = enabled;
-      eza = enabled;
-      figlet = enabled;
-      fish = enabled;
-      floorp = enabled;
-      fzf = enabled;
-      gh = enabled;
-      git = enabled;
-      glow = enabled;
-      gpg = enabled;
-      hyfetch = enabled;
-      journalctl = enabled;
-      just = enabled;
-      lazygit = enabled;
-      less = enabled;
-      man = enabled;
-      ncmpcpp = enabled;
-      neo = enabled;
-      neovim = enabled;
-      nh = enabled;
-      pidgin = enabled;
-      rbw = enabled;
-      ripgrep = enabled;
-      ssh = enabled;
-      starship = enabled;
-      systemctl = enabled;
-      tmux = enabled;
-      vesktop = enabled;
-      wezterm = enabled;
-      wget = enabled;
-      zathura = enabled;
-      zoxide = enabled;
-    };
-    services = {
-      # clipboard = enabled;
-      # syncthing = enabled;
-    };
     wayland.hyprland = {
       enable = true;
       monitors = {

modules/home/bundles/desktop/default.nix

@@ -0,0 +1,33 @@
+{
+  lib,
+  config,
+  ...
+}: let
+  cfg = config.marleyos.bundles.desktop;
+
+  inherit (lib.marleyos) enabled;
+in {
+  options.marleyos.bundles.desktop.enable = lib.mkEnableOption "desktop";
+
+  config = lib.mkIf cfg.enable {
+    marleyos = {
+      isDesktop = true;
+
+      appearance = {
+        base = enabled;
+        gtk = enabled;
+        qt = enabled;
+      };
+
+      programs = {
+        cli = enabled;
+        tui = enabled;
+        gui = enabled;
+      };
+
+      services = {
+        # syncthing = enabled;
+      };
+    };
+  };
+}

modules/home/bundles/mac/default.nix

@@ -0,0 +1,29 @@
+{
+  lib,
+  config,
+  ...
+}: let
+  cfg = config.marleyos.bundles.mac;
+
+  inherit (lib.marleyos) enabled disabled;
+in {
+  options.marleyos.bundles.mac.enable = lib.mkEnableOption "mac";
+
+  config = lib.mkIf cfg.enable {
+    marleyos = {
+      isDesktop = true;
+
+      programs = {
+        cli = enabled;
+        journalctl = disabled;
+        systemctl = disabled;
+
+        tui = enabled;
+        cava = disabled;
+        ncmpcpp = disabled;
+
+        wezterm = enabled;
+      };
+    };
+  };
+}

modules/home/programs/cli/default.nix

@@ -0,0 +1,43 @@
+{
+  lib,
+  config,
+  ...
+}: let
+  cfg = config.marleyos.programs.cli;
+
+  inherit (lib.marleyos) enabled;
+in {
+  options.marleyos.programs.cli.enable = lib.mkEnableOption "cli";
+
+  config = lib.mkIf cfg.enable {
+    marleyos.programs = {
+      bat = enabled;
+      cheat = enabled;
+      curl = enabled;
+      eza = enabled;
+      figlet = enabled;
+      fish = enabled;
+      fzf = enabled;
+      gh = enabled;
+      git = enabled;
+      glow = enabled;
+      gpg = enabled;
+      hyfetch = enabled;
+      journalctl = enabled;
+      just = enabled;
+      less = enabled;
+      man = enabled;
+      neo = enabled;
+      nh = enabled;
+      rbw = enabled;
+      ripgrep = enabled;
+      ssh = enabled;
+      starship = enabled;
+      systemctl = enabled;
+      tea = enabled;
+      tmux = enabled;
+      wget = enabled;
+      zoxide = enabled;
+    };
+  };
+}

modules/home/programs/gui/default.nix

@@ -0,0 +1,23 @@
+{
+  lib,
+  config,
+  ...
+}: let
+  cfg = config.marleyos.programs.gui;
+
+  inherit (lib.marleyos) enabled;
+in {
+  options.marleyos.programs.gui.enable = lib.mkEnableOption "gui";
+
+  config = lib.mkIf cfg.enable {
+    marleyos.programs = {
+      calibre = enabled;
+      floorp = enabled;
+      pidgin = enabled;
+      rofi = enabled;
+      vesktop = enabled;
+      wezterm = enabled;
+      zathura = enabled;
+    };
+  };
+}