From b602876a9e65379cbbcd0f453a910c4046d94f76 Mon Sep 17 00:00:00 2001
From: "info@data-pro.nu" <info@data-pro.nu>
Date: Wed, 25 Mar 2026 12:12:53 +0000
Subject: [PATCH] Regenerated

---
 Droidnix/README.org                           | 41 +++++++++++--------
 .../modules/traveldroid/apps/emacs/emacs.nix  | 41 +++++++++++--------
 2 files changed, 48 insertions(+), 34 deletions(-)

diff --git a/Droidnix/README.org b/Droidnix/README.org
index ca8c72332..ef3f2a098 100644
--- a/Droidnix/README.org
+++ b/Droidnix/README.org
@@ -516,9 +516,14 @@ 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, lib, flakeRoot, ... }:
+{ lib, config, pkgs, flakeRoot, home-manager, ... }:
 
 let
+  username = config.defaultUser or "henrov";
+
+  # Emacs package with tree sitter enabled
+  emacsPkg = pkgs.emacs-pgtk.override { withTreeSitter = true; };
+
   emacsExtraPackages = epkgs: [
     epkgs.manualPackages.treesit-grammars.with-all-grammars
     epkgs.nerd-icons
@@ -560,35 +565,37 @@ let
     epkgs.sideline-flymake
     epkgs.sideline-eglot
   ];
+
+  # Paths to Emacs config files
+  earlyInitFile = "${flakeRoot}/assets/traveldroid/conf/emacs/early-init.el";
+  initFile      = "${flakeRoot}/assets/traveldroid/conf/emacs/init.el";
 in
 {
   #################################
-  # System-level Emacs
+  # System-level Emacs (optional, if you want it available globally)
   #################################
   programs.emacs = {
     enable = true;
-    package = pkgs.emacs-pgtk.override { withTreeSitter = true; };
+    package = emacsPkg;
     extraPackages = emacsExtraPackages;
   };
 
   #################################
-  # Home Manager-level configuration
-  # Only define if Home Manager is active
+  # Home Manager user-specific configuration
   #################################
-  home-manager.useGlobalPkgs = lib.optionalBool (config.home-manager != null) true;
-  home-manager.useUserPackages = lib.optionalBool (config.home-manager != null) true;
+  _module.args.hmUsers = {
+    ${username} = {
+      home.sessionVariables = {
+        EDITOR = "emacs";
+        XDG_SCREENSHOTS_DIR = "~/screenshots";
+      };
 
-  home.sessionVariables = lib.optionalAttrs (config.home-manager != null) {
-    EDITOR = "emacs";
-    XDG_SCREENSHOTS_DIR = "~/screenshots";
-  };
+      home.file = {
+        ".emacs.d/early-init.el" = { source = earlyInitFile; };
+        ".emacs.d/init.el"       = { source = initFile; };
+      };
 
-  home.file = lib.optionalAttrs (config.home-manager != null) {
-    ".emacs.d/early-init.el" = {
-      source = "${flakeRoot}/assets/traveldroid/conf/emacs/early-init.el";
-    };
-    ".emacs.d/init.el" = {
-      source = "${flakeRoot}/assets/traveldroid/conf/emacs/init.el";
+      home.packages = [ emacsPkg ];
     };
   };
 }
diff --git a/Droidnix/generated/modules/traveldroid/apps/emacs/emacs.nix b/Droidnix/generated/modules/traveldroid/apps/emacs/emacs.nix
index d427df2da..080c02c71 100644
--- a/Droidnix/generated/modules/traveldroid/apps/emacs/emacs.nix
+++ b/Droidnix/generated/modules/traveldroid/apps/emacs/emacs.nix
@@ -1,6 +1,11 @@
-{ config, pkgs, lib, flakeRoot, ... }:
+{ lib, config, pkgs, flakeRoot, home-manager, ... }:
 
 let
+  username = config.defaultUser or "henrov";
+
+  # Emacs package with tree sitter enabled
+  emacsPkg = pkgs.emacs-pgtk.override { withTreeSitter = true; };
+
   emacsExtraPackages = epkgs: [
     epkgs.manualPackages.treesit-grammars.with-all-grammars
     epkgs.nerd-icons
@@ -42,35 +47,37 @@ let
     epkgs.sideline-flymake
     epkgs.sideline-eglot
   ];
+
+  # Paths to Emacs config files
+  earlyInitFile = "${flakeRoot}/assets/traveldroid/conf/emacs/early-init.el";
+  initFile      = "${flakeRoot}/assets/traveldroid/conf/emacs/init.el";
 in
 {
   #################################
-  # System-level Emacs
+  # System-level Emacs (optional, if you want it available globally)
   #################################
   programs.emacs = {
     enable = true;
-    package = pkgs.emacs-pgtk.override { withTreeSitter = true; };
+    package = emacsPkg;
     extraPackages = emacsExtraPackages;
   };
 
   #################################
-  # Home Manager-level configuration
-  # Only define if Home Manager is active
+  # Home Manager user-specific configuration
   #################################
-  home-manager.useGlobalPkgs = lib.optionalBool (config.home-manager != null) true;
-  home-manager.useUserPackages = lib.optionalBool (config.home-manager != null) true;
+  _module.args.hmUsers = {
+    ${username} = {
+      home.sessionVariables = {
+        EDITOR = "emacs";
+        XDG_SCREENSHOTS_DIR = "~/screenshots";
+      };
 
-  home.sessionVariables = lib.optionalAttrs (config.home-manager != null) {
-    EDITOR = "emacs";
-    XDG_SCREENSHOTS_DIR = "~/screenshots";
-  };
+      home.file = {
+        ".emacs.d/early-init.el" = { source = earlyInitFile; };
+        ".emacs.d/init.el"       = { source = initFile; };
+      };
 
-  home.file = lib.optionalAttrs (config.home-manager != null) {
-    ".emacs.d/early-init.el" = {
-      source = "${flakeRoot}/assets/traveldroid/conf/emacs/early-init.el";
-    };
-    ".emacs.d/init.el" = {
-      source = "${flakeRoot}/assets/traveldroid/conf/emacs/init.el";
+      home.packages = [ emacsPkg ];
     };
   };
 }