From d94cf44762a627fd50183b45c5b2d22bcdb80c87 Mon Sep 17 00:00:00 2001 From: Pouya Abbassi Date: Thu, 2 May 2024 12:41:15 +0330 Subject: [PATCH] Remove unnecessary code from Clojure module. --- nix/modules/clojure/default.nix | 2 +- nix/modules/clojure/lisp/fg42/clojure.el | 40 +++--------------------- 2 files changed, 6 insertions(+), 36 deletions(-) diff --git a/nix/modules/clojure/default.nix b/nix/modules/clojure/default.nix index 8a2b990..efed431 100644 --- a/nix/modules/clojure/default.nix +++ b/nix/modules/clojure/default.nix @@ -28,7 +28,6 @@ let (with pkgs.emacsPackages; [ cider clojure-ts-mode - company flycheck-clj-kondo ]); @@ -48,6 +47,7 @@ in fg42.paths = (with pkgs;[ clojure-lsp clojure + leiningen ]); fg42.requires = [ drv.pname ]; diff --git a/nix/modules/clojure/lisp/fg42/clojure.el b/nix/modules/clojure/lisp/fg42/clojure.el index 53a3020..03d3d6b 100644 --- a/nix/modules/clojure/lisp/fg42/clojure.el +++ b/nix/modules/clojure/lisp/fg42/clojure.el @@ -24,59 +24,29 @@ (eval-when-compile (require 'fpkg)) + (use! flycheck-clj-kondo - "flycheck linter for clojure using `clj-kondo'." - :ensure t) + "flycheck linter for clojure using `clj-kondo'.") (use! paredit "Minor mode for editing parenthesis." :commands enable-paredit-mode) + (use! cider - "Clojure(Script) Interactive Development Environment that Rocks!" - :ensure t) - -(use! lsp-mode - "lsp-mode" - :init - ;; set prefix for lsp-command-keymap (few alternatives - "C-l", "C-c l") - (setq lsp-keymap-prefix "C-c l") - ;; :hook ((clojure-ts-mode . lsp)) - :commands lsp) - -(use! lsp-ui - "lsp-ui" - :commands lsp-ui-mode) - -(use! lsp-ui-doc-frame - "lsp-ui-doc-frame" - :commands lsp-ui-doc-frame-mode) - -(defun fg42/clojure-ts-mode-setup () - "A hook handler to setup cpp related configurations." - ;; We set eglot's autoload command to `eglot-ensure' - (eglot-ensure)) + "Clojure(Script) Interactive Development Environment that Rocks!") (use! clojure-ts-mode "Clojure mode" - ;; :init - ;; (add-to-list 'major-mode-remap-alist '(clojure-mode . clojure-ts-mode)) :mode (("\\.clj\\'" . clojure-ts-mode) ("\\.cljs\\'" . clojure-ts-mode) ("\\.cljc\\'" . clojure-ts-mode)) + :config (require 'flycheck-clj-kondo) (require 'cider) :hook - (clojure-ts-mode . company-mode) (clojure-ts-mode . enable-paredit-mode) - (clojure-ts-mode . lsp) - ;; (clojure-ts-mode . company-box) - ;; (clojure-ts-mode . flycheck-clj-kondo) - ;; (clojure-ts-mode . lsp) - ;; (clojure-ts-mode . lsp-ui-mode) - ;; (clojure-ts-mode . eglot-ensure) - ;; (clojure-ts-mode . fg42/clojure-ts-mode-setup)) ) (provide 'fg42/clojure)