From 0e41d27187cd230111d44738b06f35efa7537b14 Mon Sep 17 00:00:00 2001 From: Azat Bahawi Date: Wed, 23 Aug 2023 02:25:27 +0300 Subject: 2023-08-23 --- modules/common/emacs/default.nix | 3 +-- modules/common/emacs/doom/config.el | 3 --- modules/common/emacs/doom/init.el | 2 +- modules/common/emacs/doom/packages.el | 1 - 4 files changed, 2 insertions(+), 7 deletions(-) (limited to 'modules/common/emacs') diff --git a/modules/common/emacs/default.nix b/modules/common/emacs/default.nix index 5499d48..9589e65 100644 --- a/modules/common/emacs/default.nix +++ b/modules/common/emacs/default.nix @@ -77,7 +77,6 @@ in { cmake-format # :lang cc :editor format cmigemo # :lang japanese css-language-server # :lang (web +lsp) - dhall-language-server # :lang (dhall +lsp) dockerfile-language-server # :tools (docker +lsp) editorconfig # :tools editorconfig fd # doom! @@ -211,7 +210,7 @@ in { programs.emacs = { enable = true; - package = pkgs.emacs28; # Pin to avoid surprises. + package = pkgs.emacs29; # Pin to avoid surprises. }; }; }; diff --git a/modules/common/emacs/doom/config.el b/modules/common/emacs/doom/config.el index d726406..b6b39e5 100644 --- a/modules/common/emacs/doom/config.el +++ b/modules/common/emacs/doom/config.el @@ -188,6 +188,3 @@ (use-package! kubernetes-evil :after kubernetes-overview) - -(use-package! kubernetes-tramp - :defer t) diff --git a/modules/common/emacs/doom/init.el b/modules/common/emacs/doom/init.el index b0a7f4a..76c14fe 100644 --- a/modules/common/emacs/doom/init.el +++ b/modules/common/emacs/doom/init.el @@ -79,7 +79,7 @@ (common-lisp +lsp +tree-sitter) (csharp +lsp +tree-sitter) data - (dhall +lsp +tree-sitter) + ;; (dhall +lsp +tree-sitter) (emacs-lisp +lsp +tree-sitter) (go +lsp +tree-sitter) ;; graphql diff --git a/modules/common/emacs/doom/packages.el b/modules/common/emacs/doom/packages.el index 033932c..61ac680 100644 --- a/modules/common/emacs/doom/packages.el +++ b/modules/common/emacs/doom/packages.el @@ -13,4 +13,3 @@ (package! kubernetes) (package! kubernetes-evil) -(package! kubernetes-tramp) -- cgit 1.4.1