Regenerated

Droidnix/README.org

@@ -1305,89 +1305,103 @@ in
 ** =generated/modules/apps/emacs/emacs.nix=
 This sets up the emacs terminal
 #+BEGIN_SRC nix :tangle generated/modules/apps/emacs/emacs.nix :noweb tangle :mkdirp yes :eval never-html
-{ lib, ... }:
+{ lib, pkgs, config, ... }:
 
+let
+  moduleName   = "emacs";
+  username     = config.defaultUser or "henrov";
+
+  # Paths to your init files (relative to this module)
+  emacsAssets  = ../../../assets/system/conf/emacs;
+  initFile     = "${emacsAssets}/init.el";
+  earlyInitFile = "${emacsAssets}/early-init.el";
+
+  # Toggle for this module
+  enableProgram = config.enableEmacs or false;
+in
 {
-  flake.nixosModules.emacs = { config, pkgs, lib, ... }:
+  # Top-level toggle option
+  options.enableEmacs = lib.mkEnableOption "Enable Emacs configuration";
 
-  {
-    # Optie om de module aan/uit te zetten
-    options.mySystem.system.emacs.enable = lib.mkEnableOption "Enable Emacs config";
+  config = lib.mkIf enableProgram {
 
-    config = lib.mkIf (config.mySystem.system.emacs.enable or false) {
-      # System packages (optioneel)
-      environment.systemPackages = with pkgs; [
-        # Voeg systeem-brede packages toe als je wilt
-      ];
+    # Minimal system-wide Emacs package
+    environment.systemPackages = [
+      pkgs.emacs-pgtk.override { withTreeSitter = true; }
+    ];
 
-      # Home Manager configuratie
-      home-manager.users.henrov = {
-        programs.emacs = {
-          enable = true;
-          package = pkgs.emacs-pgtk.override { withTreeSitter = true; };
+    # Home Manager Emacs config
+    home-manager.users.${username} = {
+      programs.emacs = {
+        enable = true;
+        package = pkgs.emacs-pgtk.override { withTreeSitter = true; };
 
-          extraPackages = epkgs: with epkgs; [
-            # Tree-sitter and language support
-            manualPackages.treesit-grammars.with-all-grammars
-            rust-mode
-            rustic
-            nix-mode
-            hcl-mode
+        extraPackages = epkgs: with epkgs; [
+          # Core dev and language support
+          manualPackages.treesit-grammars.with-all-grammars
+          rust-mode
+          rustic
+          nix-mode
+          hcl-mode
 
-            # UI/UX and navigation
-            nerd-icons
-            doom-modeline
-            diminish
-            eldoc
-            eldoc-box
-            pulsar
-            which-key
-            avy
-            consult
-            vertico
-            marginalia
-            crux
-            shell-pop
+          # UI & workflow
+          nerd-icons
+          doom-modeline
+          diminish
+          eldoc
+          eldoc-box
+          pulsar
+          which-key
+          avy
+          consult
+          vertico
+          marginalia
+          crux
+          shell-pop
 
-            # Completion and snippets
-            nerd-icons-corfu
-            corfu
-            cape
-            orderless
-            yasnippet
-            yasnippet-snippets
+          # Completion/snippets
+          nerd-icons-corfu
+          corfu
+          cape
+          orderless
+          yasnippet
+          yasnippet-snippets
 
-            # Utilities and tools
-            rg
-            exec-path-from-shell
-            eat
-            f
-            gptel
-            nixpkgs-fmt
-            envrc
+          # Utilities
+          rg
+          exec-path-from-shell
+          eat
+          f
+          gptel
+          nixpkgs-fmt
+          envrc
 
-            # Theming
-            catppuccin-theme
+          # Theming
+          catppuccin-theme
 
-            # Git
-            magit
+          # Git
+          magit
 
-            # Editing and workflow
-            expreg
-            vundo
-            puni
+          # Editing/workflow
+          expreg
+          vundo
+          puni
 
-            # Error and side panel support
-            sideline
-            sideline-flymake
-            sideline-eglot
-          ];
-        };
+          # Error/side panels
+          sideline
+          sideline-flymake
+          sideline-eglot
+        ];
 
-        home.sessionVariables = {
-          EDITOR = "emacs";
-          XDG_SCREENSHOTS_DIR = "~/screenshots";
-        };
+        # Load your init files from assets
+        initFile       = initFile;
+        earlyInitFile  = earlyInitFile;
+      };
+
+      # Useful session variables
+      home.sessionVariables = {
+        EDITOR = "emacs";
+        XDG_SCREENSHOTS_DIR = "~/screenshots";
       };
     };
   };