Got org roam working with emacs 30
This commit is contained in:
parent
e6a931c68a
commit
92ef068d86
1 changed files with 40 additions and 9 deletions
49
init.el
49
init.el
|
|
@ -31,17 +31,19 @@
|
||||||
(unless (package-installed-p 'use-package)
|
(unless (package-installed-p 'use-package)
|
||||||
(package-refresh-contents)
|
(package-refresh-contents)
|
||||||
(package-install 'use-package))
|
(package-install 'use-package))
|
||||||
(eval-and-compile
|
|
||||||
(setq use-package-always-ensure t
|
(setq use-package-always-ensure t)
|
||||||
use-package-expand-minimally t))
|
(setq use-package-expand-minimally t)
|
||||||
|
|
||||||
;; Ivy
|
;; Ivy
|
||||||
(use-package ivy
|
(use-package ivy
|
||||||
|
:ensure t
|
||||||
:diminish
|
:diminish
|
||||||
:config
|
:config
|
||||||
(ivy-mode 1))
|
(ivy-mode 1))
|
||||||
|
|
||||||
(use-package counsel
|
(use-package counsel
|
||||||
|
:ensure t
|
||||||
:after ivy
|
:after ivy
|
||||||
:bind (("M-x" . counsel-M-x)
|
:bind (("M-x" . counsel-M-x)
|
||||||
("C-x b" . counsel-ibuffer)
|
("C-x b" . counsel-ibuffer)
|
||||||
|
|
@ -52,40 +54,48 @@
|
||||||
(setq ivy-initial-inputs-alist nil)) ;; Don't start searches with ^
|
(setq ivy-initial-inputs-alist nil)) ;; Don't start searches with ^
|
||||||
|
|
||||||
(use-package ivy-rich
|
(use-package ivy-rich
|
||||||
|
:ensure t
|
||||||
:config (ivy-rich-mode 1))
|
:config (ivy-rich-mode 1))
|
||||||
|
|
||||||
;; Theme
|
;; Theme
|
||||||
(load-theme 'modus-vivendi)
|
(load-theme 'modus-vivendi)
|
||||||
|
|
||||||
(use-package doom-modeline
|
(use-package doom-modeline
|
||||||
|
:ensure t
|
||||||
:init (doom-modeline-mode 1)
|
:init (doom-modeline-mode 1)
|
||||||
:config (setq doom-modeline-height 15))
|
:config (setq doom-modeline-height 15))
|
||||||
|
|
||||||
;; Projects
|
;; Projects
|
||||||
(use-package projectile
|
(use-package projectile
|
||||||
|
:ensure t
|
||||||
:diminish projectile-mode
|
:diminish projectile-mode
|
||||||
:config (projectile-mode)
|
:config (projectile-mode)
|
||||||
:custom ((projectile-completion-system 'ivy))
|
:custom ((projectile-completion-system 'ivy))
|
||||||
:bind-keymap ("C-c p" . projectile-command-map))
|
:bind-keymap ("C-c p" . projectile-command-map))
|
||||||
|
|
||||||
(use-package magit)
|
(use-package magit)
|
||||||
|
:ensure t
|
||||||
;; TODO Look into forge for git community engagement
|
;; TODO Look into forge for git community engagement
|
||||||
|
|
||||||
;; Make M-x all-the-icons-install-fonts and M-x nerd-icons-install-fonts available
|
;; Make M-x all-the-icons-install-fonts and M-x nerd-icons-install-fonts available
|
||||||
(use-package all-the-icons
|
(use-package all-the-icons
|
||||||
|
:ensure t
|
||||||
:if (display-graphic-p))
|
:if (display-graphic-p))
|
||||||
|
|
||||||
;; Quality of life
|
;; Quality of life
|
||||||
(use-package rainbow-delimiters
|
(use-package rainbow-delimiters
|
||||||
|
:ensure t
|
||||||
:hook (prog-mode . rainbow-delimiters-mode))
|
:hook (prog-mode . rainbow-delimiters-mode))
|
||||||
|
|
||||||
(use-package which-key
|
(use-package which-key
|
||||||
|
:ensure t
|
||||||
:init (which-key-mode)
|
:init (which-key-mode)
|
||||||
:diminish which-key-mode
|
:diminish which-key-mode
|
||||||
:config
|
:config
|
||||||
(setq which-key-idle-delay 0.3))
|
(setq which-key-idle-delay 0.3))
|
||||||
|
|
||||||
(use-package helpful
|
(use-package helpful
|
||||||
|
:ensure t
|
||||||
:custom
|
:custom
|
||||||
(counsel-describe-function-function #'helpful-callable)
|
(counsel-describe-function-function #'helpful-callable)
|
||||||
(counsel-describe-variable-function #'helpful-variable)
|
(counsel-describe-variable-function #'helpful-variable)
|
||||||
|
|
@ -96,15 +106,30 @@
|
||||||
([remap describe-key] . helpful-key))
|
([remap describe-key] . helpful-key))
|
||||||
|
|
||||||
;; Org mode
|
;; Org mode
|
||||||
(use-package org)
|
(use-package org
|
||||||
|
:ensure t)
|
||||||
|
(use-package org-roam
|
||||||
|
:ensure t
|
||||||
|
:custom
|
||||||
|
(org-roam-directory "/home/warwick/Sync/wiki/org/roam/")
|
||||||
|
:bind (("C-c n l" . org-roam-buffer-toggle)
|
||||||
|
("C-c n f" . org-roam-node-find)
|
||||||
|
("C-c n i" . org-roam-node-insert)
|
||||||
|
("C-c n c" . org-roam-capture)
|
||||||
|
("C-c n a" . org-roam-alias-add))
|
||||||
|
:config
|
||||||
|
(org-roam-db-autosync-mode 1))
|
||||||
(use-package org-bullets
|
(use-package org-bullets
|
||||||
|
:ensure t
|
||||||
:after org
|
:after org
|
||||||
:hook (org-mode . org-bullet-mode))
|
:hook (org-mode . org-bullets-mode))
|
||||||
;; TODO configure to be prettier
|
;; TODO configure to be prettier
|
||||||
|
|
||||||
;; Tree Sitter (better syntax highlighting)
|
;; Tree Sitter (better syntax highlighting)
|
||||||
(use-package tree-sitter)
|
(use-package tree-sitter
|
||||||
|
:ensure t)
|
||||||
(use-package tree-sitter-langs
|
(use-package tree-sitter-langs
|
||||||
|
:ensure t
|
||||||
:after tree-sitter
|
:after tree-sitter
|
||||||
:init
|
:init
|
||||||
(global-tree-sitter-mode)
|
(global-tree-sitter-mode)
|
||||||
|
|
@ -112,17 +137,22 @@
|
||||||
|
|
||||||
;; lsp-mode
|
;; lsp-mode
|
||||||
(use-package lsp-mode
|
(use-package lsp-mode
|
||||||
|
:ensure t
|
||||||
:commands (lsp lsp-deferred)
|
:commands (lsp lsp-deferred)
|
||||||
:init (setq lsp-keymap-prefix "C-c l")
|
:init (setq lsp-keymap-prefix "C-c l")
|
||||||
:hook (lsp-mode . lsp-enable-which-key-integration))
|
:hook (lsp-mode . lsp-enable-which-key-integration))
|
||||||
(use-package lsp-ui
|
(use-package lsp-ui
|
||||||
|
:ensure t
|
||||||
:hook (lsp-mode . lsp-ui-mode))
|
:hook (lsp-mode . lsp-ui-mode))
|
||||||
(use-package lsp-treemacs
|
(use-package lsp-treemacs
|
||||||
|
:ensure t
|
||||||
:after lsp)
|
:after lsp)
|
||||||
(use-package lsp-ivy)
|
(use-package lsp-ivy
|
||||||
|
:ensure t)
|
||||||
|
|
||||||
;; company (useful for showing lsp-mode popups)
|
;; company (useful for showing lsp-mode popups)
|
||||||
(use-package company
|
(use-package company
|
||||||
|
:ensure t
|
||||||
:after lsp-mode
|
:after lsp-mode
|
||||||
:hook (lsp-mode . company-mode)
|
:hook (lsp-mode . company-mode)
|
||||||
:bind
|
:bind
|
||||||
|
|
@ -134,10 +164,12 @@
|
||||||
(company-minimum-prefix-length 1)
|
(company-minimum-prefix-length 1)
|
||||||
(company-idle-delay 0.0))
|
(company-idle-delay 0.0))
|
||||||
(use-package company-box
|
(use-package company-box
|
||||||
|
:ensure t
|
||||||
:hook (company-mode . company-box-mode))
|
:hook (company-mode . company-box-mode))
|
||||||
|
|
||||||
;; TypeScript
|
;; TypeScript
|
||||||
(use-package typescript-mode
|
(use-package typescript-mode
|
||||||
|
:ensure t
|
||||||
:mode ("\\.[jt]s\\'" "\\.[jt]sx\\'")
|
:mode ("\\.[jt]s\\'" "\\.[jt]sx\\'")
|
||||||
:hook (typescript-mode . lsp-deferred)
|
:hook (typescript-mode . lsp-deferred)
|
||||||
:config (setq typescript-indent-level 2))
|
:config (setq typescript-indent-level 2))
|
||||||
|
|
@ -155,8 +187,7 @@
|
||||||
;; If you edit it by hand, you could mess it up, so be careful.
|
;; If you edit it by hand, you could mess it up, so be careful.
|
||||||
;; Your init file should contain only one such instance.
|
;; Your init file should contain only one such instance.
|
||||||
;; If there is more than one, they won't work right.
|
;; If there is more than one, they won't work right.
|
||||||
'(package-selected-packages
|
'(package-selected-packages nil))
|
||||||
'(tree-sitter-langs tree-sitter lsp-ivy lsp-treemacs lsp-ui company-box company which-key use-package typescript-mode rainbow-delimiters projectile org-bullets magit lsp-mode ivy-rich helpful doom-modeline counsel all-the-icons)))
|
|
||||||
(custom-set-faces
|
(custom-set-faces
|
||||||
;; custom-set-faces was added by Custom.
|
;; custom-set-faces was added by Custom.
|
||||||
;; If you edit it by hand, you could mess it up, so be careful.
|
;; If you edit it by hand, you could mess it up, so be careful.
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue