Fix emacs

This commit is contained in:
Marco Thomas
2021-06-04 11:44:02 +02:00
parent 47563626d1
commit 0173e49daf
2 changed files with 63 additions and 3 deletions

View File

@@ -202,7 +202,7 @@
# corners. # corners.
# The radius will be automatically lowered if it exceeds half of the # The radius will be automatically lowered if it exceeds half of the
# notification height to avoid clipping text and/or icons. # notification height to avoid clipping text and/or icons.
corner_radius = 15 corner_radius = 0
### Legacy ### Legacy

View File

@@ -267,7 +267,67 @@
"gb" 'magit-branch)) "gb" 'magit-branch))
;; Treemacs ;; Treemacs
(use-package treey (use-package treemacs
:ensure t
:defer t
:config
(progn
(setq
treemacs-follow-after-init t
treemacs-persist-file (expand-file-name ".cache/treemacs-persist" user-emacs-directory)
treemacs-width 40)
(treemacs-follow-mode t))
:bind
(:map global-map
("C-x t t" . treemacs)))
;; C-c C-p -> projectile
;; C-c C-w -> workspace
(use-package treemacs-evil
:after (treemacs evil)
:ensure t)
(use-package treemacs-projectile
:after (treemacs projectile)
:ensure t)
;; Lsp
(use-package lsp-mode
:ensure t
:commands (lsp lsp-deferred)
:init
(setq lsp-keymap-prefix "C-l")
(setq gc-cons-threshold 100000000) ;; 100 mb
(setq read-process-output-max (* 1024 1024)) ;; 1mb
:config
(lsp-enable-which-key-integration t)
(setq lsp-rust-server 'rust-analyzer)
(setq lsp-auto-guess-root t)
(setq lsp-idle-delay 1.)
:hook
(rust-mode . lsp)
(java-mode . lsp)
(python-mode . lsp)
(haskell-mode . lsp))
;; ui integration for lsp
(use-package lsp-ui
:ensure t
:config
(setq lsp-ui-peek-enable nil)
(setq lsp-ui-sideline-show-code-actions nil)
(setq lsp-modeline-code-actions-enable nil)
(setq lsp-ui-doc-enable nil))
;; tags
(use-package lsp-ivy
:ensure t
:after lsp-mode
:bind(:map lsp-mode-map ("C-l g a" . lsp-ivy-workspace-symbol)))
;; completion for lsp
(use-package company
:ensure t :ensure t
:hook :hook
(lsp-mode . company-mode) (lsp-mode . company-mode)
@@ -276,7 +336,7 @@
(org-mode . company-mode) (org-mode . company-mode)
:custom :custom
(company-minimum-prefix-length 2) (company-minimum-prefix-length 2)
(company-idle-delay 0.4) (company-idle-delay 0.1)
:bind (:map company-active-map :bind (:map company-active-map
("C-j" . company-select-next-or-abort) ;; down ("C-j" . company-select-next-or-abort) ;; down
("C-k" . company-select-previous-or-abort) ;; up ("C-k" . company-select-previous-or-abort) ;; up