From 35f00faafb99ce605658b976233a79205b79bd85 Mon Sep 17 00:00:00 2001 From: Stefan Schwarz Date: Wed, 1 Apr 2020 20:58:58 +0200 Subject: [PATCH 01/14] updates --- init.el | 36 ++++++++++++++++++++++++++---------- 1 file changed, 26 insertions(+), 10 deletions(-) diff --git a/init.el b/init.el index cb6d0c1..c9563c2 100644 --- a/init.el +++ b/init.el @@ -47,8 +47,8 @@ (use-package doom-modeline :ensure t :hook (after-init . doom-modeline-mode)) (set-face-attribute 'default nil - :family "Meslo LG S DZ" - :height 105 + :family "Fira Code" + :height 125 :weight 'normal :width 'normal) @@ -73,7 +73,7 @@ (setq enable-recursive-minibuffers t) (setq ivy-re-builders-alist '((swiper . ivy--regex-plus) - (t . ivy--regex-fuzzy))) + (t . ivy--regex-plus))) ;; better movement (define-key ivy-minibuffer-map (kbd "C-j") 'ivy-next-line) (define-key ivy-minibuffer-map (kbd "C-k") 'ivy-previous-line) @@ -84,7 +84,7 @@ (ivy-mode 1) (use-package ivy-xref :ensure t :init (if (< emacs-major-version 27) - (setq xref-show-xrefs-function #'ivy-xref-show-xrefs) + (setq xref-show-xrefs-function #'ivy-xref-show-xrefs) (setq xref-show-definitions-function #'ivy-xref-show-defs))) (use-package ivy-rich :ensure t :config (ivy-rich-mode 1)) @@ -109,6 +109,8 @@ ) ;; langs +(use-package rust-mode :ensure t + :config (add-to-list 'auto-mode-alist '("\\.rs\\'" . rust-mode))) (use-package go-mode :ensure t :config (add-to-list 'auto-mode-alist '("\\.go\\'" . go-mode))) (use-package yaml-mode :ensure t @@ -118,9 +120,22 @@ ) (use-package dockerfile-mode :ensure t :config (add-to-list 'auto-mode-alist '("Dockerfile\\'" . dockerfile-mode))) +(use-package evil-org + :ensure t + :after org + :config + (add-hook 'org-mode-hook 'evil-org-mode) + (add-hook 'evil-org-mode-hook + (lambda () + (evil-org-set-key-theme))) + (require 'evil-org-agenda) + (evil-org-agenda-set-keys)) ;; code-with-fun -(use-package company +(use-package rainbow-mode :ensure t) +(use-package hl-todo :ensure t) + +(use-package company :ensure t :config (global-company-mode 1) (define-key company-active-map (kbd "C-n") 'company-select-next) @@ -132,7 +147,7 @@ company-require-match nil company-dabbrev-ignore-case nil company-dabbrev-downcase nil) - ) + ) (use-package lsp-mode :ensure t :commands (lsp lsp-deferred) :hook @@ -141,6 +156,7 @@ (python-mode . lsp-deferred) (javascript-mode . lsp-deferred) (js-mode . lsp-deferred) + (rust-mode . lsp-deferred) :config (setq lsp-auto-configure t lsp-prefer-flymake nil @@ -210,7 +226,7 @@ "fr" 'counsel-recentf "fR" 'rename-current-buffer-file "fD" 'delete-current-buffer-file - "fc" 'copy-file' + "fc" 'foo-copy-file' ;; Git "g" '(:ignore t :which-key "Magit") @@ -391,7 +407,7 @@ initialized with the current directory instead of filename." ;; ?\a = C-g, ?\e = Esc and C-[ ((memq key '(?\a ?\e)) (keyboard-quit)))))))) -(defun copy-file () +(defun foo-copy-file () "Write the file under new name." (interactive) (call-interactively 'write-file)) @@ -405,10 +421,10 @@ initialized with the current directory instead of filename." ;; If there is more than one, they won't work right. '(custom-safe-themes (quote - ("427fa665823299f8258d8e27c80a1481edbb8f5463a6fb2665261e9076626710" "614e5089876ea69b515c50b6d7fa0a37eb7ed50fda224623ec49e1c91a0af6a1" "93a0885d5f46d2aeac12bf6be1754faa7d5e28b27926b8aa812840fe7d0b7983" "b0fd04a1b4b614840073a82a53e88fe2abc3d731462d6fde4e541807825af342" "cdb3e7a8864cede434b168c9a060bf853eeb5b3f9f758310d2a2e23be41a24ae" "ef4edbfc3ec509612f3cf82476beddd2aeb3da7bdc3a35726337a0cc838a4ef4" "a16e816774b437acb78beb9916a60ea236cfcd05784227a7d829623f8468c5a2" "8c847a5675ece40017de93045a28ebd9ede7b843469c5dec78988717f943952a" "e3c87e869f94af65d358aa279945a3daf46f8185f1a5756ca1c90759024593dd" "db10381a554231a40b7474eaac28bd58f05067faacce3b25d294bb179a3511a1" "34c99997eaa73d64b1aaa95caca9f0d64229871c200c5254526d0062f8074693" "868abc288f3afe212a70d24de2e156180e97c67ca2e86ba0f2bf9a18c9672f07" default))) + ("ab9456aaeab81ba46a815c00930345ada223e1e7c7ab839659b382b52437b9ea" "f8c30fa07ba7e8fe884f22b428dae6724955fa61ad84a658c3b0164ae391fb52" "e838d6375a73fda607820c65eb3ea1f9336be7bd9a5528c9161e10c4aa663b5b" "4ea0aa360264ff861fb0212abe4161b83ad1d8c8b74d8a04bcd1baf0ebdceeae" "427fa665823299f8258d8e27c80a1481edbb8f5463a6fb2665261e9076626710" "614e5089876ea69b515c50b6d7fa0a37eb7ed50fda224623ec49e1c91a0af6a1" "93a0885d5f46d2aeac12bf6be1754faa7d5e28b27926b8aa812840fe7d0b7983" "b0fd04a1b4b614840073a82a53e88fe2abc3d731462d6fde4e541807825af342" "cdb3e7a8864cede434b168c9a060bf853eeb5b3f9f758310d2a2e23be41a24ae" "ef4edbfc3ec509612f3cf82476beddd2aeb3da7bdc3a35726337a0cc838a4ef4" "a16e816774b437acb78beb9916a60ea236cfcd05784227a7d829623f8468c5a2" "8c847a5675ece40017de93045a28ebd9ede7b843469c5dec78988717f943952a" "e3c87e869f94af65d358aa279945a3daf46f8185f1a5756ca1c90759024593dd" "db10381a554231a40b7474eaac28bd58f05067faacce3b25d294bb179a3511a1" "34c99997eaa73d64b1aaa95caca9f0d64229871c200c5254526d0062f8074693" "868abc288f3afe212a70d24de2e156180e97c67ca2e86ba0f2bf9a18c9672f07" default))) '(package-selected-packages (quote - (smartparens yaml-mode ivy-hydra ivy-rich evy use-package general evil avy)))) + (rainbow-mode smartparens yaml-mode ivy-hydra ivy-rich evy use-package general evil avy)))) (custom-set-faces ;; custom-set-faces was added by Custom. ;; If you edit it by hand, you could mess it up, so be careful. From 8deee81a99d1f4e72d27eecdb59448c50f28a570 Mon Sep 17 00:00:00 2001 From: Stefan Schwarz Date: Wed, 20 May 2020 21:50:46 +0200 Subject: [PATCH 02/14] get it working --- init.el | 50 ++++++++------------------------------------------ 1 file changed, 8 insertions(+), 42 deletions(-) diff --git a/init.el b/init.el index 91832e3..29884c2 100644 --- a/init.el +++ b/init.el @@ -19,7 +19,7 @@ (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) +(setq focus-follows-mouse nil) ; stop popups from getting focus ;; global keybindings (global-set-key (kbd "C-k") 'previous-line) @@ -60,10 +60,7 @@ :ensure t :config (global-evil-surround-mode 1) - (evil-define-key 'visual evil-surround-mode-map "s" 'evil-surround-region) - ) -(use-package evil-matchit :ensure t - :config (global-evil-matchit-mode 1)) + (evil-define-key 'visual evil-surround-mode-map "s" 'evil-surround-region)) ;; ivy config (use-package ivy :ensure t @@ -114,33 +111,12 @@ ;; js (use-package js2-mode :ensure t :config (add-to-list 'auto-mode-alist '("\\.js\\'" . js2-mode))) -;; puppet -(use-package puppet-mode :ensure t - :config - (add-to-list 'auto-mode-alist '("\\.pp\\'" . puppet-mode)) - (general-define-key - :states '(normal visual insert emacs) - :keymaps 'puppet-mode-map - :prefix "SPC" - :non-normal-prefix "C-SPC" - "ma" 'puppet-align-block - ) - ) -;; php -(use-package php-mode :ensure t) -;; k8s -(use-package k8s-mode :ensure t) -;; hcl -(use-package hcl-mode :ensure t) ;; rust (use-package rust-mode :ensure t :config (setq rust-format-on-save t) (add-hook 'rust-mode-hook - (lambda () (setq indent-tabs-mode nil))) - ) -(add-hook 'rust-mode-hook - (lambda () (setq indent-tabs-mode nil))) + (lambda () (setq indent-tabs-mode nil)))) ;; golang (use-package go-mode :ensure t :config @@ -165,18 +141,12 @@ (evil-org-set-key-theme))) (require 'evil-org-agenda) (evil-org-agenda-set-keys)) +;; bazel / starlak +(use-package bazel-mode :ensure t) ;; code-with-fun (use-package rainbow-mode :ensure t) (use-package hl-todo :ensure t) - -(use-package company :ensure t - -;; bazel / starlak -(use-package bazel-mode :ensure t) - - -;; code-with-fun (use-package whitespace :config (setq whitespace-style '(face empty tabs lines-tail trailing)) @@ -194,7 +164,6 @@ company-dabbrev-ignore-case nil company-dabbrev-downcase nil) ) -(use-package highlight-indentation :ensure t) ;; lsp (use-package lsp-mode :ensure t @@ -242,8 +211,8 @@ lsp-before-save-edits t lsp-enable-snippet t ) - (defvar lsp-vetur-validation-template nil) - ) + (defvar lsp-vetur-validation-template nil)) + (use-package flycheck :ensure t :init (global-flycheck-mode)) (use-package lsp-ui :ensure t @@ -390,10 +359,7 @@ "wv" 'split-window-right "wV" 'split-window-right-and-focus "ww" 'other-window - "wx" 'kill-buffer-and-window - - - )) + "wx" 'kill-buffer-and-window)) ;; custom functions From 438dd2fa8327353527b7456cfb62239a35591ab2 Mon Sep 17 00:00:00 2001 From: Stefan Schwarz Date: Fri, 22 May 2020 17:05:10 +0200 Subject: [PATCH 03/14] fix ivy --- init.el | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/init.el b/init.el index 29884c2..3fee3ee 100644 --- a/init.el +++ b/init.el @@ -65,6 +65,7 @@ ;; ivy config (use-package ivy :ensure t :config + (ivy-mode) (setq ivy-height 10) (setq ivy-use-virtual-buffers t) (setq enable-recursive-minibuffers t) @@ -96,7 +97,7 @@ ;; which key (use-package which-key :ensure t :config - (which-key-mode 1) + (which-key-mode) (which-key-setup-side-window-bottom) (which-key-setup-minibuffer) (setq which-key-idle-delay .3) From a5a89a65d171ced1333f83eeb871b4b36f8f1ca1 Mon Sep 17 00:00:00 2001 From: Stefan Schwarz Date: Fri, 22 May 2020 17:05:31 +0200 Subject: [PATCH 04/14] a new theme --- init.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/init.el b/init.el index 3fee3ee..b3a6c6b 100644 --- a/init.el +++ b/init.el @@ -43,7 +43,7 @@ (use-package doom-themes :ensure t) (use-package monokai-theme :ensure t :config - (load-theme 'doom-laserwave t)) + (load-theme 'doom-monokai-pro t)) (use-package all-the-icons :ensure t) (use-package doom-modeline :ensure t :hook (after-init . doom-modeline-mode)) From 268c853783b9b9985a24036cfefdb006ce6b8b6d Mon Sep 17 00:00:00 2001 From: Stefan Schwarz Date: Fri, 22 May 2020 17:05:47 +0200 Subject: [PATCH 05/14] fix js --- init.el | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/init.el b/init.el index b3a6c6b..69caab0 100644 --- a/init.el +++ b/init.el @@ -111,7 +111,12 @@ (add-to-list 'auto-mode-alist '("\\.vue\\'" . vue-mode))) ;; js (use-package js2-mode :ensure t - :config (add-to-list 'auto-mode-alist '("\\.js\\'" . js2-mode))) + :config (add-to-list 'auto-mode-alist '("\\.js\\'" . js2-mode)) + (add-hook 'js2-mode-hook 'lsp-deferred) + (add-hook 'js2-mode-hook 'prettier-js-mode) + (setq tab-width 2) + (setq js2-basic-offset 2)) +(use-package prettier-js :ensure t) ;; rust (use-package rust-mode :ensure t :config From 294be272ac6ad8d9e0416359bcf2045ee1b4a4c7 Mon Sep 17 00:00:00 2001 From: Stefan Schwarz Date: Fri, 22 May 2020 17:06:23 +0200 Subject: [PATCH 06/14] nicer completions --- init.el | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/init.el b/init.el index 69caab0..9857eea 100644 --- a/init.el +++ b/init.el @@ -164,11 +164,13 @@ (define-key company-active-map (kbd "C-p") 'company-select-previous) (define-key company-active-map (kbd "C-j") 'company-select-next) (define-key company-active-map (kbd "C-k") 'company-select-previous) - (setq company-idle-delay 0.2 + (define-key company-search-map (kbd "C-n") 'company-select-next) + (define-key company-search-map (kbd "C-p") 'company-select-previous) + (define-key company-search-map (kbd "C-j") 'company-select-next) + (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) ) ;; lsp From 0821e9888888f6e49979ad563c6c4d944034e228 Mon Sep 17 00:00:00 2001 From: Stefan Schwarz Date: Fri, 22 May 2020 17:06:36 +0200 Subject: [PATCH 07/14] docs --- init.el | 1 + 1 file changed, 1 insertion(+) diff --git a/init.el b/init.el index 9857eea..080af4b 100644 --- a/init.el +++ b/init.el @@ -137,6 +137,7 @@ ;; dockerfile (use-package dockerfile-mode :ensure t :config (add-to-list 'auto-mode-alist '("Dockerfile\\'" . dockerfile-mode))) +;; orgmode (use-package evil-org :ensure t :after org From 041bc9747221fc69ebba5dfe65f0c1c9a4c8b26b Mon Sep 17 00:00:00 2001 From: Stefan Schwarz Date: Fri, 22 May 2020 17:06:48 +0200 Subject: [PATCH 08/14] throw away some manual clients --- init.el | 27 +-------------------------- 1 file changed, 1 insertion(+), 26 deletions(-) diff --git a/init.el b/init.el index 080af4b..a2bb079 100644 --- a/init.el +++ b/init.el @@ -189,38 +189,13 @@ (rust-mode . lsp-deferred) (vue-mode . lsp-deferred) :config - (lsp-register-client - (make-lsp-client :new-connection (lsp-stdio-connection '("/usr/bin/terraform-lsp" "-enable-log-file")) - :major-modes '(hcl-mode) - :server-id 'terraform-ls)) - (lsp-register-client - (make-lsp-client - :new-connection - (lsp-stdio-connection '("bundle" - "exec" - "--keep-file-descriptors" - "/home/stefan/Apps/puppet-editor-services/puppet-languageserver" - "--debug=/tmp/puplsp" - "--stdio")) - :major-modes '(puppet-mode) - :server-id 'puppet-languageserver)) - (add-to-list 'lsp-language-id-configuration '(puppet-mode . "puppet-languageserver")) - (lsp-register-client - (make-lsp-client - :new-connection - (lsp-stdio-connection '("/home/stefan/Apps/yaml-language-server/bin/yaml-language-server" - "--stdio")) - :major-modes '(yaml-mode) - :server-id 'yaml-languageserver)) - (add-to-list 'lsp-language-id-configuration '(yaml-mode . "yaml-languageserver")) (setq lsp-auto-configure t lsp-auto-guess-root t lsp-enable-indentation t lsp-enable-on-type-formatting t lsp-before-save-edits t lsp-enable-snippet t - ) - (defvar lsp-vetur-validation-template nil)) + )) (use-package flycheck :ensure t :init (global-flycheck-mode)) From e4377fe6bab245548034eb4d2ecd96b6e4c2cde8 Mon Sep 17 00:00:00 2001 From: Stefan Schwarz Date: Fri, 22 May 2020 17:07:05 +0200 Subject: [PATCH 09/14] clear duplicates --- init.el | 4 ---- 1 file changed, 4 deletions(-) diff --git a/init.el b/init.el index a2bb079..b06c5d5 100644 --- a/init.el +++ b/init.el @@ -219,10 +219,6 @@ :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) From aa2ccfe7084526fc30c19018259515840e8f5430 Mon Sep 17 00:00:00 2001 From: Stefan Schwarz Date: Fri, 22 May 2020 17:07:21 +0200 Subject: [PATCH 10/14] use consel --- init.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/init.el b/init.el index b06c5d5..8b6e088 100644 --- a/init.el +++ b/init.el @@ -249,14 +249,14 @@ ;; Buffers "b" '(:ignore t :which-key "Buffers") - "bb" 'switch-to-buffer + "bb" 'counsel-switch-buffer "bd" 'evil-delete-buffer "bn" 'next-buffer "bn" 'next-buffer "bs" 'foo/switch-to-scratch-buffer ;; Files - "ff" 'counsel-find-file + "ff" 'counsel-find-file "fL" 'counsel-locate "fr" 'counsel-recentf "fR" 'foo/rename-current-buffer-file From ebbf5f6d81c578fa3cff12dd80a14b1f5f6b31f5 Mon Sep 17 00:00:00 2001 From: Stefan Schwarz Date: Fri, 22 May 2020 17:07:32 +0200 Subject: [PATCH 11/14] fix indent --- init.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/init.el b/init.el index 8b6e088..dd893cf 100644 --- a/init.el +++ b/init.el @@ -283,7 +283,7 @@ "mh" 'lsp-describe-thing-at-point "mj" 'imenu "me" 'lsp-ui-flycheck-list - "mn" 'flycheck-next-error + "mn" 'flycheck-next-error ;; Projectile "p" '(:ignore t :which-key "Projectile") From 0b14fdc39c61a54a7a6c8c934f2ff0ffacc180fb Mon Sep 17 00:00:00 2001 From: Stefan Schwarz Date: Thu, 13 Aug 2020 21:48:40 +0200 Subject: [PATCH 12/14] up --- init.el | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/init.el b/init.el index dd893cf..ec7a2ff 100644 --- a/init.el +++ b/init.el @@ -199,12 +199,6 @@ (use-package flycheck :ensure t :init (global-flycheck-mode)) -(use-package lsp-ui :ensure t - :commands lsp-ui-mode - :config - (setq lsp-ui-doc-position 'at-point - lsp-ui-doc-use-childframe t) - ) (use-package company-lsp :ensure t :commands company-lsp) (use-package yasnippet :ensure t @@ -461,7 +455,7 @@ initialized with the current directory instead of filename." ;; If there is more than one, they won't work right. '(custom-safe-themes (quote - ("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))) + ("a92e9da0fab90cbec4af4a2035602208cebf3d071ea547157b2bfc5d9bd4d48d" "82360e5f96244ce8cc6e765eeebe7788c2c5f3aeb96c1a765629c5c7937c0b5b" "d74c5485d42ca4b7f3092e50db687600d0e16006d8fa335c69cf4f379dbd0eee" "f9aede508e587fe21bcfc0a85e1ec7d27312d9587e686a6f5afdbb0d220eab50" "3c7eef027f94956ea194aafa537c78098ab4cd907a2bb11b0e6c5f42e8a95750" "1526aeed166165811eefd9a6f9176061ec3d121ba39500af2048073bea80911e" "d71aabbbd692b54b6263bfe016607f93553ea214bc1435d17de98894a5c3a086" "76bfa9318742342233d8b0b42e824130b3a50dcc732866ff8e47366aed69de11" "f2b56244ecc6f4b952b2bcb1d7e517f1f4272876a8c873b378f5cf68e904bd59" "6177ecbffb8f37756012c9ee9fd73fc043520836d254397566e37c6204118852" "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 (quote (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))) @@ -471,7 +465,7 @@ initialized with the current directory instead of filename." ;; 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. - '(lsp-clients-php-server-command (quote ("php /home/stefan/Apps/php-language-server/vendor/bin/psalm-language-server")))) + ) (provide 'init) ;;; init.el ends here From 77817d8e0f31580c9648b2122042e72d1d05c0bf Mon Sep 17 00:00:00 2001 From: foosinn Date: Sat, 29 Aug 2020 19:58:32 +0200 Subject: [PATCH 13/14] cleanup --- init.el | 1 - 1 file changed, 1 deletion(-) diff --git a/init.el b/init.el index ec7a2ff..0ba6857 100644 --- a/init.el +++ b/init.el @@ -65,7 +65,6 @@ ;; ivy config (use-package ivy :ensure t :config - (ivy-mode) (setq ivy-height 10) (setq ivy-use-virtual-buffers t) (setq enable-recursive-minibuffers t) From e917168e1b2631ca85a859f74a12f54089b6ecf7 Mon Sep 17 00:00:00 2001 From: foosinn Date: Sat, 29 Aug 2020 19:58:54 +0200 Subject: [PATCH 14/14] finally fix buffer switcher --- init.el | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/init.el b/init.el index 0ba6857..b1bd665 100644 --- a/init.el +++ b/init.el @@ -77,7 +77,14 @@ (define-key ivy-minibuffer-map (kbd "C-h") (kbd "DEL")) (define-key ivy-minibuffer-map (kbd "C-S-h") help-map) (define-key ivy-minibuffer-map (kbd "C-l") 'ivy-alt-done) - (define-key ivy-minibuffer-map (kbd "") 'minibuffer-keyboard-quit)) + (define-key ivy-minibuffer-map (kbd "") 'minibuffer-keyboard-quit) + + (define-key ivy-switch-buffer-map (kbd "C-j") 'ivy-next-line) + (define-key ivy-switch-buffer-map (kbd "C-k") 'ivy-previous-line) + (define-key ivy-switch-buffer-map (kbd "C-h") (kbd "DEL")) + (define-key ivy-switch-buffer-map (kbd "C-S-h") help-map) + (define-key ivy-switch-buffer-map (kbd "C-l") 'ivy-alt-done) + (define-key ivy-switch-buffer-map (kbd "") 'minibuffer-keyboard-quit)) (use-package ivy-xref :ensure t :init (setq xref-show-xrefs-function #'ivy-xref-show-xrefs)) (use-package ivy-rich :ensure t