This commit is contained in:
Michael Thomson 2025-10-01 13:42:03 -04:00
parent 4264eac5e3
commit e24b734831
3 changed files with 38 additions and 20 deletions

View File

@ -20,6 +20,7 @@ in
typescript-language-server typescript-language-server
typescript typescript
vscode-langservers-extracted vscode-langservers-extracted
tailwindcss-language-server
nodejs nodejs
nixd nixd

View File

@ -63,7 +63,7 @@
(use-package modus-themes (use-package modus-themes
:ensure t :ensure t
:config :config
(load-theme 'modus-vivendi t)) (load-theme 'modus-operandi t))
(use-package doom-modeline (use-package doom-modeline
:ensure t :ensure t
@ -119,8 +119,9 @@
(use-package orderless (use-package orderless
:ensure t :ensure t
:config :config
(setq completion-styles '(orderless basic)) (setq completion-styles '(orderless partial-completion basic))
(setq completion-category-overrides '((file (styles partial-completion)))) ;; (setq completion-category-overrides '((file (styles partial-completion))))
(setq completion-category-overrides nil)
(setq completion-category-defaults nil) (setq completion-category-defaults nil)
(setq completion-pcm-leading-wildcard t)) (setq completion-pcm-leading-wildcard t))
@ -221,8 +222,7 @@
:ensure t :ensure t
:defer t :defer t
:hook ((nix-ts-mode . eglot-ensure) :hook ((nix-ts-mode . eglot-ensure)
(go-ts-mode . eglot-ensure) (go-ts-mode . eglot-ensure)))
(typescript-ts-mode . eglot-ensure)))
(use-package eglot-booster (use-package eglot-booster
:ensure t :ensure t
@ -459,18 +459,35 @@
:config :config
(global-diff-hl-mode)) (global-diff-hl-mode))
;; LSP Mode
(use-package lsp-mode
:ensure t
:init
(setq lsp-keymap-prefix "C-c l")
(defun my/lsp-mode-setup-completion ()
(setf (alist-get 'styles (alist-get 'lsp-capf completion-category-defaults))
'(orderless)))
:hook ((typescript-ts-mode . lsp)
(tsx-ts-mode . lsp)
(js-ts-mode . lsp)
;; if you want which-key integration
(lsp-mode . lsp-enable-which-key-integration)
(lsp-completion-mode . my/lsp-mode-setup-completion))
:commands lsp
:config
(setq lsp-eslint-server-command '("vscode-eslint-language-server" "--stdio"))
(lsp-register-client
(make-lsp-client
:new-connection (lsp-stdio-connection '("tailwindcss-language-server" "--stdio"))
:activation-fn (lsp-activate-on "typescriptreact" "typescript" "css" "html")
:add-on? t
:notification-handlers (ht ("@/tailwindCSS/projectInitialized" #'ignore)
("@/tailwindCSS/projectsDestroyed" #'ignore)))))
(use-package lsp-ui
:ensure t
:commands lsp-ui-mode
:config
(setq lsp-ui-sideline-enable nil))
(provide 'init) (provide 'init)
(custom-set-variables
;; custom-set-variables was added by Custom.
;; If you edit it by hand, you could mess it up, so be careful.
;; Your init file should contain only one such instance.
;; If there is more than one, they won't work right.
'(custom-safe-themes
'("77f281064ea1c8b14938866e21c4e51e4168e05db98863bd7430f1352cab294a"
default)))
(custom-set-faces
;; custom-set-faces was added by Custom.
;; If you edit it by hand, you could mess it up, so be careful.
;; Your init file should contain only one such instance.
;; If there is more than one, they won't work right.
)

View File

@ -170,7 +170,7 @@ vim.keymap.set('n', "<leader><leader>s", function() Snacks.picker.buffers() end,
-- find -- find
vim.keymap.set('n', "<leader>ff", function() Snacks.picker.files() end, { desc = "Find Files" }) vim.keymap.set('n', "<leader>ff", function() Snacks.picker.files() end, { desc = "Find Files" })
-- Grep -- Grep
vim.keymap.set('n', "<leader>fg", function() Snacks.picker.grep() end, { desc = "Grep" }) vim.keymap.set('n', "<leader>fg", function() Snacks.picker.grep({ hidden = true }) end, { desc = "Grep" })
-- search -- search
vim.keymap.set('n', "<leader>fd", function() Snacks.picker.diagnostics() end, { desc = "Diagnostics" }) vim.keymap.set('n', "<leader>fd", function() Snacks.picker.diagnostics() end, { desc = "Diagnostics" })
vim.keymap.set('n', "<leader>fh", function() Snacks.picker.help() end, { desc = "Help Pages" }) vim.keymap.set('n', "<leader>fh", function() Snacks.picker.help() end, { desc = "Help Pages" })