This commit is contained in:
parent
42ccce60bd
commit
d15b0776b0
5 changed files with 176 additions and 172 deletions
318
elpaca.lock
318
elpaca.lock
File diff suppressed because it is too large
Load diff
|
|
@ -97,7 +97,7 @@
|
||||||
|
|
||||||
;; Allow to execute path from shell
|
;; Allow to execute path from shell
|
||||||
(use-package exec-path-from-shell
|
(use-package exec-path-from-shell
|
||||||
:if (memq window-system '(x mac ns))
|
;; :if (memq window-system '(x mac ns))
|
||||||
:ensure t
|
:ensure t
|
||||||
:config
|
:config
|
||||||
(declare-function exec-path-from-shell-initialize "exec-path-from-shell")
|
(declare-function exec-path-from-shell-initialize "exec-path-from-shell")
|
||||||
|
|
@ -106,10 +106,9 @@
|
||||||
(add-to-list 'exec-path-from-shell-variables var))
|
(add-to-list 'exec-path-from-shell-variables var))
|
||||||
(exec-path-from-shell-initialize))
|
(exec-path-from-shell-initialize))
|
||||||
|
|
||||||
(use-package direnv :ensure t
|
;; (use-package envrc :ensure t :hook (elpaca-after-init . envrc-global-mode))
|
||||||
:config
|
|
||||||
(declare-function direnv-mode "direnv")
|
(use-package direnv :ensure t :config (direnv-mode t))
|
||||||
(direnv-mode t))
|
|
||||||
|
|
||||||
;; Draw underline lower
|
;; Draw underline lower
|
||||||
(setopt x-underline-at-descent-line t)
|
(setopt x-underline-at-descent-line t)
|
||||||
|
|
|
||||||
|
|
@ -18,7 +18,7 @@
|
||||||
;; (setopt max-lisp-eval-depth 10000)
|
;; (setopt max-lisp-eval-depth 10000)
|
||||||
|
|
||||||
;;; Use elpaca for package management.
|
;;; Use elpaca for package management.
|
||||||
(defvar elpaca-installer-version 0.7)
|
(defvar elpaca-installer-version 0.8)
|
||||||
(defvar elpaca-directory (expand-file-name "elpaca/" user-emacs-directory))
|
(defvar elpaca-directory (expand-file-name "elpaca/" user-emacs-directory))
|
||||||
(defvar elpaca-builds-directory (expand-file-name "builds/" elpaca-directory))
|
(defvar elpaca-builds-directory (expand-file-name "builds/" elpaca-directory))
|
||||||
(defvar elpaca-repos-directory (expand-file-name "repos/" elpaca-directory))
|
(defvar elpaca-repos-directory (expand-file-name "repos/" elpaca-directory))
|
||||||
|
|
|
||||||
|
|
@ -2,6 +2,7 @@
|
||||||
;;; Commentary:
|
;;; Commentary:
|
||||||
;;; Global Language Server Protocol Config
|
;;; Global Language Server Protocol Config
|
||||||
;;; Code:
|
;;; Code:
|
||||||
|
(require 'icejam-blocking)
|
||||||
|
|
||||||
;; (use-package lsp-mode :ensure (:depth 5) :requires (company))
|
;; (use-package lsp-mode :ensure (:depth 5) :requires (company))
|
||||||
(with-eval-after-load 'lsp-mode
|
(with-eval-after-load 'lsp-mode
|
||||||
|
|
@ -21,8 +22,11 @@
|
||||||
|
|
||||||
;; When needed, enable this hot garbage in dir-locals.el
|
;; When needed, enable this hot garbage in dir-locals.el
|
||||||
lsp-disabled-clients '(vue-semantic-server
|
lsp-disabled-clients '(vue-semantic-server
|
||||||
|
vls
|
||||||
;; Ruby LSP servers, none of which actually work.
|
;; Ruby LSP servers, none of which actually work.
|
||||||
ruby-ls rubocop-ls typeprof-ls)
|
ruby-ls
|
||||||
|
rubocop-ls
|
||||||
|
typeprof-ls)
|
||||||
lsp-log-io nil
|
lsp-log-io nil
|
||||||
lsp-enable-file-watchers nil)
|
lsp-enable-file-watchers nil)
|
||||||
(unbind-key "s-l =" lsp-mode-map)
|
(unbind-key "s-l =" lsp-mode-map)
|
||||||
|
|
@ -64,11 +68,11 @@
|
||||||
|
|
||||||
(use-package lsp-ui :ensure t :after (lsp-mode))
|
(use-package lsp-ui :ensure t :after (lsp-mode))
|
||||||
(with-eval-after-load 'lsp-ui
|
(with-eval-after-load 'lsp-ui
|
||||||
(setq lsp-ui-doc-enable t
|
(setopt lsp-ui-doc-enable t
|
||||||
lsp-ui-header t
|
lsp-ui-header t
|
||||||
lsp-ui-delay 0.5 ;; Wait half a second to display documentation
|
lsp-ui-delay 0.5 ;; Wait half a second to display documentation
|
||||||
lsp-ui-doc-position 'at-point
|
lsp-ui-doc-position 'at-point
|
||||||
lsp-ui-doc-include-signature t))
|
lsp-ui-doc-include-signature t))
|
||||||
|
|
||||||
;; Lsp debugger mode
|
;; Lsp debugger mode
|
||||||
(use-package dap-mode :ensure t :after (lsp-mode lsp-ui))
|
(use-package dap-mode :ensure t :after (lsp-mode lsp-ui))
|
||||||
|
|
|
||||||
|
|
@ -22,7 +22,7 @@
|
||||||
("g" "Grep in project" consult-ripgrep)]
|
("g" "Grep in project" consult-ripgrep)]
|
||||||
["Completions"
|
["Completions"
|
||||||
("a" "Grep in buffer" consult-line)
|
("a" "Grep in buffer" consult-line)
|
||||||
("b" "Buffer list" consult-buffer)
|
("b" "Find Buffer" consult-buffer)
|
||||||
("t" "Find file" find-file)]
|
("t" "Find file" find-file)]
|
||||||
["Magit"
|
["Magit"
|
||||||
("m" "Git status" magit-status)
|
("m" "Git status" magit-status)
|
||||||
|
|
@ -31,6 +31,7 @@
|
||||||
[""
|
[""
|
||||||
["LISP"
|
["LISP"
|
||||||
("i" "IELM" ielm)
|
("i" "IELM" ielm)
|
||||||
|
("B" "iBuffer" ibuffer)
|
||||||
("e" "eval-region" eval-region)]
|
("e" "eval-region" eval-region)]
|
||||||
["Other"
|
["Other"
|
||||||
("d" "deft" deft)
|
("d" "deft" deft)
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue