From e6355448dab2c0eb1f158eae6d0436e80eb43aed Mon Sep 17 00:00:00 2001 From: Christopher James Hayward Date: Thu, 14 Jan 2021 19:16:25 -0500 Subject: [PATCH] Cleanup writing + lsp --- README.org | 106 +++++++++++++++++++++++++---------------------------- init.el | 48 +++++++++++------------- 2 files changed, 72 insertions(+), 82 deletions(-) diff --git a/README.org b/README.org index 97c1851..62fea20 100644 --- a/README.org +++ b/README.org @@ -403,52 +403,6 @@ https://github.com/seagle0128/doom-modeline :custom ((doom-modeline-height 16))) #+end_src -** Writing - -*Organize your plain life in plain text* - -=Org-mode= is one of the hallmark features of Emacs, and provides the basis for my Literate Programming platform. It's essentially a markdown language with rich features for project management, scheduling, development, and writing. It's hard to convey everything within its capabilities. - -+ https://orgmode.org -+ https://orgmode.org/worg/org-contrib/babel/languages/index.html -+ https://orgmode.org/manual/Structure-Templates.html - -#+begin_src emacs-lisp -(use-package org - :hook - (org-mode . (lambda () - (org-indent-mode) - (visual-line-mode 1) - (variable-pitch-mode 1))) - :config - (setq org-ellipsis " ▾" - org-log-done 'time - org-log-into-drawer t - org-src-preserve-indentation t) - - (org-babel-do-load-languages - 'org-babel-load-languages - '((shell . t) - (python . t) - (emacs-lisp . t))) - - (require 'org-tempo) - (add-to-list 'org-structure-template-alist '("s" . "src")) - (add-to-list 'org-structure-template-alist '("q" . "quote")) - (add-to-list 'org-structure-template-alist '("e" . "example")) - (add-to-list 'org-structure-template-alist '("sh" . "src shell")) - (add-to-list 'org-structure-template-alist '("py" . "src python")) - (add-to-list 'org-structure-template-alist '("el" . "src emacs-lisp"))) -#+end_src - -https://github.com/integral-dw/org-superstar-mode -+ Make the headline stars more *super* - -#+begin_src emacs-lisp -(use-package org-superstar - :hook (org-mode . org-superstar-mode)) -#+end_src - * Development :PROPERTIES: :header-args: :tangle init.el :results silent @@ -463,11 +417,8 @@ https://emacs-lsp.github.io/lsp-mode/ #+begin_src emacs-lisp (use-package lsp-mode - :commands lsp - :config - (setq gc-cons-threshold 100000000 - lsp-completion-provider 'company-capf - lsp-idle-delay dotfiles/idle)) + :custom (gc-cons-threshold 1000000000) + (lsp-idle-delay 0.500)) #+end_src https://emacs-lsp.github.io/lsp-ui/ @@ -475,8 +426,8 @@ https://emacs-lsp.github.io/lsp-ui/ #+begin_src emacs-lisp (use-package lsp-ui - :commands lsp-ui-mode - :custom (lsp-ui-doc-position 'at-point)) + :custom (lsp-ui-doc-position 'at-point) + (lsp-ui-doc-delay 0.500)) #+end_src https://emacs-lsp.github.io/dap-mode/ @@ -492,9 +443,8 @@ http://company-mode.github.io/ + Integrate with =lsp-mode= #+begin_src emacs-lisp -(use-package company-lsp - :commands company-lsp - :custom (company-minimum-prefix-length 1)) +(use-package company) +(use-package company-lsp) #+end_src ** Python @@ -539,6 +489,50 @@ https://github.com/brotzeit/rustic :header-args: :tangle init.el :results silent :END: +*Organize your plain life in plain text* + +=Org-mode= is one of the hallmark features of Emacs, and provides the basis for my Literate Programming platform. It's essentially a markdown language with rich features for project management, scheduling, development, and writing. It's hard to convey everything within its capabilities. + ++ https://orgmode.org ++ https://orgmode.org/worg/org-contrib/babel/languages/index.html ++ https://orgmode.org/manual/Structure-Templates.html + +#+begin_src emacs-lisp +(use-package org + :hook + (org-mode . (lambda () + (org-indent-mode) + (visual-line-mode 1) + (variable-pitch-mode 1))) + :config + (setq org-ellipsis " ▾" + org-log-done 'time + org-log-into-drawer t + org-src-preserve-indentation t) + + (org-babel-do-load-languages + 'org-babel-load-languages + '((shell . t) + (python . t) + (emacs-lisp . t))) + + (require 'org-tempo) + (add-to-list 'org-structure-template-alist '("s" . "src")) + (add-to-list 'org-structure-template-alist '("q" . "quote")) + (add-to-list 'org-structure-template-alist '("e" . "example")) + (add-to-list 'org-structure-template-alist '("sh" . "src shell")) + (add-to-list 'org-structure-template-alist '("py" . "src python")) + (add-to-list 'org-structure-template-alist '("el" . "src emacs-lisp"))) +#+end_src + +https://github.com/integral-dw/org-superstar-mode ++ Make the headline stars more *super* + +#+begin_src emacs-lisp +(use-package org-superstar + :hook (org-mode . org-superstar-mode)) +#+end_src + https://github.com/org-roam/org-roam + Rudimentary roam replica with =org-mode= diff --git a/init.el b/init.el index 8b4deb6..618f4ae 100644 --- a/init.el +++ b/init.el @@ -155,6 +155,28 @@ :init (doom-modeline-mode 1) :custom ((doom-modeline-height 16))) +(use-package lsp-mode + :custom (gc-cons-threshold 1000000000) + (lsp-idle-delay 0.500)) + +(use-package lsp-ui + :custom (lsp-ui-doc-position 'at-point) + (lsp-ui-doc-delay 0.500)) + +(use-package dap-mode) + +(use-package company) +(use-package company-lsp) + +(use-package python-mode + :hook (python-mode . lsp) + :config (require 'dap-python) + :custom (python-shell-interpreter "python3") ;; Required if "python" is not python 3. + (dap-python-executable "python3") ;; Same as above. + (dap-python-debugger 'debugpy)) + +(use-package rustic) + (use-package org :hook (org-mode . (lambda () @@ -184,32 +206,6 @@ (use-package org-superstar :hook (org-mode . org-superstar-mode)) -(use-package lsp-mode - :commands lsp - :config - (setq gc-cons-threshold 100000000 - lsp-completion-provider 'company-capf - lsp-idle-delay dotfiles/idle)) - -(use-package lsp-ui - :commands lsp-ui-mode - :custom (lsp-ui-doc-position 'at-point)) - -(use-package dap-mode) - -(use-package company-lsp - :commands company-lsp - :custom (company-minimum-prefix-length 1)) - -(use-package python-mode - :hook (python-mode . lsp) - :config (require 'dap-python) - :custom (python-shell-interpreter "python3") ;; Required if "python" is not python 3. - (dap-python-executable "python3") ;; Same as above. - (dap-python-debugger 'debugpy)) - -(use-package rustic) - (use-package org-roam :hook (after-init . org-roam-mode) :custom (org-roam-directory dotfiles/brain))