From a4ecc92d45e957f6d6e92bb17c3bbbb78a199f71 Mon Sep 17 00:00:00 2001 From: Aner Zakobar Date: Thu, 18 Dec 2025 14:35:50 +0200 Subject: [PATCH] Updates, fixes for lauretta specific emacs --- azos-core | 2 +- flake.lock | 52 +++++++++++++++--------------- flake.nix | 4 +-- home-manager/home.nix | 2 +- pkgs/elisp/azos-emacs-lauretta.org | 5 ++- 5 files changed, 32 insertions(+), 33 deletions(-) diff --git a/azos-core b/azos-core index 6738a5e..924abbc 160000 --- a/azos-core +++ b/azos-core @@ -1 +1 @@ -Subproject commit 6738a5ec845e90262ab755203dde9861eac6807e +Subproject commit 924abbc77643efcb323e1d22e40db620fdd96567 diff --git a/flake.lock b/flake.lock index c1a5927..a26bb19 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1764181904, - "narHash": "sha256-WKpEdmkxUDCgG7vGF8Ef1Wb4YhRwICjyqP92fofSkH0=", + "lastModified": 1766061171, + "narHash": "sha256-CMppHWhnBnqQE19njs3kj2gn1QeMScynH3h2peUHdm8=", "ref": "refs/heads/master", - "rev": "6738a5ec845e90262ab755203dde9861eac6807e", - "revCount": 85, + "rev": "924abbc77643efcb323e1d22e40db620fdd96567", + "revCount": 87, "type": "git", "url": "file:./azos-core" }, @@ -25,11 +25,11 @@ ] }, "locked": { - "lastModified": 1758463745, - "narHash": "sha256-uhzsV0Q0I9j2y/rfweWeGif5AWe0MGrgZ/3TjpDYdGA=", + "lastModified": 1763992789, + "narHash": "sha256-WHkdBlw6oyxXIra/vQPYLtqY+3G8dUVZM8bEXk0t8x4=", "owner": "nix-community", "repo": "home-manager", - "rev": "3b955f5f0a942f9f60cdc9cacb7844335d0f21c3", + "rev": "44831a7eaba4360fb81f2acc5ea6de5fde90aaa3", "type": "github" }, "original": { @@ -44,11 +44,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1763506376, - "narHash": "sha256-ujnlIzFgK/Xkn5J9MEhjc9x0Bz18DoeDJ0JDp3oERmo=", + "lastModified": 1764554060, + "narHash": "sha256-vewrwjGqublgja1bvlIybRnlltKHLNlnP7WYDg+9h1Y=", "owner": "musnix", "repo": "musnix", - "rev": "74e212f6dc0e5330c3cf3caa53df5985b5566936", + "rev": "599562080b2901046829ca69e0d1461041d27b32", "type": "github" }, "original": { @@ -59,11 +59,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1762847253, - "narHash": "sha256-BWWnUUT01lPwCWUvS0p6Px5UOBFeXJ8jR+ZdLX8IbrU=", + "lastModified": 1764440730, + "narHash": "sha256-ZlJTNLUKQRANlLDomuRWLBCH5792x+6XUJ4YdFRjtO4=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "899dc449bc6428b9ee6b3b8f771ca2b0ef945ab9", + "rev": "9154f4569b6cdfd3c595851a6ba51bfaa472d9f3", "type": "github" }, "original": { @@ -75,11 +75,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1764081664, - "narHash": "sha256-sUoHmPr/EwXzRMpv1u/kH+dXuvJEyyF2Q7muE+t0EU4=", + "lastModified": 1765934234, + "narHash": "sha256-pJjWUzNnjbIAMIc5gRFUuKCDQ9S1cuh3b2hKgA7Mc4A=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "dc205f7b4fdb04c8b7877b43edb7b73be7730081", + "rev": "af84f9d270d404c17699522fab95bbf928a2d92f", "type": "github" }, "original": { @@ -89,11 +89,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1763421233, - "narHash": "sha256-Stk9ZYRkGrnnpyJ4eqt9eQtdFWRRIvMxpNRf4sIegnw=", + "lastModified": 1765779637, + "narHash": "sha256-KJ2wa/BLSrTqDjbfyNx70ov/HdgNBCBBSQP3BIzKnv4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "89c2b2330e733d6cdb5eae7b899326930c2c0648", + "rev": "1306659b587dc277866c7b69eb97e5f07864d8c4", "type": "github" }, "original": { @@ -105,11 +105,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1756542300, - "narHash": "sha256-tlOn88coG5fzdyqz6R93SQL5Gpq+m/DsWpekNFhqPQk=", + "lastModified": 1764242076, + "narHash": "sha256-sKoIWfnijJ0+9e4wRvIgm/HgE27bzwQxcEmo2J/gNpI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d7600c775f877cd87b4f5a831c28aa94137377aa", + "rev": "2fad6eac6077f03fe109c4d4eb171cf96791faa4", "type": "github" }, "original": { @@ -121,16 +121,16 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1763618868, - "narHash": "sha256-v5afmLjn/uyD9EQuPBn7nZuaZVV9r+JerayK/4wvdWA=", + "lastModified": 1765838191, + "narHash": "sha256-m5KWt1nOm76ILk/JSCxBM4MfK3rYY7Wq9/TZIIeGnT8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a8d610af3f1a5fb71e23e08434d8d61a466fc942", + "rev": "c6f52ebd45e5925c188d1a20119978aa4ffd5ef6", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixpkgs-unstable", + "ref": "nixos-25.11", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index c1d0f2f..cb176e8 100755 --- a/flake.nix +++ b/flake.nix @@ -4,8 +4,8 @@ inputs = { # Nixpkgs #Temporarily - # nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05"; - nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11"; + # nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; # Unused unstable nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; diff --git a/home-manager/home.nix b/home-manager/home.nix index 4d82561..19c2c36 100755 --- a/home-manager/home.nix +++ b/home-manager/home.nix @@ -32,5 +32,5 @@ systemd.user.startServices = "sd-switch"; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion - home.stateVersion = "24.05"; + home.stateVersion = "25.05"; } diff --git a/pkgs/elisp/azos-emacs-lauretta.org b/pkgs/elisp/azos-emacs-lauretta.org index c09155a..bbc8f85 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,4 @@ #+begin_src emacs-lisp (provide 'azos-emacs-lauretta) -;; (add-hook 'after-init-hook (lambda () (require 'azos-emacs-lauretta))) #+end_src