From 66185f96b080f1a6df72bee32464f72a9713ee9f Mon Sep 17 00:00:00 2001 From: Marcel Kapfer Date: Thu, 23 Jun 2022 16:50:28 +0200 Subject: [PATCH 01/12] [Tab Bar Helpers] Also open journal in agenda tab, spliting windows --- packages/mmk2410-tab-bar-helpers.el | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/mmk2410-tab-bar-helpers.el b/packages/mmk2410-tab-bar-helpers.el index 8981ec5..1085c48 100644 --- a/packages/mmk2410-tab-bar-helpers.el +++ b/packages/mmk2410-tab-bar-helpers.el @@ -48,7 +48,11 @@ (mmk2410/tab-bar-switch-or-create "Agenda" #'(lambda () - (org-agenda nil "a")))) + (org-agenda nil "c") + (sit-for 1) + (split-window-horizontally) + (other-window 1) + (org-journal-open-current-journal-file)))) (defun mmk2410/tab-bar-run-journal () (interactive) From 6762876fd6c83cc5ebb430698ae0f562eb3210d1 Mon Sep 17 00:00:00 2001 From: Marcel Kapfer Date: Thu, 23 Jun 2022 16:53:32 +0200 Subject: [PATCH 02/12] [Tab Bar Helpers] Fix path of project.org file --- packages/mmk2410-tab-bar-helpers.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/mmk2410-tab-bar-helpers.el b/packages/mmk2410-tab-bar-helpers.el index 1085c48..6e45501 100644 --- a/packages/mmk2410-tab-bar-helpers.el +++ b/packages/mmk2410-tab-bar-helpers.el @@ -65,7 +65,7 @@ (mmk2410/tab-bar-switch-or-create "Projects" #'(lambda () - (find-file "~/org/work.projects.org")))) + (find-file "~/org/projects.org")))) (defhydra mmk2410/tab-bar (:color teal :hint nil) " From 778af6876c6a1f8d200bb6b69ebc519320a3129a Mon Sep 17 00:00:00 2001 From: Marcel Kapfer Date: Thu, 23 Jun 2022 16:54:03 +0200 Subject: [PATCH 03/12] Turn off lock files since they don't play nice with npm --- config.org | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/config.org b/config.org index 5b3778b..4628211 100644 --- a/config.org +++ b/config.org @@ -76,10 +76,13 @@ Use a sane date style. (setq calendar-date-style 'european) #+end_src -** Turn off backup files +** Turn off backup and lock files + +Lock files don't play nice with npm. #+begin_src emacs-lisp (setq-default backup-inhibited t) +(setq create-lockfiles nil) #+end_src ** Performance tweaks From 7fe2e79f7f7c092a49b4116a498a2d85b3229c0d Mon Sep 17 00:00:00 2001 From: Marcel Kapfer Date: Thu, 23 Jun 2022 16:54:52 +0200 Subject: [PATCH 04/12] Increase GC threshold as recommended by lsp-mode --- config.org | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.org b/config.org index 4628211..3625d6f 100644 --- a/config.org +++ b/config.org @@ -90,7 +90,7 @@ Lock files don't play nice with npm. As recommended by [[https://emacs-lsp.github.io/lsp-mode/page/performance/][lsp-mode]], #+begin_src emacs-lisp -(setq gc-cons-threshold 100000000 +(setq gc-cons-threshold (* 100 1024 1024) read-process-output-max (* 1024 1024)) #+end_src From c962f26abe63c62c3da530a155352660f83b4949 Mon Sep 17 00:00:00 2001 From: Marcel Kapfer Date: Thu, 23 Jun 2022 17:20:55 +0200 Subject: [PATCH 05/12] [Evil] Go back to normal mode from insert mode by typing jk --- config.org | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/config.org b/config.org index 3625d6f..692e2ae 100644 --- a/config.org +++ b/config.org @@ -586,6 +586,15 @@ An even better integration may be achieved when additionall using the [[https:// :config (evil-collection-init)) #+end_src +Additional I like to press =jk= for exiting normal mode, using [[https://github.com/emacsorphanage/key-chord/][key-chord]] this is possible. + +#+begin_src emacs-lisp +(use-package key-chord + :config + (key-chord-define evil-insert-state-map "jk" 'evil-normal-state) + (key-chord-mode 1)) +#+end_src + * General packages ** diminish-mode From 01f5521cd201559dc5b3df017624babd8b0138f9 Mon Sep 17 00:00:00 2001 From: Marcel Kapfer Date: Thu, 23 Jun 2022 17:22:18 +0200 Subject: [PATCH 06/12] [Org] Clean up agenda display --- config.org | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/config.org b/config.org index 692e2ae..223e4c4 100644 --- a/config.org +++ b/config.org @@ -1135,10 +1135,10 @@ Make the column for categories wider. #+begin_src emacs-lisp (setq org-agenda-prefix-format - '((agenda . " %i %-18:c%?-12t% s") - (todo . " %i %-18:c") - (tags . " %i %-18:c") - (search . " %i %-18:c"))) + '((agenda . " %i %?-12t% s") + (todo . " %i") + (tags . " %i") + (search . " %i"))) #+end_src Finally define the org-agenda display using [[https://github.com/alphapapa/org-super-agenda][org-super-agenda]] by alphapapa. From cab2a02eebaae04fef4b91180bed758ad092f21c Mon Sep 17 00:00:00 2001 From: Marcel Kapfer Date: Thu, 23 Jun 2022 17:23:00 +0200 Subject: [PATCH 07/12] [Org/Journal] Use ISO date as filename for org-journal files --- config.org | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/config.org b/config.org index 223e4c4..38c33c1 100644 --- a/config.org +++ b/config.org @@ -1242,7 +1242,8 @@ Until now I did not think that I needed to keep a (personal) journal. But since (use-package org-journal :config (setq org-journal-dir "~/org/journal" org-journal-file-type 'monthly - org-journal-find-file 'find-file) + org-journal-find-file 'find-file + org-journal-file-format "%Y-%m-%d.org") :bind (("C-c j j" . 'org-journal-new-entry) ("C-c j s" . 'org-journal-new-scheduled-entry) ("C-c j o" . 'org-journal-open-current-journal-file) From 138c363ad6bcc0990b5b5136905a553b640d4db7 Mon Sep 17 00:00:00 2001 From: Marcel Kapfer Date: Thu, 23 Jun 2022 17:24:00 +0200 Subject: [PATCH 08/12] [Org/Roam/UI] Removed obsolete note about package unavailibility --- config.org | 2 -- 1 file changed, 2 deletions(-) diff --git a/config.org b/config.org index 38c33c1..bdb7c63 100644 --- a/config.org +++ b/config.org @@ -1362,8 +1362,6 @@ Source: [[https://github.com/org-roam/org-roam-bibtex][GitHub: org-roam/org-roam ** Org Roam UI -*Disabled since =org-roam-ui= is not yet released on Melpa.* And I currently have no time to setup or switch to =straight= (or to put it better: it is currently not important enough for me). - A graphical frontend for exploring your org-roam Zettelkasten Source: [[https://github.com/org-roam/org-roam-ui][GitHub: org-roam/org-roam-ui]] From 53a011565748ac00805f6d974aa954b0e7137e2f Mon Sep 17 00:00:00 2001 From: Marcel Kapfer Date: Thu, 23 Jun 2022 17:25:19 +0200 Subject: [PATCH 09/12] [lsp] Change keymap prefix to avoid locking my desktop --- config.org | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/config.org b/config.org index bdb7c63..d8ea556 100644 --- a/config.org +++ b/config.org @@ -1526,9 +1526,8 @@ Source: [[https://github.com/emacs-lsp/lsp-mode][GitHub:emacs-lsp/lsp-mode]] (js-mode . lsp-deferred) (lsp-mode . lsp-enable-which-key-integration)) :commands (lsp lsp-deferred) - :config - (setq lsp-keymap-prefix "C-s-l" - lsp-prefer-capf t)) + :init (setq lsp-keymap-prefix "C-c C-l") + :config (setq lsp-prefer-capf t)) (use-package lsp-ui :commands lsp-ui-mode) From 52186554a03384b4730df08f67aecd5d5d0cab24 Mon Sep 17 00:00:00 2001 From: Marcel Kapfer Date: Thu, 23 Jun 2022 17:29:17 +0200 Subject: [PATCH 10/12] [web/js/ts] Set indentation levels --- config.org | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/config.org b/config.org index d8ea556..5a3e065 100644 --- a/config.org +++ b/config.org @@ -1595,7 +1595,19 @@ Source: [[https://github.com/emacs-typescript/typescript.el][GitHub: emacs-types #+begin_src emacs-lisp (use-package typescript-mode - :mode "\\.ts\\'") + :mode "\\.ts\\'" + :config + (setq typescript-indent-level 2)) +#+end_src + +** JavaScript + +Load the built-in JavaScript mode to set it's indentation. + +#+begin_src emacs-lisp +(use-package js + :config + (setq js-indent-level 2)) #+end_src ** Web Mode @@ -1618,7 +1630,10 @@ Source: [[https://github.com/fxbois/web-mode][GitHub: fxbois/web-mode]] :config (setq web-mode-script-padding 0) (setq web-mode-code-indent-offset 2) - (setq web-mode-markup-indent-offset 2)) + (setq web-mode-markup-indent-offset 2) + (setq web-mode-css-indent-offset 2) + (setq web-mode-style-padding 0) + (setq web-mode-enable-comment-annotation t)) #+end_src ** YAML From 2e3aad94462431d58c4a7742bb43df8b90fdc36a Mon Sep 17 00:00:00 2001 From: Marcel Kapfer Date: Thu, 23 Jun 2022 17:34:46 +0200 Subject: [PATCH 11/12] Added flycheck --- config.org | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/config.org b/config.org index 5a3e065..cd71702 100644 --- a/config.org +++ b/config.org @@ -1509,6 +1509,17 @@ Source: [[https://github.com/company-mode/company-mode][GitHub: company-mode]] company-dabbrev-downcase nil)) #+end_src +** flycheck + +Flycheck is a syntax checking extension for Emacs which uses specialized command line tools for the languages it supports. Next to the linting and highlighting of errors it does on its own it also integrates nicely into lsp-mode. + +Source: [[https://www.flycheck.org][flycheck.org]] + +#+begin_src emacs-lisp +(use-package flycheck + :init (global-flycheck-mode)) +#+end_src + ** lsp Language Server Protocoll capabilities for Emacs From 437ccb937bf6ab7f158723734f4e672003bc3d17 Mon Sep 17 00:00:00 2001 From: Marcel Kapfer Date: Thu, 23 Jun 2022 17:37:27 +0200 Subject: [PATCH 12/12] [lsp] Improve UI display --- config.org | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/config.org b/config.org index cd71702..730b31d 100644 --- a/config.org +++ b/config.org @@ -1541,7 +1541,10 @@ Source: [[https://github.com/emacs-lsp/lsp-mode][GitHub:emacs-lsp/lsp-mode]] :config (setq lsp-prefer-capf t)) (use-package lsp-ui - :commands lsp-ui-mode) + :commands lsp-ui-mode + :config + (setq lsp-ui-sideline-show-code-actions t + lsp-ui-sideline-show-hover t)) (use-package lsp-ivy :commands lsp-ivy-workspace-symbol)