diff --git a/README.org b/README.org index 4009685..887cdfa 100755 --- a/README.org +++ b/README.org @@ -103,4 +103,3 @@ nix develop .#shells.x86_64-linux.debugTexShell ** Things to work out *** Notebook tempaltes -https://github.com/NixOS/nix/issues/12281 diff --git a/azos-core b/azos-core index e34f6bb..63f8c40 160000 --- a/azos-core +++ b/azos-core @@ -1 +1 @@ -Subproject commit e34f6bb4d3cc37d13a0d1c671b184e87fd23ab43 +Subproject commit 63f8c40ce9fb7df84d66373bed57fe83611d2ad2 diff --git a/flake.lock b/flake.lock index 8a5a570..2f88c9b 100644 --- a/flake.lock +++ b/flake.lock @@ -71,11 +71,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1766747458, - "narHash": "sha256-m63jjuo/ygo8ztkCziYh5OOIbTSXUDkKbqw3Vuqu4a4=", + "lastModified": 1768178648, + "narHash": "sha256-kz/F6mhESPvU1diB7tOM3nLcBfQe7GU7GQCymRlTi/s=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c633f572eded8c4f3c75b8010129854ed404a6ce", + "rev": "3fbab70c6e69c87ea2b6e48aa6629da2aa6a23b0", "type": "github" }, "original": { diff --git a/modules/home-manager/default.nix b/modules/home-manager/default.nix index d7a6300..4622001 100755 --- a/modules/home-manager/default.nix +++ b/modules/home-manager/default.nix @@ -16,5 +16,7 @@ ./deluge.nix ./lauretta-emacs.nix ./gimp.nix + # ./printing.nix + ./libreoffice.nix ]; } diff --git a/modules/home-manager/libreoffice.nix b/modules/home-manager/libreoffice.nix new file mode 100755 index 0000000..27994ea --- /dev/null +++ b/modules/home-manager/libreoffice.nix @@ -0,0 +1,21 @@ +{ + lib, + config, + pkgs, + ... +}: let + isEnabled = + config.azos.libreoffice.enable; +in { + options.azos.libreoffice.enable = lib.mkOption { + default = true; + example = true; + type = lib.types.bool; + }; + + config = lib.mkIf isEnabled { + home.packages = with pkgs; [ + libreoffice + ]; + }; +} diff --git a/modules/home-manager/printing.nix b/modules/home-manager/printing.nix new file mode 100755 index 0000000..03ee4e1 --- /dev/null +++ b/modules/home-manager/printing.nix @@ -0,0 +1,22 @@ +{ + lib, + config, + pkgs, + ... +}: let + isEnabled = + config.azos.printing.enable; +in { + options.azos.printing.enable = lib.mkOption { + default = true; + example = true; + type = lib.types.bool; + }; + + config = lib.mkIf isEnabled { + services.printing.enable = true; + home.packages = with pkgs; [ + hplip + ]; + }; +} diff --git a/modules/home-manager/qutebrowser-config.py b/modules/home-manager/qutebrowser-config.py index b803992..2ee43b0 100644 --- a/modules/home-manager/qutebrowser-config.py +++ b/modules/home-manager/qutebrowser-config.py @@ -21,7 +21,7 @@ c.url.searchengines = { 'yt': 'https://www.youtube.com/results?search_query={}', #Youtube 'gh': 'https://github.com/search?q={}', #Qutebrowser 'wa' : 'https://www.wolframalpha.com/input/?i={}', #Wolfram alpha - 'nx' : 'https://search.nixos.org/packages?channel=25.05&query={}' #nixpkgs + 'nx' : 'https://search.nixos.org/packages?channel=25.11&query={}' #nixpkgs } #Youtube stuff from DT. diff --git a/pkgs/azos-emacs-lauretta.nix b/pkgs/azos-emacs-lauretta.nix index 263c73f..6e28e27 100755 --- a/pkgs/azos-emacs-lauretta.nix +++ b/pkgs/azos-emacs-lauretta.nix @@ -11,5 +11,18 @@ orgTrivialBuild { pkgs.azos-emacs-base pkgs.azos-emacs-station gptel + (epkgs.callPackage epkgs.trivialBuild { + pname = "gptel-autocomplete"; + version = "2025-06-18"; + src = pkgs.fetchFromGitHub { + owner = "JDNdeveloper"; + repo = "gptel-autocomplete"; + rev = "8ace326a6e7b8a3a4df7a6e80272b472e7fbd167"; # Use a specific commit hash for reproducibility + sha256 = "sha256-gVgdFLi6RGUCD3ZXzOIo5XpTNmP/9lMAO5nyWu1zVlM="; + }; + buildInputs = with epkgs; [ + gptel + ]; + }) ]; } diff --git a/pkgs/elisp/azos-emacs-lauretta.org b/pkgs/elisp/azos-emacs-lauretta.org index bbc8f85..23aaf44 100644 --- a/pkgs/elisp/azos-emacs-lauretta.org +++ b/pkgs/elisp/azos-emacs-lauretta.org @@ -29,6 +29,9 @@ (setq-local whitespace-style '(face tabs trailing tab-mark indentation)))) ) + +(use-package gptel-autocomplete + :ensure t) #+end_src ** Headphones