jonas/.hive
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Home Gen496 @ 2025-04-10-12:48

Browse Source
This commit is contained in:
Jonas Röger 2025-04-10 12:48:29 +02:00
parent 6279807628
commit bb7fa83548
3 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/home/doom/doom.nix
View File

@ -21,7 +21,6 @@
gnutls gnutls
ispell ispell
libtool libtool
nodejs
]; ];
default-shell-pkgs = with pkgs; [ default-shell-pkgs = with pkgs; [
emmet-ls emmet-ls
@ -51,6 +50,7 @@
++ lib.optionals cfg.withShellPkgs (cfg.overrideShellPkgs default-shell-pkgs) ++ lib.optionals cfg.withShellPkgs (cfg.overrideShellPkgs default-shell-pkgs)
++ lib.optionals cfg.withNixPkgs (cfg.overrideNixPkgs default-nix-pkgs) ++ lib.optionals cfg.withNixPkgs (cfg.overrideNixPkgs default-nix-pkgs)
++ lib.optionals cfg.withCXXPkgs (cfg.overrideCXXPkgs default-cxx-pkgs) ++ lib.optionals cfg.withCXXPkgs (cfg.overrideCXXPkgs default-cxx-pkgs)
++ lib.optional cfg.enableCopilot pkgs.copilot-language-server
++ default-core-pkgs; ++ default-core-pkgs;
doom-socket-name = "main"; doom-socket-name = "main";
wrapped-emacs = pkgs.symlinkJoin { wrapped-emacs = pkgs.symlinkJoin {
@ -84,6 +84,7 @@
in { in {
options.doom = { options.doom = {
enable = lib.mkEnableOption "Enable Doom Emacs"; enable = lib.mkEnableOption "Enable Doom Emacs";
enableCopilot = lib.mkEnableOption "Enable Copilot in Doom Emacs";
withLatexPkgs = lib.mkEnableOption "Enable LaTeX packages in doom path"; withLatexPkgs = lib.mkEnableOption "Enable LaTeX packages in doom path";
withShellPkgs = lib.mkEnableOption "Enable shell packages in doom path"; withShellPkgs = lib.mkEnableOption "Enable shell packages in doom path";
withNixPkgs = lib.mkEnableOption "Enable LaTeX packages in doom path"; withNixPkgs = lib.mkEnableOption "Enable LaTeX packages in doom path";
@ -186,6 +187,11 @@ in {
source = ./static/packages.el; source = ./static/packages.el;
onChange = "${doom-setup} sync --force -u -e"; 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" = { "doom-emacs" = {
source = builtins.fetchGit { source = builtins.fetchGit {
url = "https://github.com/doomemacs/doomemacs"; url = "https://github.com/doomemacs/doomemacs";

2
modules/home/doom/static/packages.d/copilot.el Normal file
View File

@ -0,0 +1,2 @@
(package! copilot
:recipe (:host github :repo "copilot-emacs/copilot.el" :files ("*.el")))

8
modules/home/doom/static/packages.el
View File

@ -52,9 +52,6 @@
(package! conventional-commit (package! conventional-commit
:recipe (:host github :repo "akirak/conventional-commit.el" :files ("conventional-commit.el"))) :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 ;; TODO: Remove this when a fix for https://github.com/doomemacs/doomemacs/issues/8286 is included
(package! package-lint :pin "21edc6d0d0eadd2d0a537f422fb9b7b8a3ae6991") (package! package-lint :pin "21edc6d0d0eadd2d0a537f422fb9b7b8a3ae6991")
@ -65,3 +62,8 @@
(package! pandoc-mode) (package! pandoc-mode)
(package! tramp) (package! tramp)
(package! graphviz-dot-mode) (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)))