diff --git a/modules/home/doom/doom.nix b/modules/home/doom/doom.nix index c2280df..eb5ff6a 100644 --- a/modules/home/doom/doom.nix +++ b/modules/home/doom/doom.nix @@ -21,7 +21,6 @@ gnutls ispell libtool - nodejs ]; default-shell-pkgs = with pkgs; [ emmet-ls @@ -51,6 +50,7 @@ ++ lib.optionals cfg.withShellPkgs (cfg.overrideShellPkgs default-shell-pkgs) ++ lib.optionals cfg.withNixPkgs (cfg.overrideNixPkgs default-nix-pkgs) ++ lib.optionals cfg.withCXXPkgs (cfg.overrideCXXPkgs default-cxx-pkgs) + ++ lib.optional cfg.enableCopilot pkgs.copilot-language-server ++ default-core-pkgs; doom-socket-name = "main"; wrapped-emacs = pkgs.symlinkJoin { @@ -84,6 +84,7 @@ in { options.doom = { enable = lib.mkEnableOption "Enable Doom Emacs"; + enableCopilot = lib.mkEnableOption "Enable Copilot in Doom Emacs"; withLatexPkgs = lib.mkEnableOption "Enable LaTeX packages in doom path"; withShellPkgs = lib.mkEnableOption "Enable shell packages in doom path"; withNixPkgs = lib.mkEnableOption "Enable LaTeX packages in doom path"; @@ -186,6 +187,11 @@ in { source = ./static/packages.el; onChange = "${doom-setup} sync --force -u -e"; }; + "doom-config/packages.d/copilot.el" = { + enable = cfg.enableCopilot; + source = ./static/packages.d/copilot.el; + onChange = "${doom-setup} sync --force -u -e"; + }; "doom-emacs" = { source = builtins.fetchGit { url = "https://github.com/doomemacs/doomemacs"; diff --git a/modules/home/doom/static/packages.d/copilot.el b/modules/home/doom/static/packages.d/copilot.el new file mode 100644 index 0000000..6b32a40 --- /dev/null +++ b/modules/home/doom/static/packages.d/copilot.el @@ -0,0 +1,2 @@ +(package! copilot + :recipe (:host github :repo "copilot-emacs/copilot.el" :files ("*.el"))) diff --git a/modules/home/doom/static/packages.el b/modules/home/doom/static/packages.el index afdec4b..04d43d1 100644 --- a/modules/home/doom/static/packages.el +++ b/modules/home/doom/static/packages.el @@ -52,9 +52,6 @@ (package! conventional-commit :recipe (:host github :repo "akirak/conventional-commit.el" :files ("conventional-commit.el"))) -(package! copilot - :recipe (:host github :repo "copilot-emacs/copilot.el" :files ("*.el"))) - ;; TODO: Remove this when a fix for https://github.com/doomemacs/doomemacs/issues/8286 is included (package! package-lint :pin "21edc6d0d0eadd2d0a537f422fb9b7b8a3ae6991") @@ -65,3 +62,8 @@ (package! pandoc-mode) (package! tramp) (package! graphviz-dot-mode) + +(let ((package-dir(expand-file-name "packages.d" doom-user-dir))) + (when file-directory-p package-dir) + (dolist (file (directory-files package-dir t "\\.el$" t)) + (load file)))