diff options
Diffstat (limited to 'modules/emacs')
| -rw-r--r-- | modules/emacs/default.nix | 2 | ||||
| -rw-r--r-- | modules/emacs/doom/config.el | 56 |
2 files changed, 37 insertions, 21 deletions
diff --git a/modules/emacs/default.nix b/modules/emacs/default.nix index 1e575ed..eccf179 100644 --- a/modules/emacs/default.nix +++ b/modules/emacs/default.nix @@ -121,7 +121,7 @@ in languagetool # :checkers grammar libxml2 # :lang data :editor format markdownlint-cli # :lang markdown - nil # :lang (nix +lsp) + nixd # :lang (nix +lsp) nixfmt # :lang nix :editor format nls # :lang (nickel +lsp) nodePackages.bash-language-server # :lang (sh +lsp) diff --git a/modules/emacs/doom/config.el b/modules/emacs/doom/config.el index 51d1c47..206e5cd 100644 --- a/modules/emacs/doom/config.el +++ b/modules/emacs/doom/config.el @@ -49,13 +49,26 @@ lsp-modeline-code-actions-enable nil) ;; +;;; Nix +;; + +(after! nix + (after! lsp-mode + (add-to-list 'lsp-language-id-configuration '(nix-mode . "nix")) + (lsp-register-client (make-lsp-client + :new-connection (lsp-stdio-connection "nixd") + :activation-fn (lsp-activate-on "nix") + :server-id 'nixd + :major-modes 'nix-mode)) + (add-hook 'nix-mode-hook 'lsp-deferred))) + +;; ;;; Go ;; -(setq lsp-go-analyses - '((unsedvariable . t) - (unusedparams . t) - (unusedwrite . t))) +(setq lsp-go-analyses '((unsedvariable . t) + (unusedparams . t) + (unusedwrite . t))) ;; ;;; Org @@ -146,12 +159,12 @@ (use-package! nickel-mode :config (after! lsp-mode - (add-to-list 'lsp-language-id-configuration '(nickel-mode . "nickel") - (lsp-register-client (make-lsp-client - :new-connection (lsp-stdio-connection "nls") - :activation-fn (lsp-activate-on "nickel") - :server-id 'nls - :major-modes 'nickel-mode))) + (add-to-list 'lsp-language-id-configuration '(nickel-mode . "nickel")) + (lsp-register-client (make-lsp-client + :new-connection (lsp-stdio-connection "nls") + :activation-fn (lsp-activate-on "nickel") + :server-id 'nls + :major-modes 'nickel-mode)) (add-hook 'nickel-mode-hook 'lsp-deferred))) ;; @@ -181,16 +194,19 @@ elfeed-goodies/entry-pane-position 'bottom) (add-hook! 'elfeed-new-entry-hook - '((elfeed-make-tagger :before "2 weeks ago" - :remove 'unread) - (elfeed-make-tagger :feed-title "SberMarket Tech" - :entry-title (not ".*(DevOps|Golang).*") - :add 'junk - :remove 'unread) - (elfeed-make-tagger :feed-title "dotconferences" - :entry-title (not ".*dotGo.*") - :add 'junk - :remove 'unread))) + '((elfeed-make-tagger + :before "2 weeks ago" + :remove 'unread) + (elfeed-make-tagger + :feed-title "SberMarket Tech" + :entry-title (not ".*(DevOps|Golang).*") + :add 'junk + :remove 'unread) + (elfeed-make-tagger + :feed-title "dotconferences" + :entry-title (not ".*dotGo.*") + :add 'junk + :remove 'unread))) ;; ;;; mu4e |