summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMikhail Kirillov <w96k@runbox.com>2024-09-27 04:51:30 +0400
committerMikhail Kirillov <w96k@runbox.com>2024-09-27 04:51:30 +0400
commitead573e9a3600660ac1417f31c0a834671cf19f1 (patch)
treef38c537832f8fa6c2ce2a60e092edc0fa6075845
parent521157804cc4fb8e9550e3552c205d045213612f (diff)
Update emacs config
-rw-r--r--emacs/.emacs.d/.emacs-config.org7
-rw-r--r--guix/.dotfiles/home-configuration.scm3
-rw-r--r--guix/config-desktop.scm3
3 files changed, 12 insertions, 1 deletions
diff --git a/emacs/.emacs.d/.emacs-config.org b/emacs/.emacs.d/.emacs-config.org
index ee30acb..b462b94 100644
--- a/emacs/.emacs.d/.emacs-config.org
+++ b/emacs/.emacs.d/.emacs-config.org
@@ -569,6 +569,13 @@ Sudo-edit
#+BEGIN_SRC emacs-lisp :tangle nil
(add-hook 'sml-mode-hook 'sml-mode)
#+END_SRC
+** Java
+*** Eglot-java
+For better integration with eclipse.jdt.ls
+#+BEGIN_SRC emacs-lisp :tangle init.el
+ (unless (package-installed-p 'eglot-java)
+ (package-vc-install "https://github.com/yveszoundi/eglot-java" nil nil 'eglot-java))
+#+end_src
** PHP
*** PHP-Mode
diff --git a/guix/.dotfiles/home-configuration.scm b/guix/.dotfiles/home-configuration.scm
index ba68d27..4a50b30 100644
--- a/guix/.dotfiles/home-configuration.scm
+++ b/guix/.dotfiles/home-configuration.scm
@@ -32,12 +32,15 @@
"python"
"python-wrapper"
"php"
+ "openjdk"
+ "maven"
"sqls"
"go"
"ruby"
"gopls"
"delve"
"python-lsp-server"
+ "python-jedi" ;; Looks a bit deprecated
"ruby-solargraph"
"zig-zls"
"rust-analyzer"
diff --git a/guix/config-desktop.scm b/guix/config-desktop.scm
index 010490f..698df47 100644
--- a/guix/config-desktop.scm
+++ b/guix/config-desktop.scm
@@ -33,7 +33,7 @@
(comment "W96K")
(group "users")
(home-directory "/home/w96k")
- (supplementary-groups '("wheel" "netdev" "audio" "video" "kvm")))
+ (supplementary-groups '("wheel" "netdev" "audio" "video" "kvm" "httpd")))
%base-user-accounts))
;; (packages %base-packages)
@@ -110,6 +110,7 @@
</FilesMatch>"))))))
(service php-fpm-service-type
(php-fpm-configuration
+ (display-errors #t)
(socket "/var/run/php-fpm.sock")
(socket-group "httpd")))