From 35f00faafb99ce605658b976233a79205b79bd85 Mon Sep 17 00:00:00 2001 From: Stefan Schwarz Date: Wed, 1 Apr 2020 20:58:58 +0200 Subject: [PATCH 01/83] 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/83] 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/83] 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/83] 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/83] 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/83] 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/83] 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/83] 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/83] 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/83] 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/83] 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 59e2f474d313190b935057d17dd87d40978b4ecc Mon Sep 17 00:00:00 2001 From: Stefan Schwarz Date: Tue, 4 Aug 2020 15:51:09 +0200 Subject: [PATCH 12/83] fix puppet langserver --- init.el | 2 ++ 1 file changed, 2 insertions(+) diff --git a/init.el b/init.el index d18a62a..bf42235 100644 --- a/init.el +++ b/init.el @@ -206,8 +206,10 @@ "exec" "--keep-file-descriptors" "/home/stefan/Apps/puppet-editor-services/puppet-languageserver" + "--local-workspace=/home/stefan/git/sysadmin/puppet" "--debug=/tmp/puplsp" "--stdio")) + :environment-fn (lambda() '(("BUNDLE_GEMFILE" . "/home/stefan/Apps/puppet-editor-services/Gemfile"))) :major-modes '(puppet-mode) :server-id 'puppet-languageserver)) (add-to-list 'lsp-language-id-configuration '(puppet-mode . "puppet-languageserver")) From b778fb1993b3fa509a404caf1eafb8dd3140518a Mon Sep 17 00:00:00 2001 From: Stefan Schwarz Date: Tue, 4 Aug 2020 15:51:17 +0200 Subject: [PATCH 13/83] no focus in childframes --- init.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/init.el b/init.el index bf42235..39ec403 100644 --- a/init.el +++ b/init.el @@ -235,9 +235,9 @@ (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) - ) + lsp-ui-doc-use-childframe t)) (use-package company-lsp :ensure t :commands company-lsp) (use-package yasnippet :ensure t From be9bcdf083d09bb314be2a897e488d4554bbbae7 Mon Sep 17 00:00:00 2001 From: Stefan Schwarz Date: Tue, 4 Aug 2020 15:51:38 +0200 Subject: [PATCH 14/83] php ls changes --- init.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/init.el b/init.el index 39ec403..a10d181 100644 --- a/init.el +++ b/init.el @@ -511,7 +511,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")))) + '(lsp-clients-php-server-command (quote ("php /home/stefan/Apps/php-language-server/vendor/felixfbecker/language-server/bin/php-language-server.php")))) (provide 'init) ;;; init.el ends here From 0b14fdc39c61a54a7a6c8c934f2ff0ffacc180fb Mon Sep 17 00:00:00 2001 From: Stefan Schwarz Date: Thu, 13 Aug 2020 21:48:40 +0200 Subject: [PATCH 15/83] 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 f464d2a64ba0610d8c57f1f3ebc1f3f88cca32a2 Mon Sep 17 00:00:00 2001 From: Stefan Schwarz Date: Fri, 14 Aug 2020 09:56:38 +0200 Subject: [PATCH 16/83] updates from home --- init.el | 34 +++++++++++++++++++++------------- 1 file changed, 21 insertions(+), 13 deletions(-) diff --git a/init.el b/init.el index a10d181..14c67f5 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) @@ -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)) @@ -60,21 +60,21 @@ :ensure t :config (global-evil-surround-mode 1) - (evil-define-key 'visual evil-surround-mode-map "s" 'evil-surround-region) - ) + (evil-define-key 'visual evil-surround-mode-map "s" 'evil-surround-region)) + (use-package evil-matchit :ensure t :config (global-evil-matchit-mode 1)) ;; 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) (setq ivy-re-builders-alist '((swiper . ivy--regex-plus) - (t . ivy--regex-fuzzy))) - (ivy-mode 1) + (t . ivy--regex-plus))) (define-key ivy-minibuffer-map (kbd "C-j") 'ivy-next-line) (define-key ivy-minibuffer-map (kbd "C-k") 'ivy-previous-line) (define-key ivy-minibuffer-map (kbd "C-h") (kbd "DEL")) @@ -99,7 +99,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) @@ -161,6 +161,12 @@ ;; code-with-fun +(use-package rainbow-mode :ensure t + :config + (rainbow-mode)) +(use-package hl-todo :ensure t + :config + (hl-todo-mode)) (use-package whitespace :config (setq whitespace-style '(face empty tabs lines-tail trailing)) @@ -172,7 +178,11 @@ (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 @@ -500,18 +510,16 @@ initialized with the current directory instead of filename." ;; Your init file should contain only one such instance. ;; 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))) + '("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 - (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))) + '(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. ;; 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/felixfbecker/language-server/bin/php-language-server.php")))) + '(lsp-clients-php-server-command '("php /home/stefan/Apps/php-language-server/vendor/felixfbecker/language-server/bin/php-language-server.php"))) (provide 'init) ;;; init.el ends here From e94d04e366da31b4a2a940cd5982d3647c0eb6f5 Mon Sep 17 00:00:00 2001 From: Stefan Schwarz Date: Mon, 24 Aug 2020 11:24:37 +0200 Subject: [PATCH 17/83] add php lang server --- init.el | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/init.el b/init.el index 14c67f5..9459971 100644 --- a/init.el +++ b/init.el @@ -199,6 +199,7 @@ (go-mode . lsp-deferred) (javascript-mode . lsp-deferred) (js2-mode . lsp-deferred) + (php-mode . lsp-deferred) (puppet-mode . lsp-deferred) (python-mode . lsp-deferred) (ruby-mode . lsp-deferred) @@ -223,6 +224,7 @@ :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 @@ -231,6 +233,16 @@ :major-modes '(yaml-mode) :server-id 'yaml-languageserver)) (add-to-list 'lsp-language-id-configuration '(yaml-mode . "yaml-languageserver")) + + (lsp-register-client + (make-lsp-client + :new-connection + (lsp-stdio-connection + '("php" "/home/stefan/vendor/felixfbecker/language-server/bin/php-language-server.php")) + :major-modes '(php-mode) + :server-id 'php-custom)) + (add-to-list 'lsp-language-id-configuration '(puppet-mode . "php-custom")) + (setq lsp-auto-configure t lsp-auto-guess-root t lsp-enable-indentation t @@ -519,7 +531,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 '("php /home/stefan/Apps/php-language-server/vendor/felixfbecker/language-server/bin/php-language-server.php"))) + ) (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 18/83] 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 19/83] 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 From 4ed8e55d30e3cb99095d62a1ee0ad84894ccfa1b Mon Sep 17 00:00:00 2001 From: Stefan Schwarz Date: Mon, 5 Oct 2020 10:37:20 +0200 Subject: [PATCH 20/83] 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. From d05e8ff6c7b0a7391b80fc747abc1886ab8d4be8 Mon Sep 17 00:00:00 2001 From: Stefan Schwarz Date: Tue, 9 Feb 2021 12:10:38 +0100 Subject: [PATCH 21/83] add direnv to be happy on nixos --- init.el | 3 +++ 1 file changed, 3 insertions(+) diff --git a/init.el b/init.el index d822901..2ad77f1 100644 --- a/init.el +++ b/init.el @@ -162,6 +162,9 @@ ;; code-with-fun +(use-package direnv :ensure t + :config + (direnv-mode)) (use-package rainbow-mode :ensure t :config (rainbow-mode)) From edbdfa739aedf17ca4c8441eb80554871f6dd766 Mon Sep 17 00:00:00 2001 From: Stefan Schwarz Date: Tue, 9 Feb 2021 12:10:58 +0100 Subject: [PATCH 22/83] add line numbers --- init.el | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/init.el b/init.el index 2ad77f1..49332c2 100644 --- a/init.el +++ b/init.el @@ -56,7 +56,9 @@ ;; evil config (use-package evil :ensure t - :config (evil-mode 1)) + :config + (evil-mode 1) + (global-display-line-numbers-mode)) (use-package evil-surround :ensure t :config From cf2d01d75d063604f8eeeebce3503e172b15a319 Mon Sep 17 00:00:00 2001 From: Stefan Schwarz Date: Tue, 9 Feb 2021 12:11:05 +0100 Subject: [PATCH 23/83] fix puppet langserver path --- init.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/init.el b/init.el index 49332c2..5dcc275 100644 --- a/init.el +++ b/init.el @@ -222,7 +222,7 @@ (lsp-stdio-connection '("bundle" "exec" "--keep-file-descriptors" - "/home/stefan/Apps/puppet-editor-services/puppet-languageserver" + "/nix/store/pgjhgk5d41q6jjxiympqjs3qzxf52mg9-puppet-editor-services-9fd4984/puppet-languageserver" "--local-workspace=/home/stefan/git/sysadmin/puppet" "--debug=/tmp/puplsp" "--stdio")) From 3df5119937b57afbf3e72d3cdbba7023be85106e Mon Sep 17 00:00:00 2001 From: Stefan Schwarz Date: Tue, 9 Feb 2021 12:11:15 +0100 Subject: [PATCH 24/83] fix indent --- init.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/init.el b/init.el index 5dcc275..2809379 100644 --- a/init.el +++ b/init.el @@ -306,7 +306,7 @@ "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 816770d9d4772a877f542531af7f7e5867e0cdff Mon Sep 17 00:00:00 2001 From: Stefan Schwarz Date: Tue, 9 Feb 2021 12:11:21 +0100 Subject: [PATCH 25/83] test fzf instead of projectile-find-file --- init.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/init.el b/init.el index 2809379..b4c294c 100644 --- a/init.el +++ b/init.el @@ -343,7 +343,7 @@ "pb" 'counsel-projectile-switch-to-buffer "pd" 'counsel-projectile-find-dir "pp" 'counsel-projectile-switch-project - "pf" 'counsel-projectile-find-file + "pf" 'counsel-fzf "pr" 'projectile-recentf ;; Swyper From 1dffb6d9e9c04c69aa34ad8438acccf9e105bffe Mon Sep 17 00:00:00 2001 From: Stefan Schwarz Date: Tue, 9 Feb 2021 12:11:43 +0100 Subject: [PATCH 26/83] add relative nine numbers --- init.el | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/init.el b/init.el index b4c294c..9f0afce 100644 --- a/init.el +++ b/init.el @@ -19,8 +19,9 @@ (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 mouse-autoselect-window 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 +(setq display-line-numbers 'relative) ; show relative line-numers ;; global keybindings (global-set-key (kbd "C-k") 'previous-line) From 4e62af3f7920ef44a03f47ab8a64915fa1549516 Mon Sep 17 00:00:00 2001 From: Stefan Schwarz Date: Tue, 9 Feb 2021 12:11:53 +0100 Subject: [PATCH 27/83] cleanup --- init.el | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/init.el b/init.el index 9f0afce..7625bf1 100644 --- a/init.el +++ b/init.el @@ -393,9 +393,7 @@ "wV" 'split-window-right-and-focus "ww" 'other-window "wx" 'kill-buffer-and-window - - - )) +)) ;; custom functions From 94177a0928ae003328fadba697bc495eb6cbc059 Mon Sep 17 00:00:00 2001 From: Stefan Schwarz Date: Tue, 9 Feb 2021 12:11:59 +0100 Subject: [PATCH 28/83] update emacs settigns --- init.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/init.el b/init.el index 7625bf1..5f39186 100644 --- a/init.el +++ b/init.el @@ -514,9 +514,9 @@ initialized with the current directory instead of filename." ;; Your init file should contain only one such instance. ;; If there is more than one, they won't work right. '(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)) + '("711efe8b1233f2cf52f338fd7f15ce11c836d0b6240a18fffffc2cbd5bfe61b0" "01cf34eca93938925143f402c2e6141f03abb341f27d1c2dba3d50af9357ce70" "37144b437478e4c235824f0e94afa740ee2c7d16952e69ac3c5ed4352209eefb" "93ed23c504b202cf96ee591138b0012c295338f38046a1f3c14522d4a64d7308" "f7216d3573e1bd2a2b47a2331f368b45e7b5182ddbe396d02b964b1ea5c5dc27" "c4bdbbd52c8e07112d1bfd00fee22bf0f25e727e95623ecb20c4fa098b74c1bd" "f2927d7d87e8207fa9a0a003c0f222d45c948845de162c885bf6ad2a255babfd" "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 - '(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)) + '(direnv 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. From a53e4070295ddbf5f499b7f1b8d30560ea7aa858 Mon Sep 17 00:00:00 2001 From: Stefan Schwarz Date: Tue, 30 Mar 2021 17:35:36 +0200 Subject: [PATCH 29/83] use a bit more orgmode --- init.el | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/init.el b/init.el index 5f39186..beb1dab 100644 --- a/init.el +++ b/init.el @@ -165,6 +165,10 @@ ;; code-with-fun +(use-package org-jira :ensure t + :config + (setq jiralib-url "https://coordinatr.thomann.de")) +(use-package evil-org :ensure t) (use-package direnv :ensure t :config (direnv-mode)) @@ -359,6 +363,28 @@ "fT" 'treemacs-find-file "f M-t" 'treemacs-find-tag + ;; Jira + "jpg" 'org-jira-get-projects + "jib" 'org-jira-browse-issue + "jig" 'org-jira-get-issues + "jij" 'org-jira-get-issues-from-custom-jql + "jih" 'org-jira-get-issues-headonly + "jiu" 'org-jira-update-issue + "jiw" 'org-jira-progress-issue + "jin" 'org-jira-progress-issue-next + "jia" 'org-jira-assign-issue + "jir" 'org-jira-refresh-issue + "jiR" 'org-jira-refresh-issues-in-buffer + "jic" 'org-jira-create-issue + "jik" 'org-jira-copy-current-issue-key + "jsc" 'org-jira-create-subtask + "jsg" 'org-jira-get-subtasks + "jcc" 'org-jira-add-comment + "jcu" 'org-jira-update-comment + "jwu" 'org-jira-update-worklogs-from-org-clocks + "jtj" 'org-jira-todo-to-jira + "jif" 'org-jira-get-issues-by-fixversion + ;; Window "w" '(:ignore t :which-key "Window") "w=" 'balance-windows-area From 9f64ad258a88d0db8deaa619b5cb6f45f8152f2d Mon Sep 17 00:00:00 2001 From: Stefan Schwarz Date: Tue, 17 Aug 2021 09:11:11 +0200 Subject: [PATCH 30/83] add to orgmode --- init.el | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/init.el b/init.el index beb1dab..3b0b136 100644 --- a/init.el +++ b/init.el @@ -168,7 +168,9 @@ (use-package org-jira :ensure t :config (setq jiralib-url "https://coordinatr.thomann.de")) -(use-package evil-org :ensure t) +(use-package evil-org :ensure t + :after org + :hook (org-mode . (lambda () evil-org-mode))) (use-package direnv :ensure t :config (direnv-mode)) From e8819d3fa799331b4a28977ed2fec382b70142d9 Mon Sep 17 00:00:00 2001 From: Stefan Schwarz Date: Tue, 17 Aug 2021 09:11:53 +0200 Subject: [PATCH 31/83] add typescript langserver --- init.el | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/init.el b/init.el index 3b0b136..fd40b05 100644 --- a/init.el +++ b/init.el @@ -247,6 +247,15 @@ :server-id 'yaml-languageserver)) (add-to-list 'lsp-language-id-configuration '(yaml-mode . "yaml-languageserver")) + (lsp-register-client + (make-lsp-client + :new-connection + (lsp-stdio-connection '("nix-shell" "-p" "nodePackages.typescript-language-server" + "--run" "typescript-language-server --stdio")) + :major-modes '(js2-mode) + :server-id 'nix-tls)) + (add-to-list 'lsp-language-id-configuration '(js2-mode . "nix-tls")) + (lsp-register-client (make-lsp-client :new-connection From 2185a0a8601e12d1eecf6465514dc4fb3d8f466b Mon Sep 17 00:00:00 2001 From: Stefan Schwarz Date: Tue, 17 Aug 2021 09:12:23 +0200 Subject: [PATCH 32/83] remove terraform --- init.el | 4 ---- 1 file changed, 4 deletions(-) diff --git a/init.el b/init.el index fd40b05..89a4f73 100644 --- a/init.el +++ b/init.el @@ -219,10 +219,6 @@ (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 From a23ec693999a06f334104ef03ff96b0a0b9601de Mon Sep 17 00:00:00 2001 From: Stefan Schwarz Date: Tue, 17 Aug 2021 09:19:19 +0200 Subject: [PATCH 33/83] clean yaml langserver --- init.el | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/init.el b/init.el index 89a4f73..9d4757a 100644 --- a/init.el +++ b/init.el @@ -237,11 +237,11 @@ (lsp-register-client (make-lsp-client :new-connection - (lsp-stdio-connection '("/home/stefan/Apps/yaml-language-server/bin/yaml-language-server" - "--stdio")) + (lsp-stdio-connection '("nix-shell" "-p" "nodePackages.yaml-language-server" + "--run" "yaml-language-server --stdio")) :major-modes '(yaml-mode) - :server-id 'yaml-languageserver)) - (add-to-list 'lsp-language-id-configuration '(yaml-mode . "yaml-languageserver")) + :server-id 'nix-yls)) + (add-to-list 'lsp-language-id-configuration '(yaml-mode . "yaml-language-server")) (lsp-register-client (make-lsp-client From b5ba7cf8004bd9ebde207f86d2635db5751a984f Mon Sep 17 00:00:00 2001 From: Stefan Schwarz Date: Tue, 17 Aug 2021 09:37:12 +0200 Subject: [PATCH 34/83] add roam mode --- init.el | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/init.el b/init.el index 9d4757a..48c3111 100644 --- a/init.el +++ b/init.el @@ -171,6 +171,14 @@ (use-package evil-org :ensure t :after org :hook (org-mode . (lambda () evil-org-mode))) +(use-package org-roam + :ensure t + :init + (setq org-roam-v2-ack t) + :custom + (org-roam-directory (file-truename "~/Sync/RoamNotes")) + :config + (org-roam-db-autosync-mode)) (use-package direnv :ensure t :config (direnv-mode)) @@ -392,6 +400,14 @@ "jtj" 'org-jira-todo-to-jira "jif" 'org-jira-get-issues-by-fixversion + ;; Roam + "rl" 'org-roam-buffer-toggle + "rf" 'org-roam-node-find + "rg" 'org-roam-graph + "ri" 'org-roam-node-insert + "rc" 'org-roam-capture + "rj" 'org-roam-dailies-capture-today + ;; Window "w" '(:ignore t :which-key "Window") "w=" 'balance-windows-area From ea8f6625233d8ed6cb7f13d1f260f0ec16a80e42 Mon Sep 17 00:00:00 2001 From: Stefan Schwarz Date: Mon, 4 Oct 2021 13:19:32 +0200 Subject: [PATCH 35/83] fix undo-redo --- init.el | 2 ++ 1 file changed, 2 insertions(+) diff --git a/init.el b/init.el index 48c3111..b9b0cb9 100644 --- a/init.el +++ b/init.el @@ -165,6 +165,8 @@ ;; code-with-fun +(global-undo-tree-mode) +(evil-set-undo-system 'undo-tree) (use-package org-jira :ensure t :config (setq jiralib-url "https://coordinatr.thomann.de")) From e7d3a3d2e4b9c550692937514499da21edbe770f Mon Sep 17 00:00:00 2001 From: foosinn Date: Sat, 13 Nov 2021 01:03:16 +0100 Subject: [PATCH 36/83] direnv --- init.el | 36 ++++++++---------------------------- 1 file changed, 8 insertions(+), 28 deletions(-) diff --git a/init.el b/init.el index 9d4757a..1716a16 100644 --- a/init.el +++ b/init.el @@ -51,7 +51,7 @@ :hook (after-init . doom-modeline-mode)) (set-face-attribute 'default nil :family "Meslo LG S DZ" - :height 105 + :height 125 :weight 'normal :width 'normal) @@ -162,12 +162,16 @@ (lambda () (setq indent-tabs-mode nil))) ;; bazel / starlak (use-package bazel-mode :ensure t) +;; python +(use-package lsp-pyright + :ensure t + :hook (python-mode . (lambda () + (require 'lsp-pyright) + (lsp)))) ; or lsp-deferred + ;; code-with-fun -(use-package org-jira :ensure t - :config - (setq jiralib-url "https://coordinatr.thomann.de")) (use-package evil-org :ensure t :after org :hook (org-mode . (lambda () evil-org-mode))) @@ -199,8 +203,6 @@ company-minimum-prefix-length 2 company-require-match nil)) -(use-package company-box - :hook (company-mode . company-box-mode)) (use-package highlight-indentation :ensure t) ;; lsp @@ -370,28 +372,6 @@ "fT" 'treemacs-find-file "f M-t" 'treemacs-find-tag - ;; Jira - "jpg" 'org-jira-get-projects - "jib" 'org-jira-browse-issue - "jig" 'org-jira-get-issues - "jij" 'org-jira-get-issues-from-custom-jql - "jih" 'org-jira-get-issues-headonly - "jiu" 'org-jira-update-issue - "jiw" 'org-jira-progress-issue - "jin" 'org-jira-progress-issue-next - "jia" 'org-jira-assign-issue - "jir" 'org-jira-refresh-issue - "jiR" 'org-jira-refresh-issues-in-buffer - "jic" 'org-jira-create-issue - "jik" 'org-jira-copy-current-issue-key - "jsc" 'org-jira-create-subtask - "jsg" 'org-jira-get-subtasks - "jcc" 'org-jira-add-comment - "jcu" 'org-jira-update-comment - "jwu" 'org-jira-update-worklogs-from-org-clocks - "jtj" 'org-jira-todo-to-jira - "jif" 'org-jira-get-issues-by-fixversion - ;; Window "w" '(:ignore t :which-key "Window") "w=" 'balance-windows-area From dd996c2674082f5ca16f09f571dd629eade030c9 Mon Sep 17 00:00:00 2001 From: foosinn Date: Sat, 29 Jan 2022 21:25:27 +0100 Subject: [PATCH 37/83] switch from evil-magit to evil-collection --- init.el | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/init.el b/init.el index 881da37..d9bf05f 100644 --- a/init.el +++ b/init.el @@ -60,6 +60,10 @@ :config (evil-mode 1) (global-display-line-numbers-mode)) +(use-package evil-collection + :ensure t + :config + (evil-collection-init)) (use-package evil-surround :ensure t :config @@ -298,7 +302,6 @@ :config (smartparens-global-mode 1)) ;; magit -(use-package evil-magit :ensure t) (use-package magit :ensure t) ;; general config From a305faada83cce4682ecd67cdadc81d3026177fb Mon Sep 17 00:00:00 2001 From: Stefan Schwarz Date: Mon, 31 Jan 2022 14:01:30 +0100 Subject: [PATCH 38/83] add terraform lsp --- init.el | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/init.el b/init.el index d9bf05f..74d1264 100644 --- a/init.el +++ b/init.el @@ -116,6 +116,10 @@ ;; langs ;; +;; terraform +(use-package terraform-mode :ensure t) +;; rego +(use-package rego-mode :ensure t) ;; vue (use-package vue-mode :ensure t :config @@ -237,6 +241,7 @@ (ruby-mode . lsp-deferred) (rust-mode . lsp-deferred) (vue-mode . lsp-deferred) + (terraform-mode . lsp-deferred) :config (lsp-register-client (make-lsp-client From 3622699968fbab9b5d7d149143bfc350a4aea286 Mon Sep 17 00:00:00 2001 From: foosinn Date: Sat, 12 Feb 2022 20:50:36 +0100 Subject: [PATCH 39/83] switch to dracula --- init.el | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/init.el b/init.el index 74d1264..dcd2be8 100644 --- a/init.el +++ b/init.el @@ -42,23 +42,24 @@ (require 'use-package) ;; themes -(use-package doom-themes :ensure t) -(use-package monokai-theme :ensure t +(use-package doom-themes :ensure t :config - (load-theme 'doom-monokai-pro t)) -(use-package all-the-icons :ensure t) + (load-theme 'doom-dracula t) + (rainbow-mode)) (use-package doom-modeline :ensure t :hook (after-init . doom-modeline-mode)) (set-face-attribute 'default nil - :family "Meslo LG S DZ" - :height 125 + :family "CaskaydiaCove Nerd Font" + :height 140 :weight 'normal :width 'normal) ;; evil config +(setq evil-want-keybinding nil) (use-package evil :ensure t :config (evil-mode 1) + (evil-set-undo-system 'undo-tree) (global-display-line-numbers-mode)) (use-package evil-collection :ensure t @@ -177,11 +178,7 @@ (require 'lsp-pyright) (lsp)))) ; or lsp-deferred - - ;; code-with-fun -(global-undo-tree-mode) -(evil-set-undo-system 'undo-tree) (use-package org-jira :ensure t :config (setq jiralib-url "https://coordinatr.thomann.de")) @@ -207,7 +204,7 @@ (hl-todo-mode)) (use-package whitespace :config - (setq whitespace-style '(face empty tabs lines-tail trailing)) + (setq whitespace-style '(face empty tabs trailing)) (global-whitespace-mode t)) (use-package company :config @@ -577,8 +574,9 @@ 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. + '(auth-source-save-behavior nil) '(custom-safe-themes - '("711efe8b1233f2cf52f338fd7f15ce11c836d0b6240a18fffffc2cbd5bfe61b0" "01cf34eca93938925143f402c2e6141f03abb341f27d1c2dba3d50af9357ce70" "37144b437478e4c235824f0e94afa740ee2c7d16952e69ac3c5ed4352209eefb" "93ed23c504b202cf96ee591138b0012c295338f38046a1f3c14522d4a64d7308" "f7216d3573e1bd2a2b47a2331f368b45e7b5182ddbe396d02b964b1ea5c5dc27" "c4bdbbd52c8e07112d1bfd00fee22bf0f25e727e95623ecb20c4fa098b74c1bd" "f2927d7d87e8207fa9a0a003c0f222d45c948845de162c885bf6ad2a255babfd" "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)) + '("234dbb732ef054b109a9e5ee5b499632c63cc24f7c2383a849815dacc1727cb6" "a0be7a38e2de974d1598cf247f607d5c1841dbcef1ccd97cded8bea95a7c7639" "47db50ff66e35d3a440485357fb6acb767c100e135ccdf459060407f8baea7b2" "1704976a1797342a1b4ea7a75bdbb3be1569f4619134341bd5a4c1cfb16abad4" "0d01e1e300fcafa34ba35d5cf0a21b3b23bc4053d388e352ae6a901994597ab1" "835868dcd17131ba8b9619d14c67c127aa18b90a82438c8613586331129dda63" "da186cce19b5aed3f6a2316845583dbee76aea9255ea0da857d1c058ff003546" "8d7b028e7b7843ae00498f68fad28f3c6258eda0650fe7e17bfb017d51d0e2a2" "1278c5f263cdb064b5c86ab7aa0a76552082cf0189acf6df17269219ba496053" "e19ac4ef0f028f503b1ccafa7c337021834ce0d1a2bca03fcebc1ef635776bea" "78e6be576f4a526d212d5f9a8798e5706990216e9be10174e3f3b015b8662e27" "7a7b1d475b42c1a0b61f3b1d1225dd249ffa1abb1b7f726aec59ac7ca3bf4dae" "6c98bc9f39e8f8fd6da5b9c74a624cbb3782b4be8abae8fd84cbc43053d7c175" "d47f868fd34613bd1fc11721fe055f26fd163426a299d45ce69bef1f109e1e71" "745d03d647c4b118f671c49214420639cb3af7152e81f132478ed1c649d4597d" "a7b20039f50e839626f8d6aa96df62afebb56a5bbd1192f557cb2efb5fcfb662" "246a9596178bb806c5f41e5b571546bb6e0f4bd41a9da0df5dfbca7ec6e2250c" "d268b67e0935b9ebc427cad88ded41e875abfcc27abd409726a92e55459e0d01" "3d54650e34fa27561eb81fc3ceed504970cc553cfd37f46e8a80ec32254a3ec3" "613aedadd3b9e2554f39afe760708fc3285bf594f6447822dd29f947f0775d6c" "f91395598d4cb3e2ae6a2db8527ceb83fed79dbaf007f435de3e91e5bda485fb" "711efe8b1233f2cf52f338fd7f15ce11c836d0b6240a18fffffc2cbd5bfe61b0" "01cf34eca93938925143f402c2e6141f03abb341f27d1c2dba3d50af9357ce70" "37144b437478e4c235824f0e94afa740ee2c7d16952e69ac3c5ed4352209eefb" "93ed23c504b202cf96ee591138b0012c295338f38046a1f3c14522d4a64d7308" "f7216d3573e1bd2a2b47a2331f368b45e7b5182ddbe396d02b964b1ea5c5dc27" "c4bdbbd52c8e07112d1bfd00fee22bf0f25e727e95623ecb20c4fa098b74c1bd" "f2927d7d87e8207fa9a0a003c0f222d45c948845de162c885bf6ad2a255babfd" "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 '(direnv 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)) From cd4899b69e970d55bf8a31ac842e914e8604302b Mon Sep 17 00:00:00 2001 From: foosinn Date: Mon, 14 Feb 2022 10:39:30 +0100 Subject: [PATCH 40/83] add nix mode --- init.el | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/init.el b/init.el index dcd2be8..83c6cdb 100644 --- a/init.el +++ b/init.el @@ -117,6 +117,9 @@ ;; langs ;; +;; nixos +(use-package nix-mode :ensure t + :mode "\\.nix\\'") ;; terraform (use-package terraform-mode :ensure t) ;; rego @@ -282,6 +285,15 @@ :server-id 'php-custom)) (add-to-list 'lsp-language-id-configuration '(puppet-mode . "php-custom")) + (lsp-register-client + (make-lsp-client + :new-connection + (lsp-stdio-connection + '("nix-shell" "-p" "rnix-lsp" "--run" "rnix-lsp")) + :major-modes '(nix-mode) + :server-id 'nix)) + (add-to-list 'lsp-language-id-configuration '(nix-mode . "nix-custom")) + (setq lsp-auto-configure t lsp-auto-guess-root t lsp-enable-indentation t From c8c4490958d02493cb1b9bf90dcd1c5ea94ba6cf Mon Sep 17 00:00:00 2001 From: foosinn Date: Sun, 27 Feb 2022 23:02:24 +0100 Subject: [PATCH 41/83] fix undo --- init.el | 1 + 1 file changed, 1 insertion(+) diff --git a/init.el b/init.el index 83c6cdb..c65c98f 100644 --- a/init.el +++ b/init.el @@ -59,6 +59,7 @@ (use-package evil :ensure t :config (evil-mode 1) + (global-undo-tree-mode) (evil-set-undo-system 'undo-tree) (global-display-line-numbers-mode)) (use-package evil-collection From 830d4fd2b7d108af14db0f22566b3b8bb4504f9e Mon Sep 17 00:00:00 2001 From: Stefan Schwarz Date: Wed, 2 Mar 2022 17:16:38 +0100 Subject: [PATCH 42/83] fix fontsize --- init.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/init.el b/init.el index c65c98f..bcf43fe 100644 --- a/init.el +++ b/init.el @@ -50,7 +50,7 @@ :hook (after-init . doom-modeline-mode)) (set-face-attribute 'default nil :family "CaskaydiaCove Nerd Font" - :height 140 + :height 120 :weight 'normal :width 'normal) From ec76d893a66f53ee058c650df1c9e8e2d8a173a7 Mon Sep 17 00:00:00 2001 From: Stefan Schwarz Date: Wed, 2 Mar 2022 17:17:01 +0100 Subject: [PATCH 43/83] add support for yaml mode --- init.el | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/init.el b/init.el index bcf43fe..300cd70 100644 --- a/init.el +++ b/init.el @@ -241,8 +241,9 @@ (python-mode . lsp-deferred) (ruby-mode . lsp-deferred) (rust-mode . lsp-deferred) - (vue-mode . lsp-deferred) (terraform-mode . lsp-deferred) + (vue-mode . lsp-deferred) + (yaml-mode . lsp-deferred) :config (lsp-register-client (make-lsp-client From 9c26c2a5e9bf08ba367d2cfeb6f74cac2e5aa981 Mon Sep 17 00:00:00 2001 From: Stefan Schwarz Date: Wed, 2 Mar 2022 17:17:13 +0100 Subject: [PATCH 44/83] add keybinding for ripgrep --- init.el | 1 + 1 file changed, 1 insertion(+) diff --git a/init.el b/init.el index 300cd70..6c590d7 100644 --- a/init.el +++ b/init.el @@ -353,6 +353,7 @@ ;; Files "ff" 'counsel-find-file + "fg" 'counsel-rg "fL" 'counsel-locate "fr" 'counsel-recentf "fR" 'foo/rename-current-buffer-file From 0ab1fa85160ec43cdb5020e737e99e62efae0255 Mon Sep 17 00:00:00 2001 From: Stefan Schwarz Date: Wed, 2 Mar 2022 17:17:22 +0100 Subject: [PATCH 45/83] swithc php language server --- init.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/init.el b/init.el index 6c590d7..c925113 100644 --- a/init.el +++ b/init.el @@ -282,7 +282,7 @@ (make-lsp-client :new-connection (lsp-stdio-connection - '("php" "/home/stefan/vendor/felixfbecker/language-server/bin/php-language-server.php")) + '("nix-shell" "-p" "nodePackages.intelephense" "--run" "intelephense --stdio")) :major-modes '(php-mode) :server-id 'php-custom)) (add-to-list 'lsp-language-id-configuration '(puppet-mode . "php-custom")) From f24d7192caf4c1c78ad57b0277531ea930a96acb Mon Sep 17 00:00:00 2001 From: foosinn Date: Sat, 26 Mar 2022 22:54:00 +0100 Subject: [PATCH 46/83] lsp easy mode --- init.el | 1 + 1 file changed, 1 insertion(+) diff --git a/init.el b/init.el index c925113..c075ad8 100644 --- a/init.el +++ b/init.el @@ -26,6 +26,7 @@ ;; global keybindings (global-set-key (kbd "C-k") 'previous-line) (global-set-key (kbd "C-j") 'next-line) +(global-set-key (kbd "C-RET") 'lsp-execute-code-action) ;; package manager (require 'package) From cd97e241158a1e76889c68b3931760d6921cf75f Mon Sep 17 00:00:00 2001 From: foosinn Date: Sun, 27 Mar 2022 00:13:15 +0100 Subject: [PATCH 47/83] code actions --- init.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/init.el b/init.el index c075ad8..93f0e07 100644 --- a/init.el +++ b/init.el @@ -26,7 +26,6 @@ ;; global keybindings (global-set-key (kbd "C-k") 'previous-line) (global-set-key (kbd "C-j") 'next-line) -(global-set-key (kbd "C-RET") 'lsp-execute-code-action) ;; package manager (require 'package) @@ -384,6 +383,7 @@ "mn" 'flycheck-next-error "ms" 'lsp-ivy-workspace-symbol "mS" 'lsp-ivy-global-workspace-symbol + "m RET" 'lsp-execute-code-action ;; Projectile "p" '(:ignore t :which-key "Projectile") From d35f3a4ac2a66b5b93b071ae2ddd953754f8145c Mon Sep 17 00:00:00 2001 From: foosinn Date: Sun, 3 Apr 2022 00:48:04 +0200 Subject: [PATCH 48/83] add snippets --- snippets/text-mode/umlaut-Ae | 5 +++++ snippets/text-mode/umlaut-Oe | 5 +++++ snippets/text-mode/umlaut-Ue | 5 +++++ snippets/text-mode/umlaut-ae | 5 +++++ snippets/text-mode/umlaut-fuer | 5 +++++ snippets/text-mode/umlaut-gruss | 5 +++++ snippets/text-mode/umlaut-oe | 5 +++++ snippets/text-mode/umlaut-ue | 5 +++++ 8 files changed, 40 insertions(+) create mode 100644 snippets/text-mode/umlaut-Ae create mode 100644 snippets/text-mode/umlaut-Oe create mode 100644 snippets/text-mode/umlaut-Ue create mode 100644 snippets/text-mode/umlaut-ae create mode 100644 snippets/text-mode/umlaut-fuer create mode 100644 snippets/text-mode/umlaut-gruss create mode 100644 snippets/text-mode/umlaut-oe create mode 100644 snippets/text-mode/umlaut-ue diff --git a/snippets/text-mode/umlaut-Ae b/snippets/text-mode/umlaut-Ae new file mode 100644 index 0000000..5e8dc01 --- /dev/null +++ b/snippets/text-mode/umlaut-Ae @@ -0,0 +1,5 @@ +# -*- mode: snippet -*- +# name: umlaut-ae +# key: Ae +# -- +Ä \ No newline at end of file diff --git a/snippets/text-mode/umlaut-Oe b/snippets/text-mode/umlaut-Oe new file mode 100644 index 0000000..76f0d5b --- /dev/null +++ b/snippets/text-mode/umlaut-Oe @@ -0,0 +1,5 @@ +# -*- mode: snippet -*- +# name: umlaut-Oe +# key: Oe +# -- +Ö \ No newline at end of file diff --git a/snippets/text-mode/umlaut-Ue b/snippets/text-mode/umlaut-Ue new file mode 100644 index 0000000..fb0480c --- /dev/null +++ b/snippets/text-mode/umlaut-Ue @@ -0,0 +1,5 @@ +# -*- mode: snippet -*- +# name: umlaut-Ue +# key: Ue +# -- +Ü \ No newline at end of file diff --git a/snippets/text-mode/umlaut-ae b/snippets/text-mode/umlaut-ae new file mode 100644 index 0000000..ce1f083 --- /dev/null +++ b/snippets/text-mode/umlaut-ae @@ -0,0 +1,5 @@ +# -*- mode: snippet -*- +# name: umlaut-ae +# key: ae +# -- +ä \ No newline at end of file diff --git a/snippets/text-mode/umlaut-fuer b/snippets/text-mode/umlaut-fuer new file mode 100644 index 0000000..0f5ee31 --- /dev/null +++ b/snippets/text-mode/umlaut-fuer @@ -0,0 +1,5 @@ +# -*- mode: snippet -*- +# name: umlaut-fuer +# key: fuer +# -- +für \ No newline at end of file diff --git a/snippets/text-mode/umlaut-gruss b/snippets/text-mode/umlaut-gruss new file mode 100644 index 0000000..95dead8 --- /dev/null +++ b/snippets/text-mode/umlaut-gruss @@ -0,0 +1,5 @@ +# -*- mode: snippet -*- +# name: umlaut-gruss +# key: Gruss +# -- +Gruß \ No newline at end of file diff --git a/snippets/text-mode/umlaut-oe b/snippets/text-mode/umlaut-oe new file mode 100644 index 0000000..059b57e --- /dev/null +++ b/snippets/text-mode/umlaut-oe @@ -0,0 +1,5 @@ +# -*- mode: snippet -*- +# name: umlaut-oe +# key: oe +# -- +ö \ No newline at end of file diff --git a/snippets/text-mode/umlaut-ue b/snippets/text-mode/umlaut-ue new file mode 100644 index 0000000..8571f03 --- /dev/null +++ b/snippets/text-mode/umlaut-ue @@ -0,0 +1,5 @@ +# -*- mode: snippet -*- +# name: umlaut-ue +# key: ue +# -- +ü \ No newline at end of file From 5884224a9f6ea87f45b743ff879833dfe91165b0 Mon Sep 17 00:00:00 2001 From: Stefan Schwarz Date: Fri, 22 Apr 2022 14:43:45 +0200 Subject: [PATCH 49/83] use fd as search instead fzf (fast) --- init.el | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/init.el b/init.el index 93f0e07..9bde272 100644 --- a/init.el +++ b/init.el @@ -98,7 +98,9 @@ ;; counsel (use-package counsel :ensure t - :config (counsel-mode 1)) + :config + (counsel-mode 1) + (setq counsel-fzf-cmd "fd -H -c never \"%s\"")) (use-package counsel-projectile :ensure t) (use-package swiper :ensure t) From 92d4c820341dde24c927e1775344a4f125b93e87 Mon Sep 17 00:00:00 2001 From: Stefan Schwarz Date: Wed, 29 Jun 2022 10:17:07 +0200 Subject: [PATCH 50/83] show column numbers by default --- init.el | 1 + 1 file changed, 1 insertion(+) diff --git a/init.el b/init.el index 9bde272..d819048 100644 --- a/init.el +++ b/init.el @@ -22,6 +22,7 @@ (setq focus-follows-mouse nil) ; stop popups from getting focus (setq mouse-autoselect-window nil) ; stop popups from getting focus (setq display-line-numbers 'relative) ; show relative line-numers +(setq column-number-mode t) ; show column number ;; global keybindings (global-set-key (kbd "C-k") 'previous-line) From 6a1760ac249dc8ff2e5d150b7a60afd91765012b Mon Sep 17 00:00:00 2001 From: Stefan Schwarz Date: Wed, 29 Jun 2022 10:17:19 +0200 Subject: [PATCH 51/83] show hidden files in fzf but no git --- init.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/init.el b/init.el index d819048..16ebc84 100644 --- a/init.el +++ b/init.el @@ -101,7 +101,7 @@ (use-package counsel :ensure t :config (counsel-mode 1) - (setq counsel-fzf-cmd "fd -H -c never \"%s\"")) + (setq counsel-fzf-cmd "fd -E .git -H -c never \"%s\"")) (use-package counsel-projectile :ensure t) (use-package swiper :ensure t) From 25d9f3b6f86ca75ca82d6dd7cea6e851d53cb23d Mon Sep 17 00:00:00 2001 From: Stefan Schwarz Date: Thu, 30 Jun 2022 10:31:39 +0200 Subject: [PATCH 52/83] store undo history files in .emacs.d --- init.el | 1 + 1 file changed, 1 insertion(+) diff --git a/init.el b/init.el index 16ebc84..63fa305 100644 --- a/init.el +++ b/init.el @@ -13,6 +13,7 @@ (setq backup-directory-alist `(("." . "~/.emacs.d/backups")) ) ; which directory to put backups file (setq vc-follow-symlinks t ) ; don't ask for confirmation when opening symlinked file (setq auto-save-file-name-transforms '((".*" "~/.emacs.d/auto-save-list/" t)) ) ;transform backups file name +(setq undo-tree-history-directory-alist `(("." . "~/.emacs.d/undo-tree-hist/"))) (setq inhibit-startup-screen t ) ; inhibit useless and old-school startup screen (setq ring-bell-function 'ignore ) ; silent bell when you make a mistake (setq coding-system-for-read 'utf-8 ) ; use utf-8 by default From 2724f2a1b27d9df93c073c4483fa4c1f107eaa7a Mon Sep 17 00:00:00 2001 From: Stefan Schwarz Date: Thu, 30 Jun 2022 10:31:54 +0200 Subject: [PATCH 53/83] terraform save on exit --- init.el | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/init.el b/init.el index 63fa305..b2bd935 100644 --- a/init.el +++ b/init.el @@ -126,7 +126,8 @@ (use-package nix-mode :ensure t :mode "\\.nix\\'") ;; terraform -(use-package terraform-mode :ensure t) +(use-package terraform-mode :ensure t + :config (add-hook 'terraform-mode-hook #'terraform-format-on-save-mode)) ;; rego (use-package rego-mode :ensure t) ;; vue From 52ebcadde6850b163a573679f7390ed61f0bfb5d Mon Sep 17 00:00:00 2001 From: Stefan Schwarz Date: Fri, 8 Jul 2022 14:05:47 +0200 Subject: [PATCH 54/83] enforce spaces in markdown --- init.el | 3 +++ 1 file changed, 3 insertions(+) diff --git a/init.el b/init.el index b2bd935..23bc2ad 100644 --- a/init.el +++ b/init.el @@ -163,6 +163,9 @@ "ma" 'puppet-align-block ) ) +(use-package markdown-mode :ensure t + :config + (add-hook 'markdown-mode-hook (lambda () (setq indent-tabs-mode nil)))) ;; php (use-package php-mode :ensure t) ;; k8s From eff75f89112eb8fe213dc24c3ac2a493d5bff15f Mon Sep 17 00:00:00 2001 From: Stefan Schwarz Date: Fri, 8 Jul 2022 14:05:56 +0200 Subject: [PATCH 55/83] cleanup newlines --- init.el | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/init.el b/init.el index 23bc2ad..25f00d4 100644 --- a/init.el +++ b/init.el @@ -176,20 +176,13 @@ (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))) + (add-hook 'rust-mode-hook (lambda () (setq indent-tabs-mode nil)))) ;; bazel / starlak (use-package bazel-mode :ensure t) ;; python (use-package lsp-pyright :ensure t - :hook (python-mode . (lambda () - (require 'lsp-pyright) - (lsp)))) ; or lsp-deferred - + :hook (python-mode . (lambda () (require 'lsp-pyright) (lsp)))) ;; code-with-fun (use-package org-jira :ensure t :config From 5c5e0b7ff63a68d549aff2ec7ae5609b41ff6d71 Mon Sep 17 00:00:00 2001 From: Stefan Schwarz Date: Fri, 8 Jul 2022 14:07:00 +0200 Subject: [PATCH 56/83] remove scratch buffer message --- init.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/init.el b/init.el index 25f00d4..2bfa555 100644 --- a/init.el +++ b/init.el @@ -19,7 +19,7 @@ (setq coding-system-for-read 'utf-8 ) ; use utf-8 by default (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 initial-scratch-message "") ; print a default message in the empty scratch buffer opened at startup (setq focus-follows-mouse nil) ; stop popups from getting focus (setq mouse-autoselect-window nil) ; stop popups from getting focus (setq display-line-numbers 'relative) ; show relative line-numers From c6ddd95404ffb8950ed4810a819f20530f4d1124 Mon Sep 17 00:00:00 2001 From: Stefan Schwarz Date: Fri, 8 Jul 2022 14:07:29 +0200 Subject: [PATCH 57/83] document fix undo --- init.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/init.el b/init.el index 2bfa555..d37c5b9 100644 --- a/init.el +++ b/init.el @@ -13,7 +13,7 @@ (setq backup-directory-alist `(("." . "~/.emacs.d/backups")) ) ; which directory to put backups file (setq vc-follow-symlinks t ) ; don't ask for confirmation when opening symlinked file (setq auto-save-file-name-transforms '((".*" "~/.emacs.d/auto-save-list/" t)) ) ;transform backups file name -(setq undo-tree-history-directory-alist `(("." . "~/.emacs.d/undo-tree-hist/"))) +(setq undo-tree-history-directory-alist `(("." . "~/.emacs.d/undo-tree-hist/"))) ; fix undo tree folder (setq inhibit-startup-screen t ) ; inhibit useless and old-school startup screen (setq ring-bell-function 'ignore ) ; silent bell when you make a mistake (setq coding-system-for-read 'utf-8 ) ; use utf-8 by default From e1493ae4db27d15017a2ed9684b0a4fe55e01e20 Mon Sep 17 00:00:00 2001 From: Stefan Schwarz Date: Fri, 8 Jul 2022 14:17:16 +0200 Subject: [PATCH 58/83] sort ivy minibuffer bindings --- init.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/init.el b/init.el index d37c5b9..090b5f9 100644 --- a/init.el +++ b/init.el @@ -87,11 +87,11 @@ (setq ivy-re-builders-alist '((swiper . ivy--regex-plus) (t . ivy--regex-plus))) + (define-key ivy-minibuffer-map (kbd "C-h") (kbd "DEL")) (define-key ivy-minibuffer-map (kbd "C-j") 'ivy-next-line) (define-key ivy-minibuffer-map (kbd "C-k") 'ivy-previous-line) - (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 "C-S-h") help-map) (define-key ivy-minibuffer-map (kbd "") 'minibuffer-keyboard-quit)) (use-package ivy-xref :ensure t :init (setq xref-show-xrefs-function #'ivy-xref-show-xrefs)) From 4bcc4d212ab1cbed6d773b68d3fcc9568a35cb6f Mon Sep 17 00:00:00 2001 From: Stefan Schwarz Date: Fri, 8 Jul 2022 14:17:37 +0200 Subject: [PATCH 59/83] cleanup evil setup --- init.el | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/init.el b/init.el index 090b5f9..7438d9f 100644 --- a/init.el +++ b/init.el @@ -57,19 +57,23 @@ :width 'normal) ;; evil config -(setq evil-want-keybinding nil) (use-package evil :ensure t + :init + (setq evil-want-integration t) + (setq evil-want-keybinding nil) :config (evil-mode 1) (global-undo-tree-mode) (evil-set-undo-system 'undo-tree) (global-display-line-numbers-mode)) -(use-package evil-collection - :ensure t - :config - (evil-collection-init)) -(use-package evil-surround - :ensure t +(use-package evil-collection :ensure t + :after evil + :config + (evil-collection-init) + :custom + (evil-collection-setup-minibuffer t)) +(use-package evil-surround :ensure t + :after evil :config (global-evil-surround-mode 1) (evil-define-key 'visual evil-surround-mode-map "s" 'evil-surround-region)) From daa736aee6a450ae6d881229b0bb0772bed615b4 Mon Sep 17 00:00:00 2001 From: Stefan Schwarz Date: Fri, 8 Jul 2022 14:18:27 +0200 Subject: [PATCH 60/83] remove jira integration --- init.el | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/init.el b/init.el index 7438d9f..2feb894 100644 --- a/init.el +++ b/init.el @@ -187,10 +187,8 @@ (use-package lsp-pyright :ensure t :hook (python-mode . (lambda () (require 'lsp-pyright) (lsp)))) + ;; code-with-fun -(use-package org-jira :ensure t - :config - (setq jiralib-url "https://coordinatr.thomann.de")) (use-package evil-org :ensure t :after org :hook (org-mode . (lambda () evil-org-mode))) From f7fe5de02319c5df8540510890425082254ef56c Mon Sep 17 00:00:00 2001 From: Stefan Schwarz Date: Fri, 8 Jul 2022 14:18:51 +0200 Subject: [PATCH 61/83] cleanup org setup --- init.el | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/init.el b/init.el index 2feb894..5523032 100644 --- a/init.el +++ b/init.el @@ -193,13 +193,13 @@ :after org :hook (org-mode . (lambda () evil-org-mode))) (use-package org-roam - :ensure t - :init - (setq org-roam-v2-ack t) - :custom - (org-roam-directory (file-truename "~/Sync/RoamNotes")) - :config - (org-roam-db-autosync-mode)) + :ensure t + :init + (setq org-roam-v2-ack t) + :custom + (org-roam-directory (file-truename "~/Sync/RoamNotes")) + :config + (org-roam-db-autosync-mode)) (use-package direnv :ensure t :config (direnv-mode)) From 3da203460bd3026c335f91e6d52b0e531a04ef15 Mon Sep 17 00:00:00 2001 From: Stefan Schwarz Date: Thu, 14 Jul 2022 10:45:57 +0200 Subject: [PATCH 62/83] update gitignore --- .gitignore | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index fa3ed0e..8fceba4 100644 --- a/.gitignore +++ b/.gitignore @@ -1,9 +1,22 @@ /auto-save-list +/%backup%~ /backups -/elpa -/recentf +/bookmarks /.cache +/elpa +/elpa_ +/eshell +/games +/ktramp.el +/kubernetes-tramp.el /.lsp-session-v1 +/org-roam.db /projectile-bookmarks.eld +/projectile.cache +/recentf +/request +/tamp +/tramp /transient/ -projectile.cache +/undo-tree-hist +/url From 62a28e5a2d3b735f026f7087500dbe2e9c6a94e7 Mon Sep 17 00:00:00 2001 From: Stefan Schwarz Date: Thu, 14 Jul 2022 10:46:07 +0200 Subject: [PATCH 63/83] replace ivy with helm --- init.el | 160 ++++++++++++++++++++------------------------------------ 1 file changed, 56 insertions(+), 104 deletions(-) diff --git a/init.el b/init.el index 5523032..70298fe 100644 --- a/init.el +++ b/init.el @@ -25,10 +25,6 @@ (setq display-line-numbers 'relative) ; show relative line-numers (setq column-number-mode t) ; show column number -;; global keybindings -(global-set-key (kbd "C-k") 'previous-line) -(global-set-key (kbd "C-j") 'next-line) - ;; package manager (require 'package) (setq package-enable-at-startup nil) ; tells emacs not to load any packages before starting up @@ -81,34 +77,46 @@ (use-package evil-matchit :ensure t :config (global-evil-matchit-mode 1)) -;; ivy config -(use-package ivy :ensure t +;; helm config +(use-package helm :ensure t + :bind ( + ([remap apropos] . helm-apropos) + ([remap find-library] . helm-locate-library) + ([remap bookmark-jump] . helm-bookmarks) + ([remap execute-extended-command] . helm-M-x) + ([remap find-file] . helm-find-files) + ([remap imenu-anywhere] . helm-imenu-anywhere) + ([remap imenu] . helm-semantic-or-imenu) + ([remap noop-show-kill-ring] . helm-show-kill-ring) + ([remap persp-switch-to-buffer] . helm-mini) + ([remap switch-to-buffer] . helm-buffers-list) + ([remap projectile-find-file] . helm-projectile-find-file) + ([remap projectile-recentf] . helm-projectile-recentf) + ([remap projectile-switch-project] . helm-projectile-switch-project) + ([remap projectile-switch-to-buffer] . helm-projectile-switch-to-buffer) + ([remap recentf-open-files] . helm-recentf) + :map helm-map ( + ("C-j" . helm-next-line) + ("C-k" . helm-previous-line) + ("C-h" . helm-find-files-up-one-level) + ("C-l" . helm-ff-RET) + ("ESC" . abort-recursive-edit))) + ("DOWN" . helm-next-line) + ("UP" . helm-previous-line) + ("LEFT" . helm-find-files-up-one-level) + ("RIGHT" . helm-ff-RET) + :preface + (setq + helm-display-header-line nil + helm-find-files-doc-header nil + helm-display-buffer-default-height 0.25) + :init :config - (ivy-mode) - (setq ivy-height 10) - (setq ivy-use-virtual-buffers t) - (setq enable-recursive-minibuffers t) - (setq ivy-re-builders-alist - '((swiper . ivy--regex-plus) - (t . ivy--regex-plus))) - (define-key ivy-minibuffer-map (kbd "C-h") (kbd "DEL")) - (define-key ivy-minibuffer-map (kbd "C-j") 'ivy-next-line) - (define-key ivy-minibuffer-map (kbd "C-k") 'ivy-previous-line) - (define-key ivy-minibuffer-map (kbd "C-l") 'ivy-alt-done) - (define-key ivy-minibuffer-map (kbd "C-S-h") help-map) - (define-key ivy-minibuffer-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 - :config (ivy-rich-mode 1)) - -;; counsel -(use-package counsel :ensure t - :config - (counsel-mode 1) - (setq counsel-fzf-cmd "fd -E .git -H -c never \"%s\"")) -(use-package counsel-projectile :ensure t) -(use-package swiper :ensure t) + (require 'helm-config)) +(use-package helm-lsp :ensure t) +(use-package helm-company :ensure t) +(use-package swiper-helm :ensure t) +(use-package helm-projectile :ensure t) ;; projectile (use-package projectile :ensure t @@ -181,8 +189,6 @@ :config (setq rust-format-on-save t) (add-hook 'rust-mode-hook (lambda () (setq indent-tabs-mode nil)))) -;; bazel / starlak -(use-package bazel-mode :ensure t) ;; python (use-package lsp-pyright :ensure t @@ -192,14 +198,6 @@ (use-package evil-org :ensure t :after org :hook (org-mode . (lambda () evil-org-mode))) -(use-package org-roam - :ensure t - :init - (setq org-roam-v2-ack t) - :custom - (org-roam-directory (file-truename "~/Sync/RoamNotes")) - :config - (org-roam-db-autosync-mode)) (use-package direnv :ensure t :config (direnv-mode)) @@ -251,13 +249,10 @@ (lsp-register-client (make-lsp-client :new-connection - (lsp-stdio-connection '("bundle" - "exec" - "--keep-file-descriptors" - "/nix/store/pgjhgk5d41q6jjxiympqjs3qzxf52mg9-puppet-editor-services-9fd4984/puppet-languageserver" - "--local-workspace=/home/stefan/git/sysadmin/puppet" - "--debug=/tmp/puplsp" - "--stdio")) + (lsp-stdio-connection + '("bundle" "exec" "--keep-file-descriptors" + "/nix/store/pgjhgk5d41q6jjxiympqjs3qzxf52mg9-puppet-editor-services-9fd4984/puppet-languageserver" + "--local-workspace=/home/stefan/git/sysadmin/puppet" "--debug=/tmp/puplsp" "--stdio")) :environment-fn (lambda() '(("BUNDLE_GEMFILE" . "/home/stefan/Apps/puppet-editor-services/Gemfile"))) :major-modes '(puppet-mode) :server-id 'puppet-languageserver)) @@ -293,8 +288,7 @@ (lsp-register-client (make-lsp-client :new-connection - (lsp-stdio-connection - '("nix-shell" "-p" "rnix-lsp" "--run" "rnix-lsp")) + (lsp-stdio-connection '("nix-shell" "-p" "rnix-lsp" "--run" "rnix-lsp")) :major-modes '(nix-mode) :server-id 'nix)) (add-to-list 'lsp-language-id-configuration '(nix-mode . "nix-custom")) @@ -311,9 +305,6 @@ :init (global-flycheck-mode)) (use-package lsp-ui :ensure 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) @@ -335,10 +326,9 @@ :non-normal-prefix "C-SPC" ;; simple command - "SPC" 'counsel-M-x + "SPC" 'helm-M-x "'" '(iterm-focus :which-key "iterm") "?" '(iterm-goto-filedir-or-home :which-key "iterm - goto dir") - "/" 'counsel-ag "TAB" '(foo/switch-to-last-buffer :which-key "prev buffer") ;; Applications @@ -348,17 +338,16 @@ ;; Buffers "b" '(:ignore t :which-key "Buffers") - "bb" 'switch-to-buffer + "bb" 'helm-buffers-list "bd" 'evil-delete-buffer "bn" 'next-buffer "bn" 'next-buffer + "br" 'helm-recentf "bs" 'foo/switch-to-scratch-buffer ;; Files - "ff" 'counsel-find-file - "fg" 'counsel-rg - "fL" 'counsel-locate - "fr" 'counsel-recentf + "ff" 'helm-find-files + "fr" 'helm-recentf "fR" 'foo/rename-current-buffer-file "fD" 'foo/delete-current-buffer-file "fc" 'foo/copy-file' @@ -390,55 +379,17 @@ ;; Projectile "p" '(:ignore t :which-key "Projectile") - "p SPC" 'counsel-projectile - "pb" 'counsel-projectile-switch-to-buffer - "pd" 'counsel-projectile-find-dir - "pp" 'counsel-projectile-switch-project - "pf" 'counsel-fzf - "pr" 'projectile-recentf + "pb" 'helm-projectile-switch-to-buffer + "pd" 'helm-projectile-find-dir + "pp" 'helm-projectile-switch-project + "pf" 'helm-projectile-find-file + "pr" 'helm-projectile-recentf ;; Swyper "s" '(:ignore t :which-key "Swyper") - "ss" 'swiper - "sb" 'swiper-all + "ss" 'swiper-helm "sw" 'avy-goto-word-0 - ;; Treemacs - "ft" 'treemacs - "fB" 'treemacs-bookmark - "fT" 'treemacs-find-file - "f M-t" 'treemacs-find-tag - - ;; Jira - "jpg" 'org-jira-get-projects - "jib" 'org-jira-browse-issue - "jig" 'org-jira-get-issues - "jij" 'org-jira-get-issues-from-custom-jql - "jih" 'org-jira-get-issues-headonly - "jiu" 'org-jira-update-issue - "jiw" 'org-jira-progress-issue - "jin" 'org-jira-progress-issue-next - "jia" 'org-jira-assign-issue - "jir" 'org-jira-refresh-issue - "jiR" 'org-jira-refresh-issues-in-buffer - "jic" 'org-jira-create-issue - "jik" 'org-jira-copy-current-issue-key - "jsc" 'org-jira-create-subtask - "jsg" 'org-jira-get-subtasks - "jcc" 'org-jira-add-comment - "jcu" 'org-jira-update-comment - "jwu" 'org-jira-update-worklogs-from-org-clocks - "jtj" 'org-jira-todo-to-jira - "jif" 'org-jira-get-issues-by-fixversion - - ;; Roam - "rl" 'org-roam-buffer-toggle - "rf" 'org-roam-node-find - "rg" 'org-roam-graph - "ri" 'org-roam-node-insert - "rc" 'org-roam-capture - "rj" 'org-roam-dailies-capture-today - ;; Window "w" '(:ignore t :which-key "Window") "w=" 'balance-windows-area @@ -596,6 +547,7 @@ initialized with the current directory instead of filename." '(auth-source-save-behavior nil) '(custom-safe-themes '("234dbb732ef054b109a9e5ee5b499632c63cc24f7c2383a849815dacc1727cb6" "a0be7a38e2de974d1598cf247f607d5c1841dbcef1ccd97cded8bea95a7c7639" "47db50ff66e35d3a440485357fb6acb767c100e135ccdf459060407f8baea7b2" "1704976a1797342a1b4ea7a75bdbb3be1569f4619134341bd5a4c1cfb16abad4" "0d01e1e300fcafa34ba35d5cf0a21b3b23bc4053d388e352ae6a901994597ab1" "835868dcd17131ba8b9619d14c67c127aa18b90a82438c8613586331129dda63" "da186cce19b5aed3f6a2316845583dbee76aea9255ea0da857d1c058ff003546" "8d7b028e7b7843ae00498f68fad28f3c6258eda0650fe7e17bfb017d51d0e2a2" "1278c5f263cdb064b5c86ab7aa0a76552082cf0189acf6df17269219ba496053" "e19ac4ef0f028f503b1ccafa7c337021834ce0d1a2bca03fcebc1ef635776bea" "78e6be576f4a526d212d5f9a8798e5706990216e9be10174e3f3b015b8662e27" "7a7b1d475b42c1a0b61f3b1d1225dd249ffa1abb1b7f726aec59ac7ca3bf4dae" "6c98bc9f39e8f8fd6da5b9c74a624cbb3782b4be8abae8fd84cbc43053d7c175" "d47f868fd34613bd1fc11721fe055f26fd163426a299d45ce69bef1f109e1e71" "745d03d647c4b118f671c49214420639cb3af7152e81f132478ed1c649d4597d" "a7b20039f50e839626f8d6aa96df62afebb56a5bbd1192f557cb2efb5fcfb662" "246a9596178bb806c5f41e5b571546bb6e0f4bd41a9da0df5dfbca7ec6e2250c" "d268b67e0935b9ebc427cad88ded41e875abfcc27abd409726a92e55459e0d01" "3d54650e34fa27561eb81fc3ceed504970cc553cfd37f46e8a80ec32254a3ec3" "613aedadd3b9e2554f39afe760708fc3285bf594f6447822dd29f947f0775d6c" "f91395598d4cb3e2ae6a2db8527ceb83fed79dbaf007f435de3e91e5bda485fb" "711efe8b1233f2cf52f338fd7f15ce11c836d0b6240a18fffffc2cbd5bfe61b0" "01cf34eca93938925143f402c2e6141f03abb341f27d1c2dba3d50af9357ce70" "37144b437478e4c235824f0e94afa740ee2c7d16952e69ac3c5ed4352209eefb" "93ed23c504b202cf96ee591138b0012c295338f38046a1f3c14522d4a64d7308" "f7216d3573e1bd2a2b47a2331f368b45e7b5182ddbe396d02b964b1ea5c5dc27" "c4bdbbd52c8e07112d1bfd00fee22bf0f25e727e95623ecb20c4fa098b74c1bd" "f2927d7d87e8207fa9a0a003c0f222d45c948845de162c885bf6ad2a255babfd" "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)) + '(helm-minibuffer-history-key "M-p") '(package-selected-packages '(direnv 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)) From dc270f5506e210d2f71908b1817ac2c66d5564a7 Mon Sep 17 00:00:00 2001 From: Stefan Schwarz Date: Thu, 14 Jul 2022 12:33:36 +0200 Subject: [PATCH 64/83] cleanup --- init.el | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/init.el b/init.el index 70298fe..fd1c9cc 100644 --- a/init.el +++ b/init.el @@ -28,9 +28,9 @@ ;; package manager (require 'package) (setq package-enable-at-startup nil) ; tells emacs not to load any packages before starting up -(setq package-archives '(("org" . "http://orgmode.org/elpa/") - ("gnu" . "http://elpa.gnu.org/packages/") - ("melpa" . "https://melpa.org/packages/"))) +(setq package-archives '(("org" . "http://orgmode.org/elpa/") + ("gnu" . "http://elpa.gnu.org/packages/") + ("melpa" . "https://melpa.org/packages/"))) (package-initialize) ;; use package From 0b903d3bdaf0f7aee24d6996a91031823f68aba2 Mon Sep 17 00:00:00 2001 From: Stefan Schwarz Date: Thu, 14 Jul 2022 12:33:49 +0200 Subject: [PATCH 65/83] more helm --- init.el | 64 +++++++++++++++++++++++++++++++++++---------------------- 1 file changed, 40 insertions(+), 24 deletions(-) diff --git a/init.el b/init.el index fd1c9cc..c296414 100644 --- a/init.el +++ b/init.el @@ -80,39 +80,41 @@ ;; helm config (use-package helm :ensure t :bind ( - ([remap apropos] . helm-apropos) - ([remap find-library] . helm-locate-library) - ([remap bookmark-jump] . helm-bookmarks) - ([remap execute-extended-command] . helm-M-x) - ([remap find-file] . helm-find-files) - ([remap imenu-anywhere] . helm-imenu-anywhere) - ([remap imenu] . helm-semantic-or-imenu) - ([remap noop-show-kill-ring] . helm-show-kill-ring) - ([remap persp-switch-to-buffer] . helm-mini) - ([remap switch-to-buffer] . helm-buffers-list) - ([remap projectile-find-file] . helm-projectile-find-file) - ([remap projectile-recentf] . helm-projectile-recentf) - ([remap projectile-switch-project] . helm-projectile-switch-project) + ([remap apropos] . helm-apropos) + ([remap find-library] . helm-locate-library) + ([remap bookmark-jump] . helm-bookmarks) + ([remap execute-extended-command] . helm-M-x) + ([remap find-file] . helm-find-files) + ([remap imenu-anywhere] . helm-imenu-anywhere) + ([remap imenu] . helm-semantic-or-imenu) + ([remap noop-show-kill-ring] . helm-show-kill-ring) + ([remap persp-switch-to-buffer] . helm-mini) + ([remap switch-to-buffer] . helm-buffers-list) + ([remap projectile-find-file] . helm-projectile-find-file) + ([remap projectile-recentf] . helm-projectile-recentf) + ([remap projectile-switch-project] . helm-projectile-switch-project) ([remap projectile-switch-to-buffer] . helm-projectile-switch-to-buffer) - ([remap recentf-open-files] . helm-recentf) - :map helm-map ( - ("C-j" . helm-next-line) + ([remap recentf-open-files] . helm-recentf) + :map helm-map ("C-k" . helm-previous-line) + ("C-j" . helm-next-line) + ("C-p" . helm-previous-line) + ("C-n" . helm-next-line) ("C-h" . helm-find-files-up-one-level) ("C-l" . helm-ff-RET) - ("ESC" . abort-recursive-edit))) - ("DOWN" . helm-next-line) - ("UP" . helm-previous-line) - ("LEFT" . helm-find-files-up-one-level) - ("RIGHT" . helm-ff-RET) + ("C-v" . evil-paste-from-register) + ("ESC" . abort-recursive-edit)) :preface (setq + helm-display-buffer-default-height 0.25 helm-display-header-line nil + helm-ff-file-name-history-use-recentf t helm-find-files-doc-header nil - helm-display-buffer-default-height 0.25) - :init + helm-mode-line-string nil + helm-move-to-line-cycle-in-source t) :config - (require 'helm-config)) + (require 'helm-config) + (helm-mode 1)) (use-package helm-lsp :ensure t) (use-package helm-company :ensure t) (use-package swiper-helm :ensure t) @@ -317,6 +319,7 @@ ;; general config (use-package general :ensure t :config + (global-set-key [escape] #'helm-or-evil-escape) (menu-bar-mode -1) (toggle-scroll-bar -1) (tool-bar-mode -1) @@ -428,6 +431,19 @@ ;; custom functions +(defun foo/helm-or-evil-escape () + "Escape from anything." + (interactive) + (cond ((minibuffer-window-active-p (minibuffer-window)) + ;; quit the minibuffer if open. + (abort-recursive-edit)) + ;; Run all escape hooks. If any returns non-nil, then stop there. + ;; ((cl-find-if #'funcall doom-escape-hook)) + ;; don't abort macros + ((or defining-kbd-macro executing-kbd-macro) nil) + ;; Back to the default + ((keyboard-quit)))) + (defun foo/toggle-maximize-buffer () "Maximize buffer." (interactive) (save-excursion From f5dd91bc7b0dec31cb28a9696f304e93f9faf3ed Mon Sep 17 00:00:00 2001 From: Stefan Schwarz Date: Fri, 15 Jul 2022 08:25:09 +0200 Subject: [PATCH 66/83] fix undo redo --- init.el | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/init.el b/init.el index c296414..526123c 100644 --- a/init.el +++ b/init.el @@ -59,8 +59,6 @@ (setq evil-want-keybinding nil) :config (evil-mode 1) - (global-undo-tree-mode) - (evil-set-undo-system 'undo-tree) (global-display-line-numbers-mode)) (use-package evil-collection :ensure t :after evil @@ -76,6 +74,10 @@ (use-package evil-matchit :ensure t :config (global-evil-matchit-mode 1)) +(use-package undo-tree :ensure t + :config + (global-undo-tree-mode) + (evil-set-undo-system 'undo-tree)) ;; helm config (use-package helm :ensure t From 6931970496b418d78758a71846654ddb7c6b9626 Mon Sep 17 00:00:00 2001 From: Stefan Schwarz Date: Mon, 18 Jul 2022 08:50:47 +0200 Subject: [PATCH 67/83] fix helm C-jk bindings --- init.el | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/init.el b/init.el index 526123c..229aa4e 100644 --- a/init.el +++ b/init.el @@ -60,6 +60,9 @@ :config (evil-mode 1) (global-display-line-numbers-mode)) + (define-key evil-insert-state-map (kbd "C-k") nil) + (define-key evil-insert-state-map (kbd "C-v") nil) + (define-key evil-insert-state-map (kbd "C-v") 'evil-paste-after) (use-package evil-collection :ensure t :after evil :config @@ -104,7 +107,6 @@ ("C-n" . helm-next-line) ("C-h" . helm-find-files-up-one-level) ("C-l" . helm-ff-RET) - ("C-v" . evil-paste-from-register) ("ESC" . abort-recursive-edit)) :preface (setq @@ -389,6 +391,8 @@ "pp" 'helm-projectile-switch-project "pf" 'helm-projectile-find-file "pr" 'helm-projectile-recentf + "pg" 'helm-ag + "/" 'helm-ag ;; Swyper "s" '(:ignore t :which-key "Swyper") @@ -567,7 +571,7 @@ initialized with the current directory instead of filename." '("234dbb732ef054b109a9e5ee5b499632c63cc24f7c2383a849815dacc1727cb6" "a0be7a38e2de974d1598cf247f607d5c1841dbcef1ccd97cded8bea95a7c7639" "47db50ff66e35d3a440485357fb6acb767c100e135ccdf459060407f8baea7b2" "1704976a1797342a1b4ea7a75bdbb3be1569f4619134341bd5a4c1cfb16abad4" "0d01e1e300fcafa34ba35d5cf0a21b3b23bc4053d388e352ae6a901994597ab1" "835868dcd17131ba8b9619d14c67c127aa18b90a82438c8613586331129dda63" "da186cce19b5aed3f6a2316845583dbee76aea9255ea0da857d1c058ff003546" "8d7b028e7b7843ae00498f68fad28f3c6258eda0650fe7e17bfb017d51d0e2a2" "1278c5f263cdb064b5c86ab7aa0a76552082cf0189acf6df17269219ba496053" "e19ac4ef0f028f503b1ccafa7c337021834ce0d1a2bca03fcebc1ef635776bea" "78e6be576f4a526d212d5f9a8798e5706990216e9be10174e3f3b015b8662e27" "7a7b1d475b42c1a0b61f3b1d1225dd249ffa1abb1b7f726aec59ac7ca3bf4dae" "6c98bc9f39e8f8fd6da5b9c74a624cbb3782b4be8abae8fd84cbc43053d7c175" "d47f868fd34613bd1fc11721fe055f26fd163426a299d45ce69bef1f109e1e71" "745d03d647c4b118f671c49214420639cb3af7152e81f132478ed1c649d4597d" "a7b20039f50e839626f8d6aa96df62afebb56a5bbd1192f557cb2efb5fcfb662" "246a9596178bb806c5f41e5b571546bb6e0f4bd41a9da0df5dfbca7ec6e2250c" "d268b67e0935b9ebc427cad88ded41e875abfcc27abd409726a92e55459e0d01" "3d54650e34fa27561eb81fc3ceed504970cc553cfd37f46e8a80ec32254a3ec3" "613aedadd3b9e2554f39afe760708fc3285bf594f6447822dd29f947f0775d6c" "f91395598d4cb3e2ae6a2db8527ceb83fed79dbaf007f435de3e91e5bda485fb" "711efe8b1233f2cf52f338fd7f15ce11c836d0b6240a18fffffc2cbd5bfe61b0" "01cf34eca93938925143f402c2e6141f03abb341f27d1c2dba3d50af9357ce70" "37144b437478e4c235824f0e94afa740ee2c7d16952e69ac3c5ed4352209eefb" "93ed23c504b202cf96ee591138b0012c295338f38046a1f3c14522d4a64d7308" "f7216d3573e1bd2a2b47a2331f368b45e7b5182ddbe396d02b964b1ea5c5dc27" "c4bdbbd52c8e07112d1bfd00fee22bf0f25e727e95623ecb20c4fa098b74c1bd" "f2927d7d87e8207fa9a0a003c0f222d45c948845de162c885bf6ad2a255babfd" "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)) '(helm-minibuffer-history-key "M-p") '(package-selected-packages - '(direnv 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)) + '(helm-ag undo-tree direnv 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. From d8d6794eda6084c2178932c7fb016a6c06c685f4 Mon Sep 17 00:00:00 2001 From: Stefan Schwarz Date: Mon, 18 Jul 2022 08:51:01 +0200 Subject: [PATCH 68/83] ripgrep options --- init.el | 3 +++ 1 file changed, 3 insertions(+) diff --git a/init.el b/init.el index 229aa4e..d939c80 100644 --- a/init.el +++ b/init.el @@ -123,6 +123,9 @@ (use-package helm-company :ensure t) (use-package swiper-helm :ensure t) (use-package helm-projectile :ensure t) +(use-package helm-ag :ensure t + :config + (setq helm-ag-base-command "rg --vimgrep --no-heading --smart-case")) ;; projectile (use-package projectile :ensure t From 6ba2386c28fbd69089244c82c7423889bb609162 Mon Sep 17 00:00:00 2001 From: Stefan Schwarz Date: Mon, 18 Jul 2022 11:49:23 +0200 Subject: [PATCH 69/83] fix indent --- init.el | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/init.el b/init.el index d939c80..bad9833 100644 --- a/init.el +++ b/init.el @@ -110,12 +110,12 @@ ("ESC" . abort-recursive-edit)) :preface (setq - helm-display-buffer-default-height 0.25 - helm-display-header-line nil - helm-ff-file-name-history-use-recentf t - helm-find-files-doc-header nil - helm-mode-line-string nil - helm-move-to-line-cycle-in-source t) + helm-display-buffer-default-height 0.25 + helm-display-header-line nil + helm-ff-file-name-history-use-recentf t + helm-find-files-doc-header nil + helm-mode-line-string nil + helm-move-to-line-cycle-in-source t) :config (require 'helm-config) (helm-mode 1)) From 1a2bcef321250f40cb1753fc1a6cb880fa0af65d Mon Sep 17 00:00:00 2001 From: Stefan Schwarz Date: Mon, 18 Jul 2022 11:58:12 +0200 Subject: [PATCH 70/83] cleanup evil colleciton and surround --- init.el | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/init.el b/init.el index bad9833..e91106f 100644 --- a/init.el +++ b/init.el @@ -63,18 +63,13 @@ (define-key evil-insert-state-map (kbd "C-k") nil) (define-key evil-insert-state-map (kbd "C-v") nil) (define-key evil-insert-state-map (kbd "C-v") 'evil-paste-after) -(use-package evil-collection :ensure t - :after evil - :config - (evil-collection-init) - :custom - (evil-collection-setup-minibuffer t)) (use-package evil-surround :ensure t :after evil - :config - (global-evil-surround-mode 1) - (evil-define-key 'visual evil-surround-mode-map "s" 'evil-surround-region)) - + :config (global-evil-surround-mode 1)) +(use-package evil-collection :ensure t + :after evil + :config (evil-collection-init) + :custom (evil-collection-setup-minibuffer t)) (use-package evil-matchit :ensure t :config (global-evil-matchit-mode 1)) (use-package undo-tree :ensure t @@ -517,6 +512,7 @@ initialized with the current directory instead of filename." (yes-or-no-p (format "Create directory '%s'?" dir))) (make-directory dir t))) + (rename-file filename new-name 1) (rename-buffer new-name) (set-visited-file-name new-name) From b367cc7b6ef129cff8827245b7cb8caf5e143ab6 Mon Sep 17 00:00:00 2001 From: Stefan Schwarz Date: Mon, 18 Jul 2022 12:04:06 +0200 Subject: [PATCH 71/83] fix l&k keybindings --- init.el | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/init.el b/init.el index e91106f..17b6414 100644 --- a/init.el +++ b/init.el @@ -100,9 +100,15 @@ ("C-j" . helm-next-line) ("C-p" . helm-previous-line) ("C-n" . helm-next-line) + ("C-h" . nil) ("C-h" . helm-find-files-up-one-level) + ("C-l" . nil) ("C-l" . helm-ff-RET) - ("ESC" . abort-recursive-edit)) + ("ESC" . abort-recursive-edit) + :map helm-find-files-map + ("C-l" . nil) + ("C-l" . helm-ff-RET) + ) :preface (setq helm-display-buffer-default-height 0.25 From 82b1900b7b2e56fd5a2fff5cb460ff52a65574c4 Mon Sep 17 00:00:00 2001 From: Stefan Schwarz Date: Tue, 24 Jan 2023 11:43:34 +0100 Subject: [PATCH 72/83] fix scrollbar mode --- init.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/init.el b/init.el index 17b6414..8953eaf 100644 --- a/init.el +++ b/init.el @@ -329,7 +329,7 @@ :config (global-set-key [escape] #'helm-or-evil-escape) (menu-bar-mode -1) - (toggle-scroll-bar -1) + (scroll-bar-mode -1) (tool-bar-mode -1) (general-define-key :states '(normal visual insert emacs) From c6064eca173752e67e6325cea1373ac3dc98c440 Mon Sep 17 00:00:00 2001 From: Stefan Schwarz Date: Tue, 14 Mar 2023 16:02:21 +0100 Subject: [PATCH 73/83] add W as write --- init.el | 1 + 1 file changed, 1 insertion(+) diff --git a/init.el b/init.el index 8953eaf..79706ce 100644 --- a/init.el +++ b/init.el @@ -60,6 +60,7 @@ :config (evil-mode 1) (global-display-line-numbers-mode)) + (evil-ex-define-cmd "W[rite]" 'evil-write) (define-key evil-insert-state-map (kbd "C-k") nil) (define-key evil-insert-state-map (kbd "C-v") nil) (define-key evil-insert-state-map (kbd "C-v") 'evil-paste-after) From 9397be5f4395493736dcb6ddad43d0aad6bcd4f0 Mon Sep 17 00:00:00 2001 From: Stefan Schwarz Date: Tue, 14 Mar 2023 16:03:18 +0100 Subject: [PATCH 74/83] light mode --- init.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/init.el b/init.el index 79706ce..10deda5 100644 --- a/init.el +++ b/init.el @@ -42,7 +42,7 @@ ;; themes (use-package doom-themes :ensure t :config - (load-theme 'doom-dracula t) + (load-theme 'doom-one-light t) (rainbow-mode)) (use-package doom-modeline :ensure t :hook (after-init . doom-modeline-mode)) From a931c4d44d8f8adc96da9d2b616e08d11bee23b9 Mon Sep 17 00:00:00 2001 From: Stefan Schwarz Date: Fri, 15 Sep 2023 11:37:48 +0200 Subject: [PATCH 75/83] feat(treemacs): add --- init.el | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/init.el b/init.el index 10deda5..4cc1638 100644 --- a/init.el +++ b/init.el @@ -133,6 +133,17 @@ (use-package projectile :ensure t :config (projectile-mode +1)) +;; treemacs +(use-package treemacs :ensure t) +(use-package treemacs-evil :ensure t + :after (treemacs evil)) +(use-package treemacs-projectile :ensure t + :after (treemacs projectile)) +(use-package lsp-treemacs :ensure t + :after (treemacs lsp) + :config + (lsp-treemacs-sync-mode 1)) + ;; which key (use-package which-key :ensure t :config From 95135255ebcb67bff70a4ff394b04292378a4db9 Mon Sep 17 00:00:00 2001 From: Stefan Schwarz Date: Fri, 15 Sep 2023 11:38:02 +0200 Subject: [PATCH 76/83] chore(terraform): cleanup --- init.el | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/init.el b/init.el index 4cc1638..0470d13 100644 --- a/init.el +++ b/init.el @@ -161,7 +161,8 @@ :mode "\\.nix\\'") ;; terraform (use-package terraform-mode :ensure t - :config (add-hook 'terraform-mode-hook #'terraform-format-on-save-mode)) + :config + (add-hook 'terraform-mode-hook #'terraform-format-on-save-mode)) ;; rego (use-package rego-mode :ensure t) ;; vue From 42289b0d6ee8f150d3a46e14051c6dc7841ab9fb Mon Sep 17 00:00:00 2001 From: Stefan Schwarz Date: Fri, 15 Sep 2023 11:38:22 +0200 Subject: [PATCH 77/83] fix(python): remove pywright --- init.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/init.el b/init.el index 0470d13..33e6241 100644 --- a/init.el +++ b/init.el @@ -213,9 +213,9 @@ (setq rust-format-on-save t) (add-hook 'rust-mode-hook (lambda () (setq indent-tabs-mode nil)))) ;; python -(use-package lsp-pyright +(use-package python-black :ensure t - :hook (python-mode . (lambda () (require 'lsp-pyright) (lsp)))) + :hook (python-mode . python-black-on-save-mode-enable-dwim)) ;; code-with-fun (use-package evil-org :ensure t From 0c7b27339283991ebd522873578888ac3ff7f49f Mon Sep 17 00:00:00 2001 From: Stefan Schwarz Date: Fri, 15 Sep 2023 11:38:37 +0200 Subject: [PATCH 78/83] fix(general): fix escape key --- init.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/init.el b/init.el index 33e6241..ea239c2 100644 --- a/init.el +++ b/init.el @@ -340,7 +340,7 @@ ;; general config (use-package general :ensure t :config - (global-set-key [escape] #'helm-or-evil-escape) + (global-set-key [escape] #'foo/helm-or-evil-escape) (menu-bar-mode -1) (scroll-bar-mode -1) (tool-bar-mode -1) From f01c9be2cf48031eb4ce237879951dd944ab6b24 Mon Sep 17 00:00:00 2001 From: Stefan Schwarz Date: Tue, 12 Mar 2024 14:56:55 +0100 Subject: [PATCH 79/83] feat: recentf --- init.el | 1 + 1 file changed, 1 insertion(+) diff --git a/init.el b/init.el index ea239c2..bc20a32 100644 --- a/init.el +++ b/init.el @@ -24,6 +24,7 @@ (setq mouse-autoselect-window nil) ; stop popups from getting focus (setq display-line-numbers 'relative) ; show relative line-numers (setq column-number-mode t) ; show column number +(recentf-mode 1) ;; package manager (require 'package) From 9626c60fdd3cc62dac2d9a763e8dd46c05820507 Mon Sep 17 00:00:00 2001 From: Stefan Schwarz Date: Tue, 12 Mar 2024 14:57:15 +0100 Subject: [PATCH 80/83] evil escape for better escaping --- init.el | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/init.el b/init.el index bc20a32..b22270d 100644 --- a/init.el +++ b/init.el @@ -78,6 +78,10 @@ :config (global-undo-tree-mode) (evil-set-undo-system 'undo-tree)) +(use-package evil-escape :ensure t + :config + (setq-default evil-escape-delay 0.2) + (evil-escape-mode 1)) ;; helm config (use-package helm :ensure t @@ -341,7 +345,8 @@ ;; general config (use-package general :ensure t :config - (global-set-key [escape] #'foo/helm-or-evil-escape) + (global-set-key (kbd "") 'evil-escape) + (global-set-key (kbd "C-c C-g") 'evil-escape) (menu-bar-mode -1) (scroll-bar-mode -1) (tool-bar-mode -1) From be13a7de2df5cf02243f1745c6ddd38e19824505 Mon Sep 17 00:00:00 2001 From: Stefan Schwarz Date: Tue, 12 Mar 2024 14:58:09 +0100 Subject: [PATCH 81/83] markdown image size --- init.el | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/init.el b/init.el index b22270d..0fb094c 100644 --- a/init.el +++ b/init.el @@ -205,7 +205,8 @@ ) (use-package markdown-mode :ensure t :config - (add-hook 'markdown-mode-hook (lambda () (setq indent-tabs-mode nil)))) + (add-hook 'markdown-mode-hook (lambda () (setq indent-tabs-mode nil))) + (set-variable 'markdown-max-image-size '(800 . 600))) ;; php (use-package php-mode :ensure t) ;; k8s From 0ad243c895251f8c73166d51146fd0f62c2449bd Mon Sep 17 00:00:00 2001 From: Stefan Schwarz Date: Tue, 12 Mar 2024 14:58:13 +0100 Subject: [PATCH 82/83] graphql mode --- init.el | 1 + 1 file changed, 1 insertion(+) diff --git a/init.el b/init.el index 0fb094c..fa22626 100644 --- a/init.el +++ b/init.el @@ -254,6 +254,7 @@ (setq company-idle-delay 0.1 company-minimum-prefix-length 2 company-require-match nil)) +(use-package graphql-mode :ensure t) (use-package highlight-indentation :ensure t) From 5d6057567c286c1d45a2264978d7e7043bd2a85a Mon Sep 17 00:00:00 2001 From: Stefan Schwarz Date: Thu, 6 Mar 2025 10:15:08 +0100 Subject: [PATCH 83/83] up --- .gitignore | 3 +++ init.el | 51 ++++++++++++++++++++++++++++++++++++++++++++++----- 2 files changed, 49 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 8fceba4..4345855 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,6 @@ /transient/ /undo-tree-hist /url +/.lsp-eslint-choices +/eln-cache/ +/quelpa/ diff --git a/init.el b/init.el index fa22626..45fee24 100644 --- a/init.el +++ b/init.el @@ -140,6 +140,7 @@ ;; treemacs (use-package treemacs :ensure t) +(use-package all-the-icons :ensure t) (use-package treemacs-evil :ensure t :after (treemacs evil)) (use-package treemacs-projectile :ensure t @@ -158,6 +159,11 @@ (setq which-key-idle-delay .3) ) +;; jira +(use-package org-jira :ensure t + :config + (jiralib-url "https://thomannio.atlassian.net")) + ;; langs ;; @@ -258,12 +264,24 @@ (use-package highlight-indentation :ensure t) +(use-package quelpa-use-package :ensure t) +(use-package copilot :ensure t + :after evil + :quelpa (copilot :fetcher github + :repo "zerolfx/copilot.el" + :branch "main" + :files ("dist" "*.el")) + :bind ("C-," . 'copilot-accept-completion) + :hook (go-mode . copilot-mode) + :hook (python-mode . copilot-mode) + :hook (rust-mode . copilot-mode) + ) + ;; lsp (use-package lsp-mode :ensure t :commands (lsp lsp-deferred) :hook (c++-mode . lsp-deferred) - (dockerfile-mode . lsp-deferred) (go-mode . lsp-deferred) (javascript-mode . lsp-deferred) (js2-mode . lsp-deferred) @@ -310,7 +328,7 @@ (make-lsp-client :new-connection (lsp-stdio-connection - '("nix-shell" "-p" "nodePackages.intelephense" "--run" "intelephense --stdio")) + '("nix-shell" "-p" "phpactor" "--run" "phpactor language-server")) :major-modes '(php-mode) :server-id 'php-custom)) (add-to-list 'lsp-language-id-configuration '(puppet-mode . "php-custom")) @@ -424,6 +442,28 @@ "ss" 'swiper-helm "sw" 'avy-goto-word-0 + ;; Ticket (jira) + "tpg" 'org-jira-get-projects + "tib" 'org-jira-browse-issue + "tig" 'org-jira-get-issues + "tij" 'org-jira-get-issues-from-custom-jql + "tih" 'org-jira-get-issues-headonly + "tiu" 'org-jira-update-issue + "tiw" 'org-jira-progress-issue + "tin" 'org-jira-progress-issue-next + "tia" 'org-jira-assign-issue + "tir" 'org-jira-refresh-issue + "tiR" 'org-jira-refresh-issues-in-buffer + "tic" 'org-jira-create-issue + "tik" 'org-jira-copy-current-issue-key + "tsc" 'org-jira-create-subtask + "tsg" 'org-jira-get-subtasks + "tcc" 'org-jira-add-comment + "tcu" 'org-jira-update-comment + "twu" 'org-jira-update-worklogs-from-org-clocks + "ttj" 'org-jira-todo-to-jira + "tif" 'org-jira-get-issues-by-fixversion + ;; Window "w" '(:ignore t :which-key "Window") "w=" 'balance-windows-area @@ -594,11 +634,12 @@ initialized with the current directory instead of filename." ;; If there is more than one, they won't work right. '(auth-source-save-behavior nil) '(custom-safe-themes - '("234dbb732ef054b109a9e5ee5b499632c63cc24f7c2383a849815dacc1727cb6" "a0be7a38e2de974d1598cf247f607d5c1841dbcef1ccd97cded8bea95a7c7639" "47db50ff66e35d3a440485357fb6acb767c100e135ccdf459060407f8baea7b2" "1704976a1797342a1b4ea7a75bdbb3be1569f4619134341bd5a4c1cfb16abad4" "0d01e1e300fcafa34ba35d5cf0a21b3b23bc4053d388e352ae6a901994597ab1" "835868dcd17131ba8b9619d14c67c127aa18b90a82438c8613586331129dda63" "da186cce19b5aed3f6a2316845583dbee76aea9255ea0da857d1c058ff003546" "8d7b028e7b7843ae00498f68fad28f3c6258eda0650fe7e17bfb017d51d0e2a2" "1278c5f263cdb064b5c86ab7aa0a76552082cf0189acf6df17269219ba496053" "e19ac4ef0f028f503b1ccafa7c337021834ce0d1a2bca03fcebc1ef635776bea" "78e6be576f4a526d212d5f9a8798e5706990216e9be10174e3f3b015b8662e27" "7a7b1d475b42c1a0b61f3b1d1225dd249ffa1abb1b7f726aec59ac7ca3bf4dae" "6c98bc9f39e8f8fd6da5b9c74a624cbb3782b4be8abae8fd84cbc43053d7c175" "d47f868fd34613bd1fc11721fe055f26fd163426a299d45ce69bef1f109e1e71" "745d03d647c4b118f671c49214420639cb3af7152e81f132478ed1c649d4597d" "a7b20039f50e839626f8d6aa96df62afebb56a5bbd1192f557cb2efb5fcfb662" "246a9596178bb806c5f41e5b571546bb6e0f4bd41a9da0df5dfbca7ec6e2250c" "d268b67e0935b9ebc427cad88ded41e875abfcc27abd409726a92e55459e0d01" "3d54650e34fa27561eb81fc3ceed504970cc553cfd37f46e8a80ec32254a3ec3" "613aedadd3b9e2554f39afe760708fc3285bf594f6447822dd29f947f0775d6c" "f91395598d4cb3e2ae6a2db8527ceb83fed79dbaf007f435de3e91e5bda485fb" "711efe8b1233f2cf52f338fd7f15ce11c836d0b6240a18fffffc2cbd5bfe61b0" "01cf34eca93938925143f402c2e6141f03abb341f27d1c2dba3d50af9357ce70" "37144b437478e4c235824f0e94afa740ee2c7d16952e69ac3c5ed4352209eefb" "93ed23c504b202cf96ee591138b0012c295338f38046a1f3c14522d4a64d7308" "f7216d3573e1bd2a2b47a2331f368b45e7b5182ddbe396d02b964b1ea5c5dc27" "c4bdbbd52c8e07112d1bfd00fee22bf0f25e727e95623ecb20c4fa098b74c1bd" "f2927d7d87e8207fa9a0a003c0f222d45c948845de162c885bf6ad2a255babfd" "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)) + '("2853dd90f0d49439ebd582a8cbb82b9b3c2a02593483341b257f88add195ad76" "a138ec18a6b926ea9d66e61aac28f5ce99739cf38566876dc31e29ec8757f6e2" "afa47084cb0beb684281f480aa84dab7c9170b084423c7f87ba755b15f6776ef" "234dbb732ef054b109a9e5ee5b499632c63cc24f7c2383a849815dacc1727cb6" "a0be7a38e2de974d1598cf247f607d5c1841dbcef1ccd97cded8bea95a7c7639" "47db50ff66e35d3a440485357fb6acb767c100e135ccdf459060407f8baea7b2" "1704976a1797342a1b4ea7a75bdbb3be1569f4619134341bd5a4c1cfb16abad4" "0d01e1e300fcafa34ba35d5cf0a21b3b23bc4053d388e352ae6a901994597ab1" "835868dcd17131ba8b9619d14c67c127aa18b90a82438c8613586331129dda63" "da186cce19b5aed3f6a2316845583dbee76aea9255ea0da857d1c058ff003546" "8d7b028e7b7843ae00498f68fad28f3c6258eda0650fe7e17bfb017d51d0e2a2" "1278c5f263cdb064b5c86ab7aa0a76552082cf0189acf6df17269219ba496053" "e19ac4ef0f028f503b1ccafa7c337021834ce0d1a2bca03fcebc1ef635776bea" "78e6be576f4a526d212d5f9a8798e5706990216e9be10174e3f3b015b8662e27" "7a7b1d475b42c1a0b61f3b1d1225dd249ffa1abb1b7f726aec59ac7ca3bf4dae" "6c98bc9f39e8f8fd6da5b9c74a624cbb3782b4be8abae8fd84cbc43053d7c175" "d47f868fd34613bd1fc11721fe055f26fd163426a299d45ce69bef1f109e1e71" "745d03d647c4b118f671c49214420639cb3af7152e81f132478ed1c649d4597d" "a7b20039f50e839626f8d6aa96df62afebb56a5bbd1192f557cb2efb5fcfb662" "246a9596178bb806c5f41e5b571546bb6e0f4bd41a9da0df5dfbca7ec6e2250c" "d268b67e0935b9ebc427cad88ded41e875abfcc27abd409726a92e55459e0d01" "3d54650e34fa27561eb81fc3ceed504970cc553cfd37f46e8a80ec32254a3ec3" "613aedadd3b9e2554f39afe760708fc3285bf594f6447822dd29f947f0775d6c" "f91395598d4cb3e2ae6a2db8527ceb83fed79dbaf007f435de3e91e5bda485fb" "711efe8b1233f2cf52f338fd7f15ce11c836d0b6240a18fffffc2cbd5bfe61b0" "01cf34eca93938925143f402c2e6141f03abb341f27d1c2dba3d50af9357ce70" "37144b437478e4c235824f0e94afa740ee2c7d16952e69ac3c5ed4352209eefb" "93ed23c504b202cf96ee591138b0012c295338f38046a1f3c14522d4a64d7308" "f7216d3573e1bd2a2b47a2331f368b45e7b5182ddbe396d02b964b1ea5c5dc27" "c4bdbbd52c8e07112d1bfd00fee22bf0f25e727e95623ecb20c4fa098b74c1bd" "f2927d7d87e8207fa9a0a003c0f222d45c948845de162c885bf6ad2a255babfd" "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)) '(helm-minibuffer-history-key "M-p") '(package-selected-packages - '(helm-ag undo-tree direnv 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)) + '(evil-escape copilot editorconfig quelpa-use-package lsp-treemacs treemacs-projectile treemacs-evil treemacs graphql-mode helm-ag undo-tree direnv 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) + '(warning-suppress-types '(((flycheck syntax-checker))))) (custom-set-faces ;; custom-set-faces was added by Custom. ;; If you edit it by hand, you could mess it up, so be careful.