From 85dfee58be769eeb7fbaff9464cdbf22ebfa5a48 Mon Sep 17 00:00:00 2001
From: "info@data-pro.nu" <info@data-pro.nu>
Date: Wed, 25 Mar 2026 11:33:54 +0000
Subject: [PATCH] Regenerated

---
 Droidnix/README.org                           | 73 +++++++++++++++++++
 .../modules/traveldroid/apps/emacs/emacs.nix  | 73 +++++++++++++++++++
 2 files changed, 146 insertions(+)

diff --git a/Droidnix/README.org b/Droidnix/README.org
index 49049a74b..8fdb49255 100644
--- a/Droidnix/README.org
+++ b/Droidnix/README.org
@@ -516,7 +516,80 @@ 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
+{ pkgs, flakeRoot, ... }:
 
+let
+  emacsPkg = pkgs.emacs-pgtk.override { withTreeSitter = true; };
+in
+{
+  #################################
+  # System-wide Emacs
+  #################################
+  environment.systemPackages = [
+    emacsPkg
+  ];
+
+  #################################
+  # Home Manager configuration
+  #################################
+  home.sessionVariables = {
+    EDITOR = "emacs";
+    XDG_SCREENSHOTS_DIR = "~/screenshots";
+  };
+
+  home.file = {
+    "emacs/early-init.el" = {
+      source = "${flakeRoot}/assets/traveldroid/conf/emacs/early-init.el";
+      target = ".emacs.d/early-init.el";
+    };
+    "emacs/init.el" = {
+      source = "${flakeRoot}/assets/traveldroid/conf/emacs/init.el";
+      target = ".emacs.d/init.el";
+    };
+  };
+
+  home.packages = epkgs: [
+    epkgs.manualPackages.treesit-grammars.with-all-grammars
+    epkgs.nerd-icons
+    epkgs.doom-modeline
+    epkgs.diminish
+    epkgs.eldoc
+    epkgs.pulsar
+    epkgs.which-key
+    epkgs.expreg
+    epkgs.vundo
+    epkgs.puni
+    epkgs.avy
+    epkgs.consult
+    epkgs.vertico
+    epkgs.marginalia
+    epkgs.crux
+    epkgs.magit
+    epkgs.nerd-icons-corfu
+    epkgs.corfu
+    epkgs.cape
+    epkgs.orderless
+    epkgs.yasnippet
+    epkgs.yasnippet-snippets
+    epkgs.rg
+    epkgs.exec-path-from-shell
+    epkgs.eat
+    epkgs.rust-mode
+    epkgs.rustic
+    epkgs.nix-mode
+    epkgs.hcl-mode
+    epkgs.shell-pop
+    epkgs.envrc
+    epkgs.nixpkgs-fmt
+    epkgs.f
+    epkgs.gptel
+    epkgs.catppuccin-theme
+    epkgs.eldoc-box
+    epkgs.sideline
+    epkgs.sideline-flymake
+    epkgs.sideline-eglot
+  ];
+}
 #+END_SRC
 
 * generated/modules/traveldroid/desktop
diff --git a/Droidnix/generated/modules/traveldroid/apps/emacs/emacs.nix b/Droidnix/generated/modules/traveldroid/apps/emacs/emacs.nix
index 8b1378917..67064a464 100644
--- a/Droidnix/generated/modules/traveldroid/apps/emacs/emacs.nix
+++ b/Droidnix/generated/modules/traveldroid/apps/emacs/emacs.nix
@@ -1 +1,74 @@
+{ pkgs, flakeRoot, ... }:
 
+let
+  emacsPkg = pkgs.emacs-pgtk.override { withTreeSitter = true; };
+in
+{
+  #################################
+  # System-wide Emacs
+  #################################
+  environment.systemPackages = [
+    emacsPkg
+  ];
+
+  #################################
+  # Home Manager configuration
+  #################################
+  home.sessionVariables = {
+    EDITOR = "emacs";
+    XDG_SCREENSHOTS_DIR = "~/screenshots";
+  };
+
+  home.file = {
+    "emacs/early-init.el" = {
+      source = "${flakeRoot}/assets/traveldroid/conf/emacs/early-init.el";
+      target = ".emacs.d/early-init.el";
+    };
+    "emacs/init.el" = {
+      source = "${flakeRoot}/assets/traveldroid/conf/emacs/init.el";
+      target = ".emacs.d/init.el";
+    };
+  };
+
+  home.packages = epkgs: [
+    epkgs.manualPackages.treesit-grammars.with-all-grammars
+    epkgs.nerd-icons
+    epkgs.doom-modeline
+    epkgs.diminish
+    epkgs.eldoc
+    epkgs.pulsar
+    epkgs.which-key
+    epkgs.expreg
+    epkgs.vundo
+    epkgs.puni
+    epkgs.avy
+    epkgs.consult
+    epkgs.vertico
+    epkgs.marginalia
+    epkgs.crux
+    epkgs.magit
+    epkgs.nerd-icons-corfu
+    epkgs.corfu
+    epkgs.cape
+    epkgs.orderless
+    epkgs.yasnippet
+    epkgs.yasnippet-snippets
+    epkgs.rg
+    epkgs.exec-path-from-shell
+    epkgs.eat
+    epkgs.rust-mode
+    epkgs.rustic
+    epkgs.nix-mode
+    epkgs.hcl-mode
+    epkgs.shell-pop
+    epkgs.envrc
+    epkgs.nixpkgs-fmt
+    epkgs.f
+    epkgs.gptel
+    epkgs.catppuccin-theme
+    epkgs.eldoc-box
+    epkgs.sideline
+    epkgs.sideline-flymake
+    epkgs.sideline-eglot
+  ];
+}