diff --git a/pkgsets/emacs/lsp.nix b/pkgsets/emacs/lsp.nix index 30cd584..317395a 100644 --- a/pkgsets/emacs/lsp.nix +++ b/pkgsets/emacs/lsp.nix @@ -44,17 +44,5 @@ mkIf (elem "emacs::lsp" config.machine.pkgs) { after = [ "lsp-ui" ] ++ optional (elem "emacs::flycheck" config.machine.pkgs) "flycheck"; }; - - lsp-java = { - enable = (elem "emacs::java" config.machine.pkgs); - command = [ "lsp-java-enable" ]; - hook = [ '' - (java-mode . (lambda () - (lsp-java-enable) - (lsp-ui-sideline-mode) - (lsp-ui-flycheck-enable t) - (setq-local company-backends (list 'company-lsp)))) - '' ]; - }; }; } diff --git a/pkgsets/java.nix b/pkgsets/java.nix deleted file mode 100644 index fa19b1c..0000000 --- a/pkgsets/java.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ config, pkgs, ... }: - -{ - config.machine.pkgsets.java.pkgs = with pkgs; [ - openjdk11 - maven - (with gitpkgs.eclipses; eclipseWithPlugins { - eclipse = eclipse-platform; - jvmArgs = [ "-Xmx2048m" ]; - plugins = with plugins; [ - color-theme - # emacsplus - checkstyle - eclemma - ]; - }) - ]; -}