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

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

diff --git a/Droidnix/README.org b/Droidnix/README.org
index ef3f2a098..3e79655ec 100644
--- a/Droidnix/README.org
+++ b/Droidnix/README.org
@@ -516,12 +516,11 @@ 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
-{ lib, config, pkgs, flakeRoot, home-manager, ... }:
+{ lib, pkgs, flakeRoot, home-manager, config, ... }:
 
 let
   username = config.defaultUser or "henrov";
 
-  # Emacs package with tree sitter enabled
   emacsPkg = pkgs.emacs-pgtk.override { withTreeSitter = true; };
 
   emacsExtraPackages = epkgs: [
@@ -566,36 +565,31 @@ let
     epkgs.sideline-eglot
   ];
 
-  # Paths to Emacs config files
+  # Emacs config files
   earlyInitFile = "${flakeRoot}/assets/traveldroid/conf/emacs/early-init.el";
   initFile      = "${flakeRoot}/assets/traveldroid/conf/emacs/init.el";
+
 in
 {
-  #################################
-  # System-level Emacs (optional, if you want it available globally)
-  #################################
-  programs.emacs = {
-    enable = true;
-    package = emacsPkg;
-    extraPackages = emacsExtraPackages;
-  };
-
-  #################################
-  # Home Manager user-specific configuration
-  #################################
   _module.args.hmUsers = {
     ${username} = {
+      home.packages = [ emacsPkg ];
+
       home.sessionVariables = {
         EDITOR = "emacs";
         XDG_SCREENSHOTS_DIR = "~/screenshots";
       };
 
+      programs.emacs = {
+        enable = true;
+        package = emacsPkg;
+        extraPackages = emacsExtraPackages;
+      };
+
       home.file = {
         ".emacs.d/early-init.el" = { source = earlyInitFile; };
         ".emacs.d/init.el"       = { source = initFile; };
       };
-
-      home.packages = [ emacsPkg ];
     };
   };
 }
diff --git a/Droidnix/generated/modules/traveldroid/apps/emacs/emacs.nix b/Droidnix/generated/modules/traveldroid/apps/emacs/emacs.nix
index 080c02c71..c886cc9ce 100644
--- a/Droidnix/generated/modules/traveldroid/apps/emacs/emacs.nix
+++ b/Droidnix/generated/modules/traveldroid/apps/emacs/emacs.nix
@@ -1,9 +1,8 @@
-{ lib, config, pkgs, flakeRoot, home-manager, ... }:
+{ lib, pkgs, flakeRoot, home-manager, config, ... }:
 
 let
   username = config.defaultUser or "henrov";
 
-  # Emacs package with tree sitter enabled
   emacsPkg = pkgs.emacs-pgtk.override { withTreeSitter = true; };
 
   emacsExtraPackages = epkgs: [
@@ -48,36 +47,31 @@ let
     epkgs.sideline-eglot
   ];
 
-  # Paths to Emacs config files
+  # Emacs config files
   earlyInitFile = "${flakeRoot}/assets/traveldroid/conf/emacs/early-init.el";
   initFile      = "${flakeRoot}/assets/traveldroid/conf/emacs/init.el";
+
 in
 {
-  #################################
-  # System-level Emacs (optional, if you want it available globally)
-  #################################
-  programs.emacs = {
-    enable = true;
-    package = emacsPkg;
-    extraPackages = emacsExtraPackages;
-  };
-
-  #################################
-  # Home Manager user-specific configuration
-  #################################
   _module.args.hmUsers = {
     ${username} = {
+      home.packages = [ emacsPkg ];
+
       home.sessionVariables = {
         EDITOR = "emacs";
         XDG_SCREENSHOTS_DIR = "~/screenshots";
       };
 
+      programs.emacs = {
+        enable = true;
+        package = emacsPkg;
+        extraPackages = emacsExtraPackages;
+      };
+
       home.file = {
         ".emacs.d/early-init.el" = { source = earlyInitFile; };
         ".emacs.d/init.el"       = { source = initFile; };
       };
-
-      home.packages = [ emacsPkg ];
     };
   };
 }