Update

home-manager/advanced.nix

@@ -18,6 +18,7 @@ let
   };
   basicPkgs = import ./packages/basic.nix { inherit pkgs; };
   advancedPkgs = import ./packages/advanced.nix { inherit pkgs; };
+  emacsPkg = import ./packages/emacs { inherit pkgs sources; };
 
   # misc
   misc = import ./misc;
@@ -29,12 +30,19 @@ let
   basicPrograms = import ./programs/basic.nix { inherit pkgs sources; };
   advancedPrograms = import ./programs/advanced.nix {
     inherit (nixpkgs) lib;
-    inherit pkgs org-babel sources;
+    inherit
+      pkgs
+      org-babel
+      sources
+      emacsPkg
+      ;
   };
 
   # services
   basicServices = import ./services/basic.nix;
-  advancedServices = import ./services/advanced.nix { inherit pkgs; };
+  advancedServices = import ./services/advanced.nix {
+    inherit pkgs emacsPkg;
+  };
 in
 {
   imports = misc ++ modules ++ basicPrograms ++ advancedPrograms ++ basicServices ++ advancedServices;

home-manager/packages/emacs/default.nix

@@ -0,0 +1,9 @@
+{
+  pkgs,
+  sources,
+}:
+pkgs.emacsWithPackagesFromUsePackage {
+  config = builtins.toFile "empty.el" "";
+  package = pkgs.emacs-git;
+  extraEmacsPackages = import ./epkgs { inherit pkgs sources; };
+}

home-manager/programs/advanced.nix

@@ -3,9 +3,10 @@
   pkgs,
   org-babel,
   sources,
+  emacsPkg,
 }:
 let
-  emacs = import ./emacs { inherit pkgs org-babel sources; };
+  emacs = import ./emacs { inherit pkgs emacsPkg org-babel; };
   gh = import ./gh;
   gh-dash = import ./gh-dash;
   git = import ./git { inherit pkgs; };

home-manager/programs/emacs/default.nix

@@ -1,19 +1,15 @@
 {
   pkgs,
+  emacsPkg,
   org-babel,
-  sources,
 }:
 let
   tangle = org-babel.lib.tangleOrgBabel { languages = [ "emacs-lisp" ]; };
 in
 {
   programs.emacs = {
     enable = true;
-    package = pkgs.emacsWithPackagesFromUsePackage {
-      config = builtins.toFile "empty.el" "";
-      package = pkgs.emacs-git;
-      extraEmacsPackages = import ./epkgs { inherit pkgs sources; };
-    };
+    package = emacsPkg;
   };
 
   home = {

home-manager/services/advanced.nix

@@ -1,13 +1,15 @@
-{ pkgs }:
+{ pkgs, emacsPkg }:
 let
   git-sync = import ./git-sync;
+  emacs = import ./emacs { inherit emacsPkg; };
   mako = import ./mako { inherit pkgs; };
   swayidle = import ./swayidle { inherit pkgs; };
   swaync = import ./swaync { inherit pkgs; };
   swayosd = import ./swayosd { inherit pkgs; };
 in
 [
   git-sync
+  emacs
   mako
   swayidle
   swaync

home-manager/services/emacs/default.nix

@@ -0,0 +1,7 @@
+{ emacsPkg, ... }:
+{
+  services.emacs = {
+    enable = true;
+    package = emacsPkg;
+  };
+}

script.el

@@ -5,7 +5,7 @@
   (interactive)
   (let ((org-html-htmlize-output-type 'css)
         (org-publish-project-alist `(("org"
-                                      :base-directory "./home-manager/programs/emacs/elisp/"
+                                      :base-directory "./home-manager/packages/emacs/elisp/"
                                       :base-extension "org"
                                       :exclude "README.org"
                                       :publishing-directory "public/"))))