diff --git a/azos-core b/azos-core index 3a5824c..6969769 160000 --- a/azos-core +++ b/azos-core @@ -1 +1 @@ -Subproject commit 3a5824c7347b051f1493c80b97cb41aba97facee +Subproject commit 6969769ac8a218d1feeb686775e4ddbffef4bd9b diff --git a/flake.lock b/flake.lock index 0d51521..11ecbd2 100644 --- a/flake.lock +++ b/flake.lock @@ -22,11 +22,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1770535125, - "narHash": "sha256-7/EaNey8LyH7xH/PdV8kvjwtAb8wo982OJ94sPt1b54=", + "lastModified": 1771368993, + "narHash": "sha256-mWcLaCViNfUMPcqCvQRed4kR20Ifs8aaHcjMlVbF2tQ=", "owner": "anerisgreat", "repo": "cabata", - "rev": "e9b5cf217939aba6a11bfc4a672e7e6281b2355e", + "rev": "4fa661795527fa437698409395dc4363fbc0adf0", "type": "github" }, "original": { @@ -64,11 +64,11 @@ ] }, "locked": { - "lastModified": 1766553861, - "narHash": "sha256-ZbnG01yA3O8Yr1vUm3+NQ2qk9iRhS5bloAnuXHHy7+c=", + "lastModified": 1770260404, + "narHash": "sha256-3iVX1+7YUIt23hBx1WZsUllhbmP2EnXrV8tCRbLxHc8=", "owner": "nix-community", "repo": "home-manager", - "rev": "0999ed8f965bbbd991437ad9c5ed3434cecbc30e", + "rev": "0d782ee42c86b196acff08acfbf41bb7d13eed5b", "type": "github" }, "original": { @@ -83,11 +83,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1764554060, - "narHash": "sha256-vewrwjGqublgja1bvlIybRnlltKHLNlnP7WYDg+9h1Y=", + "lastModified": 1767232402, + "narHash": "sha256-li+h6crnhc5Zqs+M6pn7D7M0W9M63ECNennDjRgzioE=", "owner": "musnix", "repo": "musnix", - "rev": "599562080b2901046829ca69e0d1461041d27b32", + "rev": "d65f98e0b1f792365f1705653d7b2d266ceeff6e", "type": "github" }, "original": { @@ -98,11 +98,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1766568855, - "narHash": "sha256-UXVtN77D7pzKmzOotFTStgZBqpOcf8cO95FcupWp4Zo=", + "lastModified": 1771423359, + "narHash": "sha256-yRKJ7gpVmXbX2ZcA8nFi6CMPkJXZGjie2unsiMzj3Ig=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "c5db9569ac9cc70929c268ac461f4003e3e5ca80", + "rev": "740a22363033e9f1bb6270fbfb5a9574067af15b", "type": "github" }, "original": { @@ -128,11 +128,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1766651565, - "narHash": "sha256-QEhk0eXgyIqTpJ/ehZKg9IKS7EtlWxF3N7DXy42zPfU=", + "lastModified": 1771369470, + "narHash": "sha256-0NBlEBKkN3lufyvFegY4TYv5mCNHbi5OmBDrzihbBMQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "3e2499d5539c16d0d173ba53552a4ff8547f4539", + "rev": "0182a361324364ae3f436a63005877674cf45efb", "type": "github" }, "original": { @@ -144,11 +144,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1770689213, - "narHash": "sha256-N6JiSpfi0s8NjUTnjwo3c+YAmvYhCDzjCKCrTUC97xM=", + "lastModified": 1771207753, + "narHash": "sha256-b9uG8yN50DRQ6A7JdZBfzq718ryYrlmGgqkRm9OOwCE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "49d75834011c94a120a9cb874ac1c4d8b7bfc767", + "rev": "d1c15b7d5806069da59e819999d70e1cec0760bf", "type": "github" }, "original": { @@ -158,11 +158,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1764242076, - "narHash": "sha256-sKoIWfnijJ0+9e4wRvIgm/HgE27bzwQxcEmo2J/gNpI=", + "lastModified": 1766902085, + "narHash": "sha256-coBu0ONtFzlwwVBzmjacUQwj3G+lybcZ1oeNSQkgC0M=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2fad6eac6077f03fe109c4d4eb171cf96791faa4", + "rev": "c0b0e0fddf73fd517c3471e546c0df87a42d53f4", "type": "github" }, "original": { @@ -174,11 +174,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1766736597, - "narHash": "sha256-BASnpCLodmgiVn0M1MU2Pqyoz0aHwar/0qLkp7CjvSQ=", + "lastModified": 1771419570, + "narHash": "sha256-bxAlQgre3pcQcaRUm/8A0v/X8d2nhfraWSFqVmMcBcU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f560ccec6b1116b22e6ed15f4c510997d99d5852", + "rev": "6d41bc27aaf7b6a3ba6b169db3bd5d6159cfaa47", "type": "github" }, "original": { diff --git a/pkgs/azos-emacs-lauretta.nix b/pkgs/azos-emacs-lauretta.nix index 6e28e27..534aa54 100755 --- a/pkgs/azos-emacs-lauretta.nix +++ b/pkgs/azos-emacs-lauretta.nix @@ -2,7 +2,17 @@ orgTrivialBuild, epkgs, pkgs, -}: +}: let + ghgptel = (epkgs.callPackage epkgs.trivialBuild { + pname = "gptel"; + version = "0.9.9.3"; + src = pkgs.fetchFromGitHub { + owner = "karthink"; + repo = "gptel"; + rev = "273c0f93958c1ffa85e396717b504903eda36bce"; # Use a specific commit hash for reproducibility + sha256 = "sha256-gVgdFLi6RGUCD3ZXzOIo5XpTNmP/9xMAO5nyWu1zVlM="; + }; + }) orgTrivialBuild { pname = "azos-emacs-lauretta"; version = "0.1.6"; @@ -10,7 +20,7 @@ orgTrivialBuild { packageRequires = with epkgs; [ pkgs.azos-emacs-base pkgs.azos-emacs-station - gptel + ghgptel (epkgs.callPackage epkgs.trivialBuild { pname = "gptel-autocomplete"; version = "2025-06-18"; @@ -21,7 +31,20 @@ orgTrivialBuild { sha256 = "sha256-gVgdFLi6RGUCD3ZXzOIo5XpTNmP/9lMAO5nyWu1zVlM="; }; buildInputs = with epkgs; [ - gptel + ghgptel + ]; + }) + (epkgs.callPackage epkgs.trivialBuild { + pname = "gptel-agent"; + version = "0.0.1"; + src = pkgs.fetchFromGitHub { + owner = "karthink"; + repo = "gptel-agent"; + rev = "8ba9056da2341468192e6417d47cb50e26636e97"; # Use a specific commit hash for reproducibility + sha256 = "sha256-M2J/K3UHoAbDWQjYPD8ZdL6uHBggvPh+ZvJ+xnbXJuo="; + }; + buildInputs = with epkgs; [ + ghgptel ]; }) ]; diff --git a/pkgs/elisp/azos-emacs-lauretta.org b/pkgs/elisp/azos-emacs-lauretta.org index e7e848e..73e625a 100644 --- a/pkgs/elisp/azos-emacs-lauretta.org +++ b/pkgs/elisp/azos-emacs-lauretta.org @@ -1,4 +1,4 @@ -#+title: Aner's Emacs EXWM Configuration +#+title: Aner's Emacs Lauretta Configuration #+property: header-args :results silent * Base setup @@ -13,25 +13,17 @@ ** LLM #+begin_src emacs-lisp -(use-package gptel - :config - (setq - 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))) - :hook - (gptel-mode . (lambda () - (setq-local whitespace-style '(face tabs trailing tab-mark - indentation)))) -) - -(use-package gptel-autocomplete - :ensure t) +(setq + gptel-model 'meta/llama-3.1-8b-instant + gptel-backend + (gptel-make-openai "Groq" + :host "api.groq.com" + :endpoint "/openai/v1/chat/completions" + :stream t + :key "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" + :models '('meta/llama-3.1-8b-instant))) +(setq gptel-agent-dirs '("/home/aner/.agents")) +(gptel-agent-update) #+end_src ** Headphones