From e78c0cdb243c57e3cf8581b12e1920c9b170f231 Mon Sep 17 00:00:00 2001 From: "info@data-pro.nu" Date: Wed, 25 Mar 2026 12:09:56 +0000 Subject: [PATCH] Regenerated --- Droidnix/README.org | 15 +++++++-------- .../modules/traveldroid/apps/emacs/emacs.nix | 15 +++++++-------- 2 files changed, 14 insertions(+), 16 deletions(-) diff --git a/Droidnix/README.org b/Droidnix/README.org index ee0e57b83..4ce356d9b 100644 --- a/Droidnix/README.org +++ b/Droidnix/README.org @@ -516,10 +516,9 @@ This sets up the zsh in the terminal ** =generated/modules/traveldroid/apps/emacs/emacs.nix= This installs emacs #+BEGIN_SRC nix :tangle generated/modules/traveldroid/apps/emacs/emacs.nix :noweb tangle :mkdirp yes :eval never-html -{ config, pkgs, flakeRoot, ... }: +{ config, pkgs, lib, flakeRoot, ... }: let - # convenience for extra Emacs packages emacsExtraPackages = epkgs: [ epkgs.manualPackages.treesit-grammars.with-all-grammars epkgs.nerd-icons @@ -573,18 +572,18 @@ in }; ############################ - # Home Manager integration - # Only evaluated if imported via home-manager.nixosModules.home-manager + # Home Manager configuration + # Only define if home-manager is active ############################ - home-manager.useGlobalPkgs = true; - home-manager.useUserPackages = true; + home-manager.useGlobalPkgs = lib.optionalBool (config.home-manager != null) true; + home-manager.useUserPackages = lib.optionalBool (config.home-manager != null) true; - home.sessionVariables = { + home.sessionVariables = lib.optionalAttrs (config.home-manager != null) { EDITOR = "emacs"; XDG_SCREENSHOTS_DIR = "~/screenshots"; }; - home.file = { + home.file = lib.optionalAttrs (config.home-manager != null) { ".emacs.d/early-init.el" = { source = "${flakeRoot}/assets/traveldroid/conf/emacs/early-init.el"; }; diff --git a/Droidnix/generated/modules/traveldroid/apps/emacs/emacs.nix b/Droidnix/generated/modules/traveldroid/apps/emacs/emacs.nix index 4727b1915..9fe2461b8 100644 --- a/Droidnix/generated/modules/traveldroid/apps/emacs/emacs.nix +++ b/Droidnix/generated/modules/traveldroid/apps/emacs/emacs.nix @@ -1,7 +1,6 @@ -{ config, pkgs, flakeRoot, ... }: +{ config, pkgs, lib, flakeRoot, ... }: let - # convenience for extra Emacs packages emacsExtraPackages = epkgs: [ epkgs.manualPackages.treesit-grammars.with-all-grammars epkgs.nerd-icons @@ -55,18 +54,18 @@ in }; ############################ - # Home Manager integration - # Only evaluated if imported via home-manager.nixosModules.home-manager + # Home Manager configuration + # Only define if home-manager is active ############################ - home-manager.useGlobalPkgs = true; - home-manager.useUserPackages = true; + home-manager.useGlobalPkgs = lib.optionalBool (config.home-manager != null) true; + home-manager.useUserPackages = lib.optionalBool (config.home-manager != null) true; - home.sessionVariables = { + home.sessionVariables = lib.optionalAttrs (config.home-manager != null) { EDITOR = "emacs"; XDG_SCREENSHOTS_DIR = "~/screenshots"; }; - home.file = { + home.file = lib.optionalAttrs (config.home-manager != null) { ".emacs.d/early-init.el" = { source = "${flakeRoot}/assets/traveldroid/conf/emacs/early-init.el"; };