From 776b76844314f54b140c126e2e158739e8d4cf39 Mon Sep 17 00:00:00 2001 From: Emmet Date: Thu, 27 Jul 2023 17:40:51 -0500 Subject: [PATCH] Found a different Nix language server --- user/app/doom-emacs/config.el | 8 ++++++++ user/app/doom-emacs/doom.nix | 2 ++ user/app/doom-emacs/doom.org | 13 +++++++++++++ 3 files changed, 23 insertions(+) diff --git a/user/app/doom-emacs/config.el b/user/app/doom-emacs/config.el index ec17003..10fddd1 100644 --- a/user/app/doom-emacs/config.el +++ b/user/app/doom-emacs/config.el @@ -1039,3 +1039,11 @@ https://github.com/magit/magit/issues/460 (@cpitclaudel)." (map! :leader :desc "Projectile commander" "p @" #'projectile-commander) + +;;;-- LSP stuff ;;;-- +(use-package lsp-mode + :ensure t) + +(use-package nix-mode + :hook (nix-mode . lsp-deferred) + :ensure t) diff --git a/user/app/doom-emacs/doom.nix b/user/app/doom-emacs/doom.nix index cd9bb0a..375a775 100644 --- a/user/app/doom-emacs/doom.nix +++ b/user/app/doom-emacs/doom.nix @@ -39,6 +39,8 @@ in }; home.packages = with pkgs; [ + nil + nixfmt git file nodejs diff --git a/user/app/doom-emacs/doom.org b/user/app/doom-emacs/doom.org index 122d745..49c2aaf 100644 --- a/user/app/doom-emacs/doom.org +++ b/user/app/doom-emacs/doom.org @@ -22,6 +22,7 @@ - [[#eaf][EAF]] - [[#direnv][Direnv]] - [[#projectile][Projectile]] + - [[#lsp][LSP]] - [[#my-initel][My init.el]] - [[#my-packagesel][My packages.el]] - [[#nix-integration][Nix Integration]] @@ -1208,6 +1209,16 @@ I don't have this active right now since I'm exploring tab-bar mode instead! :desc "Projectile commander" "p @" #'projectile-commander) #+END_SRC +** LSP +#+BEGIN_SRC emacs-lisp :tangle config.el +;;;-- LSP stuff ;;;-- +(use-package lsp-mode + :ensure t) + +(use-package nix-mode + :hook (nix-mode . lsp-deferred) + :ensure t) +#+END_SRC * My init.el This section is the [[./init.el][init.el]] section, which controls which Doom modules are loaded. @@ -1480,6 +1491,8 @@ in }; home.packages = with pkgs; [ + nil + nixfmt git file nodejs