diff --git a/azos-core b/azos-core index 181e107..7a879e9 160000 --- a/azos-core +++ b/azos-core @@ -1 +1 @@ -Subproject commit 181e107e0f16326b56b07ba7d7f640f33547fa57 +Subproject commit 7a879e900a788d636988405f40ebcbd62b66ccdd diff --git a/flake.lock b/flake.lock index 7e001dd..b53d641 100644 --- a/flake.lock +++ b/flake.lock @@ -2,15 +2,14 @@ "nodes": { "azos-core": { "inputs": { - "flake-utils": "flake-utils", "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1763158102, - "narHash": "sha256-ceCGsdhEToLJ4tMkvdiRDjGwuWfoslDQkqi8+bOrmHU=", + "lastModified": 1763754997, + "narHash": "sha256-WKIyoSBqYQpz52HrUtItXO0fDDr+ZZqHOxH2RSelEBg=", "ref": "refs/heads/master", - "rev": "181e107e0f16326b56b07ba7d7f640f33547fa57", - "revCount": 62, + "rev": "7a879e900a788d636988405f40ebcbd62b66ccdd", + "revCount": 81, "type": "git", "url": "file:./azos-core" }, @@ -19,24 +18,6 @@ "url": "file:./azos-core" } }, - "flake-utils": { - "inputs": { - "systems": "systems" - }, - "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "home-manager": { "inputs": { "nixpkgs": [ @@ -44,15 +25,18 @@ ] }, "locked": { - "lastModified": 1726989464, - "narHash": "sha256-Vl+WVTJwutXkimwGprnEtXc/s/s8sMuXzqXaspIGlwM=", - "path": "/nix/store/q1ss75nhmjiydyqw8lbzwbx7cqk8z0qq-source", - "rev": "2f23fa308a7c067e52dfcc30a0758f47043ec176", - "type": "path" + "lastModified": 1758463745, + "narHash": "sha256-uhzsV0Q0I9j2y/rfweWeGif5AWe0MGrgZ/3TjpDYdGA=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "3b955f5f0a942f9f60cdc9cacb7844335d0f21c3", + "type": "github" }, "original": { - "id": "home-manager", - "type": "indirect" + "owner": "nix-community", + "ref": "release-25.05", + "repo": "home-manager", + "type": "github" } }, "musnix": { @@ -60,11 +44,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1756852730, - "narHash": "sha256-qPere4RBHoZxiEGl8zXU8gjroZg4gkYGEwaAbKmL4vE=", + "lastModified": 1763506376, + "narHash": "sha256-ujnlIzFgK/Xkn5J9MEhjc9x0Bz18DoeDJ0JDp3oERmo=", "owner": "musnix", "repo": "musnix", - "rev": "7ccc92050e43dc92309396c6f2fe1f542214a242", + "rev": "74e212f6dc0e5330c3cf3caa53df5985b5566936", "type": "github" }, "original": { @@ -91,27 +75,25 @@ }, "nixpkgs": { "locked": { - "lastModified": 1751274312, - "narHash": "sha256-/bVBlRpECLVzjV19t5KMdMFWSwKLtb5RyXdjz3LJT+g=", - "owner": "nixos", + "lastModified": 1763618868, + "narHash": "sha256-v5afmLjn/uyD9EQuPBn7nZuaZVV9r+JerayK/4wvdWA=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "50ab793786d9de88ee30ec4e4c24fb4236fc2674", + "rev": "a8d610af3f1a5fb71e23e08434d8d61a466fc942", "type": "github" }, "original": { - "owner": "nixos", - "ref": "nixos-24.11", - "repo": "nixpkgs", - "type": "github" + "id": "nixpkgs", + "type": "indirect" } }, "nixpkgs-unstable": { "locked": { - "lastModified": 1763283776, - "narHash": "sha256-Y7TDFPK4GlqrKrivOcsHG8xSGqQx3A6c+i7novT85Uk=", + "lastModified": 1763421233, + "narHash": "sha256-Stk9ZYRkGrnnpyJ4eqt9eQtdFWRRIvMxpNRf4sIegnw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "50a96edd8d0db6cc8db57dab6bb6d6ee1f3dc49a", + "rev": "89c2b2330e733d6cdb5eae7b899326930c2c0648", "type": "github" }, "original": { @@ -139,16 +121,16 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1735563628, - "narHash": "sha256-OnSAY7XDSx7CtDoqNh8jwVwh4xNL/2HaJxGjryLWzX8=", - "owner": "nixos", + "lastModified": 1763618868, + "narHash": "sha256-v5afmLjn/uyD9EQuPBn7nZuaZVV9r+JerayK/4wvdWA=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "b134951a4c9f3c995fd7be05f3243f8ecd65d798", + "rev": "a8d610af3f1a5fb71e23e08434d8d61a466fc942", "type": "github" }, "original": { - "owner": "nixos", - "ref": "nixos-24.05", + "owner": "NixOS", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } @@ -162,21 +144,6 @@ "nixpkgs": "nixpkgs_3", "nixpkgs-unstable": "nixpkgs-unstable" } - }, - "systems": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index b0ea5e1..c1d0f2f 100755 --- a/flake.nix +++ b/flake.nix @@ -3,10 +3,18 @@ inputs = { # Nixpkgs - nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05"; + #Temporarily + # nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05"; + nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; + + # Unused unstable nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; - home-manager.inputs.nixpkgs.follows = "nixpkgs"; + home-manager = { + # Follow corresponding `release` branch from Home Manager + url = "github:nix-community/home-manager/release-25.05"; + inputs.nixpkgs.follows = "nixpkgs"; + }; nixos-hardware.url = "github:NixOS/nixos-hardware/master"; diff --git a/modules/home-manager/encryption.nix b/modules/home-manager/encryption.nix index 511b5af..b368a60 100755 --- a/modules/home-manager/encryption.nix +++ b/modules/home-manager/encryption.nix @@ -31,7 +31,7 @@ in { services.gpg-agent = { enable = true; enableSshSupport = true; - pinentryPackage = pkgs.pinentry-gtk2; + pinentry.package = pkgs.pinentry-gtk2; }; home.file.".ssh/config".source = ./ssh-config; diff --git a/modules/nixos/audio.nix b/modules/nixos/audio.nix index ef7e0ce..feb125e 100644 --- a/modules/nixos/audio.nix +++ b/modules/nixos/audio.nix @@ -14,7 +14,19 @@ in { }; config = lib.mkIf isEnabled { - hardware.pulseaudio.enable = true; + services = { + pipewire = { + enable = true; + audio.enable = true; + pulse.enable = true; + alsa = { + enable = true; + support32Bit = true; + }; + jack.enable = true; + }; + }; + # hardware.pulseaudio.enable = true; environment.systemPackages = with pkgs; [pavucontrol]; musnix.enable = true; }; diff --git a/nixos/configuration.nix b/nixos/configuration.nix index 8f607b8..131148f 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -25,7 +25,7 @@ outputs.overlays.addpkgs inputs.azos-core.overlays.qutebrowserdrm outputs.overlays.modifications - # outputs.overlays.unstable-packages + outputs.overlays.unstable-packages ]; config = { allowUnfree = true; diff --git a/nixos/lauretta-hardware-configuration.nix b/nixos/lauretta-hardware-configuration.nix index 0d3e60b..63e2498 100755 --- a/nixos/lauretta-hardware-configuration.nix +++ b/nixos/lauretta-hardware-configuration.nix @@ -45,7 +45,7 @@ hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; #Oh my god disable sleep on lid closed - services.logind.lidSwitchExternalPower = "ignore"; + services.logind.settings.Login.HandleLidSwitchExternalPower = "ignore"; systemd.sleep.extraConfig = '' [Sleep] AllowSuspend=yes diff --git a/pkgs/elisp/azos-emacs-lauretta.org b/pkgs/elisp/azos-emacs-lauretta.org index e7036e6..c3256b9 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