From 875fdd4bd58522564c1b7c949a53861d1a712853 Mon Sep 17 00:00:00 2001
From: Aner Zakobar <aner@zakobar.com>
Date: Thu, 27 Nov 2025 00:17:50 +0200
Subject: [PATCH] Revamp, made lauretta suite, fixed things. broke others.

---
 azos-core                                          |  2 +-
 flake.lock                                         | 14 +++++++-------
 home-manager/home.nix                              |  2 +-
 modules/home-manager/default.nix                   |  1 +
 .../home-manager}/lauretta-emacs.nix               |  6 +++++-
 pkgs/elisp/azos-emacs-lauretta.org                 |  6 +++---
 6 files changed, 18 insertions(+), 13 deletions(-)
 rename {home-manager => modules/home-manager}/lauretta-emacs.nix (51%)

diff --git a/azos-core b/azos-core
index 86fd1e1..6738a5e 160000
--- a/azos-core
+++ b/azos-core
@@ -1 +1 @@
-Subproject commit 86fd1e15cab36eba0ed3937ebe97999ccdaedcab
+Subproject commit 6738a5ec845e90262ab755203dde9861eac6807e
diff --git a/flake.lock b/flake.lock
index d328e51..c1a5927 100644
--- a/flake.lock
+++ b/flake.lock
@@ -5,11 +5,11 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1763848346,
-        "narHash": "sha256-5siHv8VMluWU3XxGdiBGnT671zdFrLzt56fFiiuIlTA=",
+        "lastModified": 1764181904,
+        "narHash": "sha256-WKpEdmkxUDCgG7vGF8Ef1Wb4YhRwICjyqP92fofSkH0=",
         "ref": "refs/heads/master",
-        "rev": "86fd1e15cab36eba0ed3937ebe97999ccdaedcab",
-        "revCount": 82,
+        "rev": "6738a5ec845e90262ab755203dde9861eac6807e",
+        "revCount": 85,
         "type": "git",
         "url": "file:./azos-core"
       },
@@ -75,11 +75,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1763618868,
-        "narHash": "sha256-v5afmLjn/uyD9EQuPBn7nZuaZVV9r+JerayK/4wvdWA=",
+        "lastModified": 1764081664,
+        "narHash": "sha256-sUoHmPr/EwXzRMpv1u/kH+dXuvJEyyF2Q7muE+t0EU4=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "a8d610af3f1a5fb71e23e08434d8d61a466fc942",
+        "rev": "dc205f7b4fdb04c8b7877b43edb7b73be7730081",
         "type": "github"
       },
       "original": {
diff --git a/home-manager/home.nix b/home-manager/home.nix
index 5a4fe88..4d82561 100755
--- a/home-manager/home.nix
+++ b/home-manager/home.nix
@@ -11,7 +11,6 @@
   imports = [
     outputs.homeManagerModules
     outputs.azos-core.homeManagerModules
-    ./lauretta-emacs.nix
   ];
 
   programs.home-manager.enable = true;
@@ -21,6 +20,7 @@
   azos.suites.dev.enable = true;
   azos.suites.station.enable = true;
   azos.suites.exwm.enable = true;
+  azos.suites.lauretta.enable = true;
   azos.name = "Aner Zakobar";
 
   home = {
diff --git a/modules/home-manager/default.nix b/modules/home-manager/default.nix
index fb49f22..390c49a 100755
--- a/modules/home-manager/default.nix
+++ b/modules/home-manager/default.nix
@@ -14,5 +14,6 @@
     ./spotify.nix
     ./headphones-whmx4000.nix
     ./deluge.nix
+    ./lauretta-emacs.nix
   ];
 }
diff --git a/home-manager/lauretta-emacs.nix b/modules/home-manager/lauretta-emacs.nix
similarity index 51%
rename from home-manager/lauretta-emacs.nix
rename to modules/home-manager/lauretta-emacs.nix
index e29214f..91fa881 100644
--- a/home-manager/lauretta-emacs.nix
+++ b/modules/home-manager/lauretta-emacs.nix
@@ -5,10 +5,14 @@
   azos-utils,
   ...
 }: let
+  isEnabled =
+    config.azos.emacs.enable && config.azos.suites.lauretta.enable;
+  emacspkgs = config.azos.emacs.emacspkg.pkgs;
   localPkgName = "azos-emacs-lauretta";
 in {
   #Set config
-  config = {
+  options.azos.suites.lauretta.enable = azos-utils.mkSuiteEnableOption {};
+  config = lib.mkIf isEnabled {
     azos.emacs.enabledSuites = [localPkgName];
 
     #Base emacs suite definition
diff --git a/pkgs/elisp/azos-emacs-lauretta.org b/pkgs/elisp/azos-emacs-lauretta.org
index c3256b9..c09155a 100644
--- a/pkgs/elisp/azos-emacs-lauretta.org
+++ b/pkgs/elisp/azos-emacs-lauretta.org
@@ -16,14 +16,14 @@
 (use-package gptel
   :config
   (setq
-   gptel-model   'openai/gpt-oss-120b
+   gptel-model   "openai/gpt-oss-120b"
    gptel-backend
       (gptel-make-openai "Groq"
         :host "api.groq.com"
         :endpoint "/openai/v1/chat/completions"
         :stream t
         :key "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"
-        :models '('openai/gpt-oss-120b)))
+        :models '("openai/gpt-oss-120b")))
   :hook
   (gptel-mode . (lambda ()
             (setq-local whitespace-style '(face tabs trailing tab-mark
@@ -56,5 +56,5 @@
 
 #+begin_src emacs-lisp
 (provide 'azos-emacs-lauretta)
-(add-hook 'after-init-hook (lambda () (require 'azos-emacs-lauretta)))
+;; (add-hook 'after-init-hook (lambda () (require 'azos-emacs-lauretta)))
 #+end_src