From 75711282c62e8d6277ce7e26a177b2ba84485892 Mon Sep 17 00:00:00 2001 From: Evie Litherland-Smith Date: Fri, 27 Oct 2023 06:40:20 +0100 Subject: [PATCH] Fix yasnippet config, add custom snippet from doom Add link-hint package --- home/emacs/default.nix | 1 + home/emacs/modules/custom-ide-config.el | 2 ++ home/emacs/{doom => }/snippets/python-mode/salclient | 0 system/emacs.nix | 1 + 4 files changed, 4 insertions(+) rename home/emacs/{doom => }/snippets/python-mode/salclient (100%) diff --git a/home/emacs/default.nix b/home/emacs/default.nix index ee951ff9..604dc434 100644 --- a/home/emacs/default.nix +++ b/home/emacs/default.nix @@ -4,6 +4,7 @@ stylix.targets.emacs.enable = false; xdg.configFile = { "emacs/init.el".source = ./init.el; + "emacs/snippets".source = ./snippets; "emacs/modules".source = ./modules; "emacs/crafted-emacs".source = crafted-emacs; }; diff --git a/home/emacs/modules/custom-ide-config.el b/home/emacs/modules/custom-ide-config.el index 1da71b66..050868b9 100644 --- a/home/emacs/modules/custom-ide-config.el +++ b/home/emacs/modules/custom-ide-config.el @@ -4,6 +4,8 @@ (apheleia-global-mode +1) (direnv-mode +1) (eglot-ensure) +(require 'yasnippet) +(require 'yasnippet-snippets) (yas-reload-all) (add-hook 'prog-mode-hook #'aggressive-indent-mode) (add-hook 'prog-mode-hook #'rainbow-delimiters-mode) diff --git a/home/emacs/doom/snippets/python-mode/salclient b/home/emacs/snippets/python-mode/salclient similarity index 100% rename from home/emacs/doom/snippets/python-mode/salclient rename to home/emacs/snippets/python-mode/salclient diff --git a/system/emacs.nix b/system/emacs.nix index b4893539..1b18ae50 100644 --- a/system/emacs.nix +++ b/system/emacs.nix @@ -81,6 +81,7 @@ # Additional packages which-key + link-hint magit vterm pdf-tools