Regenerated

Droidnix/README.org

@@ -1217,115 +1217,105 @@ This sets up the zsh in the terminal
 }
 #+END_SRC
 
-** =generated/parked/apps/emacs/emacs.nix=
+** =generated/modules/apps/emacs/emacs.nix=
 This sets up the emacs terminal
-#+BEGIN_SRC nix :tangle generated/parked/apps/emacs/emacs.nix :noweb tangle :mkdirp yes :eval never-html
-{ lib, pkgs, config, ... }:
+#+BEGIN_SRC nix :tangle generated/modules/apps/emacs/emacs.nix :noweb tangle :mkdirp yes :eval never-html
+{ 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";
+  # Paths to your init files
+  emacsAssets   = ../../../assets/system/conf/emacs;
+  initFile      = "${emacsAssets}/init.el";
   earlyInitFile = "${emacsAssets}/early-init.el";
-
-  # Toggle for this module
-  enableProgram = config.enableEmacs or false;
 in
 {
-  # Top-level toggle option
-  options.enableEmacs = lib.mkEnableOption "Enable Emacs configuration";
+  # Minimal system-wide Emacs package
+  environment.systemPackages = [
+    pkgs.emacs-pgtk.override { withTreeSitter = true; }
+  ];
 
-  config = lib.mkIf enableProgram {
+  # Home Manager Emacs config
+  home-manager.users.${username} = {
+    programs.emacs = {
+      enable  = true;
+      package = pkgs.emacs-pgtk.override { withTreeSitter = true; };
 
-    # Minimal system-wide Emacs package
-    environment.systemPackages = [
-      pkgs.emacs-pgtk.override { withTreeSitter = true; }
-    ];
+      extraPackages = epkgs: with epkgs; [
+        # Core dev and language support
+        manualPackages.treesit-grammars.with-all-grammars
+        rust-mode
+        rustic
+        nix-mode
+        hcl-mode
 
-    # Home Manager Emacs config
-    home-manager.users.${username} = {
-      programs.emacs = {
-        enable = true;
-        package = pkgs.emacs-pgtk.override { withTreeSitter = true; };
+        # UI & workflow
+        nerd-icons
+        doom-modeline
+        diminish
+        eldoc
+        eldoc-box
+        pulsar
+        which-key
+        avy
+        consult
+        vertico
+        marginalia
+        crux
+        shell-pop
 
-        extraPackages = epkgs: with epkgs; [
-          # Core dev and language support
-          manualPackages.treesit-grammars.with-all-grammars
-          rust-mode
-          rustic
-          nix-mode
-          hcl-mode
+        # Completion/snippets
+        nerd-icons-corfu
+        corfu
+        cape
+        orderless
+        yasnippet
+        yasnippet-snippets
 
-          # UI & workflow
-          nerd-icons
-          doom-modeline
-          diminish
-          eldoc
-          eldoc-box
-          pulsar
-          which-key
-          avy
-          consult
-          vertico
-          marginalia
-          crux
-          shell-pop
+        # Utilities
+        rg
+        exec-path-from-shell
+        eat
+        f
+        gptel
+        nixpkgs-fmt
+        envrc
 
-          # Completion/snippets
-          nerd-icons-corfu
-          corfu
-          cape
-          orderless
-          yasnippet
-          yasnippet-snippets
+        # Theming
+        catppuccin-theme
 
-          # Utilities
-          rg
-          exec-path-from-shell
-          eat
-          f
-          gptel
-          nixpkgs-fmt
-          envrc
+        # Git
+        magit
 
-          # Theming
-          catppuccin-theme
+        # Editing/workflow
+        expreg
+        vundo
+        puni
 
-          # Git
-          magit
+        # Error/side panels
+        sideline
+        sideline-flymake
+        sideline-eglot
+      ];
 
-          # Editing/workflow
-          expreg
-          vundo
-          puni
+      # Load your init files from assets
+      initFile       = initFile;
+      earlyInitFile  = earlyInitFile;
+    };
 
-          # Error/side panels
-          sideline
-          sideline-flymake
-          sideline-eglot
-        ];
-
-        # Load your init files from assets
-        initFile       = initFile;
-        earlyInitFile  = earlyInitFile;
-      };
-
-      # Useful session variables
-      home.sessionVariables = {
-        EDITOR = "emacs";
-        XDG_SCREENSHOTS_DIR = "~/screenshots";
-      };
+    # Useful session variables
+    home.sessionVariables = {
+      EDITOR = "emacs";
+      XDG_SCREENSHOTS_DIR = "~/screenshots";
     };
   };
 }
 #+END_SRC
 
-** =generated/parked/apps/emacs/early-init.el=
+** =generated/modules/apps/emacs/early-init.el=
 This helps set up the emacs terminal
-#+BEGIN_SRC nix :tangle generated/parked/apps/emacs/early-init.el :noweb tangle :mkdirp yes :eval never-html
+#+BEGIN_SRC nix :tangle generated/modules/apps/emacs/early-init.el :noweb tangle :mkdirp yes :eval never-html
 ;;; package --- early init -*- lexical-binding: t -*-
  ;;; Commentary:
  ;;; Prevents white flash and better Emacs defaults
@@ -1420,9 +1410,9 @@ package-archive-priorities '(("gnu"  . 99)
 ;;; early-init.el ends here
 #+END_SRC
 
-** =generated/parked/apps/emacs/init.el=
+** =generated/modules/apps/emacs/init.el=
 This helps set up the emacs terminal
-#+BEGIN_SRC nix :tangle generated/parked/apps/emacs/init.el :noweb tangle :mkdirp yes :eval never-html
+#+BEGIN_SRC nix :tangle generated/modules/apps/emacs/init.el :noweb tangle :mkdirp yes :eval never-html
 ;;; package --- Summary - My minimal Emacs init file -*- lexical-binding: t -*-
 
 ;;; Commentary: