I can't believe it compiles. Time to reorder.

flake.lock

@@ -6,11 +6,11 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1748155468,
-        "narHash": "sha256-/Ty1MVEMO1Wzu6CJzIUPuC2OL0rj7uepgfRD9EDDtXc=",
+        "lastModified": 1754597893,
+        "narHash": "sha256-D/wBAxdIvMTKpFQaLo39n0X8PAFIqFCeuJboxUpAyHA=",
         "ref": "refs/heads/master",
-        "rev": "18c1f08828151210f0b81d4205ae6c659f9270ab",
-        "revCount": 47,
+        "rev": "69d3dec18405dc350a81039ce657f4435b38b1f8",
+        "revCount": 55,
         "type": "git",
         "url": "file:./azos-core"
       },
@@ -94,11 +94,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1748037224,
-        "narHash": "sha256-92vihpZr6dwEMV6g98M5kHZIttrWahb9iRPBm1atcPk=",
+        "lastModified": 1751274312,
+        "narHash": "sha256-/bVBlRpECLVzjV19t5KMdMFWSwKLtb5RyXdjz3LJT+g=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "f09dede81861f3a83f7f06641ead34f02f37597f",
+        "rev": "50ab793786d9de88ee30ec4e4c24fb4236fc2674",
         "type": "github"
       },
       "original": {

home-manager/home.nix

@@ -12,6 +12,7 @@
   imports = [
     outputs.homeManagerModules
     outputs.azos-core.homeManagerModules
+    ./lauretta-emacs.nix
   ];
 
   nixpkgs = {

home-manager/lauretta-emacs.nix

@@ -0,0 +1,14 @@
+{ lib, config, pkgs, azos-utils, ... }:
+let
+  localPkgName = "azos-emacs-lauretta";
+in
+{
+  #Set config
+  config = {
+
+    azos.emacs.enabledSuites = [localPkgName];
+
+    #Base emacs suite definition
+    azos.emacs.pkgs = [pkgs.azos-emacs-lauretta];
+  };
+}

modules/home-manager/reaper.nix

@@ -12,7 +12,11 @@ in {
     config = lib.mkIf isEnabled {
       home.packages = with pkgs; [
         reaper
-        helm #TODO this synth had better work
+        # helm #TODO this synth had better work
+        #TODO collision, would like to make this work.
+        #TODO we can overlay by simply removing the direct bin
+        #TODO which we don't need
+        #TODO but not urgent now
         surge
         lsp-plugins
         vital

nixos/configuration.nix

@@ -21,10 +21,11 @@
 
   nixpkgs = {
     overlays = [
-      outputs.overlays.modifications
-      outputs.overlays.unstable-packages
       inputs.azos-core.overlays.addpkgs
+      outputs.overlays.additions
       inputs.azos-core.overlays.qutebrowserdrm
+      # outputs.overlays.modifications
+      # outputs.overlays.unstable-packages
       # outputs.overlays.addpkgs
     ];
     config = {

overlays/default.nix

@@ -1,7 +1,11 @@
 # This file defines overlays
 {inputs, ...}: {
   # This one brings our custom packages from the 'pkgs' directory
-  additions = final: _prev: import ../pkgs {pkgs = final;};
+  # additions = final: _prev: import ../pkgs {pkgs =
+  #   import ../azos-core/pkgs {pkgs = _prev; }; };
+  # additions = final: _prev: import inputs.azos-core.azos-pkgs {pkgs = final; }; 
+  additions = final: _prev: (import ../pkgs {pkgs = final.pkgs; });
+
 
   # This one contains whatever you want to overlay
   # You can change versions, add patches, set compilation flags, anything really.

pkgs/azos-emacs-lauretta.nix

@@ -0,0 +1,15 @@
+{
+  orgTrivialBuild,
+  epkgs,
+  pkgs
+}:
+orgTrivialBuild {
+    pname = "azos-emacs-lauretta";
+    version = "0.1.6";
+    src = ./elisp/azos-emacs-lauretta.org;
+    packageRequires = with epkgs; [
+        pkgs.azos-emacs-base
+        pkgs.azos-emacs-station
+        llm
+    ];
+}

pkgs/default.nix

@@ -1,11 +1,8 @@
 { pkgs } @ args:
 let
   inherit args;
-  emacs-pkg = pkgs.emacs;
-  epkgs = emacs-pkg.pkgs;
-  trivialBuild = epkgs.trivialBuild;
-  localEmacsPkg = (src: pkgs.callPackage src { orgTrivialBuild = pkgs.orgTrivialBuild; epkgs = epkgs; pkgs = pkgs; });
+  localEmacsPkg = pkgs.localEmacsPkg;
 in
 {
-  azos.emacs.exwm = localEmacsPkg ./azos-emacs-lauretta.nix;
+  azos-emacs-lauretta = localEmacsPkg ./azos-emacs-lauretta.nix;
 }

pkgs/elisp/azos-emacs-lauretta.org

@@ -0,0 +1,27 @@
+#+title: Aner's Emacs EXWM Configuration
+#+property: header-args :results silent
+
+* Base setup
+** Require
+
+#+begin_src emacs-lisp
+(require 'azos-emacs-base)
+#+end_src
+
+* Lauretta specific
+
+** LLM
+
+#+begin_src emacs-lisp
+(use-package llm-refactoring
+  :init
+  (require 'llm-openai)
+  (setq llm-refactoring-provider (make-llm-openai :key "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")))
+#+end_src
+
+* Provide
+
+#+begin_src emacs-lisp
+(provide 'azos-emacs-lauretta)
+(add-hook 'after-init-hook (lambda () (require 'azos-emacs-lauretta)))
+#+end_src

shells/debugTex/default.nix

@@ -5,8 +5,8 @@ in
 pkgs.mkShell {
     name = "tex-debug";
     buildInputs = [
-      pkgs.azos.tex
+      pkgs.azos-tex
       # ((pkgs.emacsPackagesFor pkgs.emacs).emacsWithPackages (
-      #       pkgs.azos.emacs.editor))
+      #       pkgs.azos-emacs-editor))
     ];
 }