Compare commits

...

2 commits

Author SHA1 Message Date
Payas Relekar
e44e499863 doom: remove eglot-x and unused eglot config 2024-03-15 21:51:17 +05:30
Payas Relekar
3518f61949 flake.lock: 2024_03_15
• Updated input 'home-manager':
    'github:nix-community/home-manager/2f0db7d418e781354d8a3c50e611e3b1cd413087' (2024-03-13)
  → 'github:nix-community/home-manager/dc2f3812b41f825ed466c24c4211160d75cb890c' (2024-03-15)
• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/0ad13a6833440b8e238947e47bea7f11071dc2b2' (2024-03-12)
  → 'github:nixos/nixpkgs/d691274a972b3165335d261cc4671335f5c67de9' (2024-03-14)
2024-03-15 20:44:58 +05:30
2 changed files with 6 additions and 24 deletions

View file

@ -109,11 +109,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1710349883, "lastModified": 1710506163,
"narHash": "sha256-bjbdS2mC76xNJwt1d/uZa+JdHR8CCyYbF4Ey/NgOJus=", "narHash": "sha256-Xpl2LzbAIUHcTkAZ08UZM0USxVaQn194I8ma9c8wnAA=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "2f0db7d418e781354d8a3c50e611e3b1cd413087", "rev": "dc2f3812b41f825ed466c24c4211160d75cb890c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -156,11 +156,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1710272261, "lastModified": 1710451336,
"narHash": "sha256-g0bDwXFmTE7uGDOs9HcJsfLFhH7fOsASbAuOzDC+fhQ=", "narHash": "sha256-pP86Pcfu3BrAvRO7R64x7hs+GaQrjFes+mEPowCfkxY=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "0ad13a6833440b8e238947e47bea7f11071dc2b2", "rev": "d691274a972b3165335d261cc4671335f5c67de9",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -141,9 +141,6 @@ Tangle ~packages.el~ from within org-mode.
(package! eglot :type 'built-in :built-in 'prefer) (package! eglot :type 'built-in :built-in 'prefer)
(package! eglot-x
:recipe (:type git :host github :repo "nemethf/eglot-x"))
(package! org-modern) (package! org-modern)
(package! editorconfig) (package! editorconfig)
@ -873,21 +870,11 @@ mu4e + mbsync + msmtp:
#+begin_src emacs-lisp :lexical t #+begin_src emacs-lisp :lexical t
(use-package! eglot (use-package! eglot
:after (consult) :after (consult)
:commands (eglot-ensure)
:init
(add-hook! (java-mode java-ts-mode) :append :local #'eglot-ensure)
:config :config
(delete '(elixir-mode "language_server.sh") eglot-server-programs)
(add-to-list 'eglot-server-programs '(elixir-mode . ("elixir-ls")))
(delete '(nix-mode "rnix-lsp") eglot-server-programs) (delete '(nix-mode "rnix-lsp") eglot-server-programs)
(add-to-list 'eglot-server-programs '(nix-mode . ("nil"))) (add-to-list 'eglot-server-programs '(nix-mode . ("nil")))
(delete '((java-mode java-ts-mode) "jdtls") eglot-server-programs)
(add-to-list 'eglot-server-programs '((java-mode java-ts-mode) . ("jdt-language-server" "-config" "~/.cache/jdtls" "-data" ".jdtls-cache")))
(add-to-list 'eglot-server-programs '(gleam-ts-mode . ("gleam" "lsp"))) (add-to-list 'eglot-server-programs '(gleam-ts-mode . ("gleam" "lsp")))
(setq! xref-show-xrefs-function #'consult-xref (setq! xref-show-xrefs-function #'consult-xref
@ -901,11 +888,6 @@ mu4e + mbsync + msmtp:
:autoEvalInputs t :autoEvalInputs t
:nixpkgsInputName "nixpkgs")))))) :nixpkgsInputName "nixpkgs"))))))
(use-package! eglot-x
:after (eglot)
:commands (eglot-ensure eglot-x-setup)
:config
(eglot-x-setup))
#+end_src #+end_src
* Little things * Little things