feat: add several profiles&modules

docs/org/homeProfiles.org

@@ -14,24 +14,57 @@
 ** shell
 
 #+begin_src nix :tangle (concat (org-entry-get nil "PRJ-DIR" t) "/shell.nix")
-{ root }:
+{
+  root,
+  self,
+  lib,
+  inputs,
+}:
 let
   presets = root.presets;
+  inherit (inputs) nixpkgs;
 in
 with presets; {
+  minimal = [
+    direnv
+    git
+  ];
   default = [
+    self.minimal
+    self.modernTools
+    self.utils
+    # ------------------------------
     zoxide
     fzf
-    direnv
-    dircolors
+    starship.default
+    dircolors.default
+  ];
+
+  fileManager = [
+    yazi
+    broot
   ];
 
-  fileManager = [ yazi ];
+  full = [
+    self.default
+    # ------------------------------
+    spell-check
+    self.fileManager
+    (lib.optionals nixpkgs.stdenv.isLinux presets.alacritty)
+  ];
 
   modernTools = [
     pls
     # eza
   ];
+
+  utils = [
+    {
+      programs.btop.enable = true;
+      programs.bat.enable = true;
+      programs.jq.enable = true;
+    }
+  ];
 }
 #+end_src
 

docs/org/nixosProfiles.org

@@ -80,7 +80,7 @@ with presets; {
     coding.nix
   ];
 
-  full = [
+  coding = [
     self.default
     {
       config.omnibus.coding = {

lib/addLoadToPops.nix

@@ -0,0 +1,13 @@
+{ lib }:
+list: pops: load:
+lib.listToAttrs (
+  map
+    (name: {
+      inherit name;
+      value =
+        lib.mapAttrs
+          (n: v: if v ? addLoadExtender then v.addLoadExtender (load name n v) else v)
+          pops;
+    })
+    list
+)

lib/exporter/pops.nix

@@ -1,9 +1,13 @@
 let
   baseInputs = {
-    inherit omnibus POP flops;
+    inherit
+      omnibus
+      POP
+      flops
+      lib
+    ;
     inputs = {
       inherit (inputs) dmerge;
-      inherit lib;
     };
   };
 in
@@ -43,7 +47,6 @@ in
   homeProfiles = self.homeModules.addLoadExtender {
     load = {
       src = inputs.self.outPath + "/units/nixos/homeProfiles";
-      loader = haumea.loaders.scoped;
       type = "nixosProfiles";
       transformer = [ (_: _: _) ];
     };

lib/mapLoadToPops.nix

@@ -0,0 +1,5 @@
+{ lib }:
+pops: load:
+lib.mapAttrsRecursiveCond ((as: !(as ? "addLoadExtender")))
+  (n: v: v.addLoadExtender (load n v))
+  pops

lib/mapPopsLayouts'.nix

@@ -1,3 +1,3 @@
 { lib }:
 pops:
-lib.mapAttrsRecursiveCond ((as: !(as ? "layouts"))) (_: v: v.layouts or v) pops
+lib.mapAttrsRecursiveCond ((as: !(as ? "layouts"))) (_: v: v.layouts) pops

lib/mapPopsLayouts.nix

@@ -1,5 +1,28 @@
 { lib }:
 pops:
+let
+in
+# mapAttrsRecursiveCond' =
+#   cond: f: set:
+#   let
+#     recurse =
+#       path: set:
+#       let
+#         g =
+#           name: value:
+#           if lib.isAttrs value && cond value then
+#             { ${name} = recurse (path ++ [ name ]) value; }
+#           else
+#             f (path ++ [ name ]) name value;
+#       in
+#       mapAttrs'' g set;
+#   in
+#   recurse [ ] set;
+# mapAttrs'' =
+#   f: set:
+#   lib.foldl' (a: b: a // b) { } (
+#     map (attr: f attr set.${attr}) (lib.attrNames set)
+#   );
 lib.mapAttrsRecursiveCond ((as: !(as ? "layouts" && as.layouts ? "default")))
   (_: v: v.layouts.default or v)
   pops

lib/mkHome.nix

@@ -24,15 +24,15 @@ in
           home-manager.useUserPackages = lib.mkDefault true;
 
           home-manager.users.${user} = {
-            imports = lib.flatten suites;
+            imports = lib.flatten [ suites ];
             home.stateVersion =
               if pkgs.stdenv.isDarwin then pkgs.lib.trivial.release else "23.11";
           };
+          programs.${shell}.enable = true;
           users.users.${user} = {
             shell = pkgs."${shell}";
             home = if pkgs.stdenv.isDarwin then "/Users/${user}" else "/home/${user}";
           };
-          programs.${shell}.enable = true;
         }
       )
     ]

templates/hivebus/nix/lib/exporter/pops/hosts.nix

@@ -2,28 +2,19 @@
   lib,
   inputs,
   super,
+  omnibus,
   root,
 }:
 let
   hostsDir = lib.attrNames (
     lib.readDir (inputs.self.outPath + "/units/nixos/hosts")
   );
+  inherit (omnibus.lib) addLoadToPops;
 in
-lib.listToAttrs (
-  map
-    (name: {
-      inherit name;
-      value =
-        lib.mapAttrs
-          (
-            n: v:
-            v.addLoadExtender {
-              load.src =
-                root.filterPopsSrc (inputs.self.outPath + "/units/nixos/hosts/${name}")
-                  n;
-            }
-          )
-          super.hostsLoad;
-    })
-    hostsDir
+addLoadToPops hostsDir super.hostsLoad (
+  elm: n: v: {
+    load.src =
+      root.filterPopsSrc (inputs.self.outPath + "/units/nixos/hosts/${elm}")
+        n;
+  }
 )

templates/nixos/nix/lib/exporter/pops/hosts.nix

@@ -2,28 +2,19 @@
   lib,
   inputs,
   super,
+  omnibus,
   root,
 }:
 let
   hostsDir = lib.attrNames (
     lib.readDir (inputs.self.outPath + "/units/nixos/hosts")
   );
+  inherit (omnibus.lib) addLoadToPops;
 in
-lib.listToAttrs (
-  map
-    (name: {
-      inherit name;
-      value =
-        lib.mapAttrs
-          (
-            n: v:
-            v.addLoadExtender {
-              load.src =
-                root.filterPopsSrc (inputs.self.outPath + "/units/nixos/hosts/${name}")
-                  n;
-            }
-          )
-          super.hostsLoad;
-    })
-    hostsDir
+addLoadToPops hostsDir super.hostsLoad (
+  elm: n: v: {
+    load.src =
+      root.filterPopsSrc (inputs.self.outPath + "/units/nixos/hosts/${elm}")
+        n;
+  }
 )

units/nixos/darwinProfiles/init.nix

@@ -0,0 +1,14 @@
+{
+  root,
+  self,
+  super,
+}:
+let
+  presets = super.presets;
+in
+with presets; {
+  default = [
+    bootstrap
+    { omnibus.bootstrap.minimal = true; }
+  ];
+}

units/nixos/darwinProfiles/presets/bootstrap.nix

@@ -9,7 +9,7 @@ let
   cfg = config.omnibus.bootstrap;
 in
 {
-  imports = [ omnibus.darwinModules.bootstrap ];
+  imports = [ omnibus.nixosModules.omnibus.bootstrap ];
   config = {
     omnibus.bootstrap.PATH = lib.mkBefore [
       "/run/current-system/sw/bin"

units/nixos/darwinProfiles/presets/homebrew.nix

@@ -1,48 +1,14 @@
-{
-  omnibus,
-  pkgs,
-  lib,
-}:
-let
-  inherit (pkgs.stdenv.hostPlatform) isAarch64;
-  brewPrefix = if isAarch64 then "/opt/homebrew" else "/usr/local";
-in
+{ omnibus, lib }:
 {
   imports = [ omnibus.darwinModules.homebrew ];
-
-  # credit: https://github.com/montchr/dotfield/blob/dd5e577d91b1af7f13909f5dc4343717a718ff02/darwin/profiles/core/default.nix
   homebrew = {
-    enable = true;
-    # onActivation.cleanup = "zap";
-    onActivation.upgrade = lib.mkDefault true;
-    # Use the nix-darwin brewfile when invoking `brew bundle` imperatively.
-    global.brewfile = lib.mkDefault true;
-    global.lockfiles = lib.mkDefault false;
     __profiles__ = {
-      readers = lib.mkDefault true;
       shell = lib.mkDefault true;
+      containers = lib.mkDefault true;
+      security = lib.mkDefault true;
+      chat = lib.mkDefault true;
       casks.removePackagesFromProfiles = [ ];
       brews.removePackagesFromProfiles = [ ];
     };
   };
-  # <https://github.com/LnL7/nix-darwin/issues/596>
-  #
-  # $ brew shellenv
-  # export HOMEBREW_PREFIX="/opt/homebrew";
-  # export HOMEBREW_CELLAR="/opt/homebrew/Cellar";
-  # export HOMEBREW_REPOSITORY="/opt/homebrew";
-  # export PATH="/opt/homebrew/bin:/opt/homebrew/sbin${PATH+:$PATH}";
-  # export MANPATH="/opt/homebrew/share/man${MANPATH+:$MANPATH}:";
-  # export INFOPATH="/opt/homebrew/share/info:${INFOPATH:-}";
-  environment.systemPath = lib.mkBefore [
-    "${brewPrefix}/bin"
-    "${brewPrefix}/sbin"
-  ];
-  environment.variables = {
-    HOMEBREW_PREFIX = brewPrefix;
-    HOMEBREW_CELLAR = "${brewPrefix}/Cellar";
-    HOMEBREW_REPOSITORY = brewPrefix;
-    MANPATH = "${brewPrefix}/share/man:$MANPATH";
-    INFOPATH = "${brewPrefix}/share/info:$INFOPATH";
-  };
 }

units/nixos/homeModules/programs/alacritty/default.nix

@@ -0,0 +1,18 @@
+let
+  CSIuKeyBindings =
+    (builtins.fromTOML (builtins.readFile ./key-bindings.toml)).key_bindings;
+in
+{
+  options = {
+    CSIuSupport = lib.mkEnableOption "Enable CSIu support";
+  };
+  config = mkMerge [
+    (mkIf (cfg.enable && pkgs.stdenv.isLinux) {
+      programs.alacritty = {
+        settings = {
+          key_bindings = mkIf cfg.CSIuSupport CSIuKeyBindings;
+        };
+      };
+    })
+  ];
+}