diff --git a/lib/extensions/development/init.el b/lib/extensions/development/init.el index 79ff373..7a21d9a 100644 --- a/lib/extensions/development/init.el +++ b/lib/extensions/development/init.el @@ -223,9 +223,9 @@ (ability yas () "Snippet configuration." - (let ((snippet_home (concat (file-name-directory - (locate-library "yasnippet")) "snippets")) + (locate-library "yasnippet-snippets")) + "snippets")) (my_snippet (concat fg42-home "/lib/snippets"))) (setq yas-snippet-dirs (list my_snippet snippet_home))) diff --git a/lib/extensions/java.el b/lib/extensions/java.el index 5d378ca..4928643 100644 --- a/lib/extensions/java.el +++ b/lib/extensions/java.el @@ -15,6 +15,7 @@ (with-ability lsp-java (depends-on 'lsp-java)) + ;;(depends-on 'dap-java)) (defun java-doc () diff --git a/lib/extensions/java/init.el b/lib/extensions/java/init.el index 8ed5ae0..c380c7f 100644 --- a/lib/extensions/java/init.el +++ b/lib/extensions/java/init.el @@ -12,6 +12,10 @@ (require 'gradle-mode) (add-hook 'java-mode-hook '(lambda() + ;; To fix the indentation of function arguments + (c-set-offset 'arglist-intro '+) + (setq java-basic-offset 2) + (setq c-basic-offset 2) (ability lsp-java ('lsp) (setq lsp-java-server-install-dir fg42-tmp) (lsp))