From 4ed8e55d30e3cb99095d62a1ee0ad84894ccfa1b Mon Sep 17 00:00:00 2001 From: Stefan Schwarz Date: Mon, 5 Oct 2020 10:37:20 +0200 Subject: [PATCH] work --- init.el | 34 +++++++++++----------------------- 1 file changed, 11 insertions(+), 23 deletions(-) diff --git a/init.el b/init.el index 9459971..d822901 100644 --- a/init.el +++ b/init.el @@ -19,7 +19,8 @@ (setq coding-system-for-write 'utf-8 ) (setq sentence-end-double-space nil) ; sentence SHOULD end with only a point. (setq initial-scratch-message "Welcome in Emacs") ; print a default message in the empty scratch buffer opened at startup -(setq focus-follows-mouse nil) ; stop popups from getting focus +(setq focus-follows-mouse nil) ; stop popups from getting focus +(setq mouse-autoselect-window nil) ; stop popups from getting focus ;; global keybindings (global-set-key (kbd "C-k") 'previous-line) @@ -184,10 +185,10 @@ (define-key company-search-map (kbd "C-k") 'company-select-previous) (setq company-idle-delay 0.1 company-minimum-prefix-length 2 - company-require-match nil - company-dabbrev-ignore-case nil - company-dabbrev-downcase nil) - ) + company-require-match nil)) + +(use-package company-box + :hook (company-mode . company-box-mode)) (use-package highlight-indentation :ensure t) ;; lsp @@ -250,35 +251,20 @@ lsp-before-save-edits t lsp-enable-snippet t ) - (defvar lsp-vetur-validation-template nil) ) (use-package flycheck :ensure t :init (global-flycheck-mode)) (use-package lsp-ui :ensure t - :commands lsp-ui-mode - :config - (add-to-list 'lsp-ui-doc-frame-parameters '(no-accept-focus . t)) - (setq lsp-ui-doc-position 'at-point - lsp-ui-doc-use-childframe t)) + :commands lsp-ui-mode) (use-package company-lsp :ensure t :commands company-lsp) +(use-package lsp-ivy :ensure t) (use-package yasnippet :ensure t :config (yas-global-mode 1)) (use-package yasnippet-snippets :ensure t) (use-package smartparens :ensure t :config (smartparens-global-mode 1)) -;; treemacs -(use-package treemacs :ensure t) -(use-package lsp-treemacs :ensure t - :commands lsp-treemacs-errors-list) -(use-package treemacs-evil :ensure t - :after treemacs evil) -(use-package treemacs-evil :ensure t - :after treemacs evil) -(use-package treemacs-evil :ensure t - :after treemacs evil) - ;; magit (use-package evil-magit :ensure t) (use-package magit :ensure t) @@ -343,6 +329,8 @@ "mj" 'imenu "me" 'lsp-ui-flycheck-list "mn" 'flycheck-next-error + "ms" 'lsp-ivy-workspace-symbol + "mS" 'lsp-ivy-global-workspace-symbol ;; Projectile "p" '(:ignore t :which-key "Projectile") @@ -524,7 +512,7 @@ initialized with the current directory instead of filename." '(custom-safe-themes '("71e5acf6053215f553036482f3340a5445aee364fb2e292c70d9175fb0cc8af7" "99ea831ca79a916f1bd789de366b639d09811501e8c092c85b2cb7d697777f93" "e074be1c799b509f52870ee596a5977b519f6d269455b84ed998666cf6fc802a" "ca849ae0c889eb918785cdc75452b1e11a00848a5128a95a23872e0119ccc8f4" "1ca1f43ca32d30b05980e01fa60c107b02240226ac486f41f9b790899f6f6e67" "55257ccc6763185dde2146bcc5aa2b83130cc55042c45daaf5efe3c3137b578f" "5091eadbb87fa0a168a65f2c3e579d1a648d764f12ab9d3ab7bdefca709cd2a5" "5a411e7cb2d7955b28c514cd5b75782c6dd4ba027089fec17a2573405b0fdd5c" "aed6332e9a38b49bb044b994e8be0d57a2f67ff6ca96f5ce8e0130562c4cc233" "2d1fe7c9007a5b76cea4395b0fc664d0c1cfd34bb4f1860300347cdad67fb2f9" "7dc3fe8fadb914563790a3fbe587fd455626442f66da333ea4de2c455feefb98" "37ba833442e0c5155a46df21446cadbe623440ccb6bbd61382eb869a2b9e9bf9" "09cadcc2784baa744c6a7c5ebf2a30df59c275414768b0719b800cabd8d1b842" "427fa665823299f8258d8e27c80a1481edbb8f5463a6fb2665261e9076626710" "614e5089876ea69b515c50b6d7fa0a37eb7ed50fda224623ec49e1c91a0af6a1" "93a0885d5f46d2aeac12bf6be1754faa7d5e28b27926b8aa812840fe7d0b7983" "b0fd04a1b4b614840073a82a53e88fe2abc3d731462d6fde4e541807825af342" "cdb3e7a8864cede434b168c9a060bf853eeb5b3f9f758310d2a2e23be41a24ae" "ef4edbfc3ec509612f3cf82476beddd2aeb3da7bdc3a35726337a0cc838a4ef4" "a16e816774b437acb78beb9916a60ea236cfcd05784227a7d829623f8468c5a2" "8c847a5675ece40017de93045a28ebd9ede7b843469c5dec78988717f943952a" "e3c87e869f94af65d358aa279945a3daf46f8185f1a5756ca1c90759024593dd" "db10381a554231a40b7474eaac28bd58f05067faacce3b25d294bb179a3511a1" "34c99997eaa73d64b1aaa95caca9f0d64229871c200c5254526d0062f8074693" "868abc288f3afe212a70d24de2e156180e97c67ca2e86ba0f2bf9a18c9672f07" default)) '(package-selected-packages - '(bazel-mode rainbow-mode highlight-indentation k8s-mode darkokai-theme monokai-pro-theme php-mode puppet-mode smartparens yaml-mode ivy-hydra ivy-rich evy use-package general evil avy)) + '(lsp-ivy bazel-mode rainbow-mode highlight-indentation k8s-mode darkokai-theme monokai-pro-theme php-mode puppet-mode smartparens yaml-mode ivy-hydra ivy-rich evy use-package general evil avy)) '(require-final-newline t)) (custom-set-faces ;; custom-set-faces was added by Custom.