summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc Coquand <marc@mccd.space>2024-05-07 13:38:36 -0500
committerMarc Coquand <marc@mccd.space>2024-05-07 13:38:36 -0500
commit7db8a813e0c239706aaf5b382f94529f62fff354 (patch)
tree7897aa66e07b63bded38b98d18f6b1989d285224
parenteb0ff7ed497f4cb20e505d35f8b66b1f71bb9a85 (diff)
downloadrcm-7db8a813e0c239706aaf5b382f94529f62fff354.tar.gz
rcm-7db8a813e0c239706aaf5b382f94529f62fff354.tar.bz2
rcm-7db8a813e0c239706aaf5b382f94529f62fff354.zip
Emacs: Temp. get rid of typescript-ts-mode
Crashing due to treesitter bug
-rw-r--r--emacs7
-rw-r--r--emacs.d/custom.el14
2 files changed, 17 insertions, 4 deletions
diff --git a/emacs b/emacs
index caf60f3..9f4657b 100644
--- a/emacs
+++ b/emacs
@@ -313,7 +313,7 @@
(lambda ()
(add-hook 'before-save-hook 'eglot-format nil t)))
-(add-hook 'typescript-ts-mode-hook 'eglot-ensure)
+(add-hook 'typescript-mode-hook 'eglot-ensure)
(setq-default indent-tabs-mode nil
tab-stop-list ()
tab-width 2)
@@ -356,6 +356,7 @@
(add-to-list 'auto-mode-alist '("\\.json\\'" . json-mode))
(add-to-list 'auto-mode-alist '("\\.ml\\'" . tuareg-mode))
(add-to-list 'auto-mode-alist '("\\.mli\\'" . tuareg-mode))
+(add-to-list 'auto-mode-alist '("emacs" . emacs-lisp-mode))
'(eglot-extend-to-xref t)
'(eglot-autoreconnect t)
@@ -554,6 +555,8 @@
(require 'org)
(transient-mark-mode 1)
(add-hook 'org-mode-hook 'variable-pitch-mode)
+;; Use with aspell
+(setq ispell-list-command "--list")
(add-hook 'org-mode-hook 'flyspell-mode)
(add-hook 'org-mode-hook 'visual-line-mode)
@@ -576,7 +579,7 @@
(expand-file-name fpath)))
(setq org-capture-templates
- `(("t" "Todo" entry (file+headline "~/marcvault/todo.org" "Tasks")
+ `(("t" "Todo" entry (file "~/marcvault/todo.org" )
"* TODO %?\n %i\n %a")
("u" "Usage" entry (file "~/marcvault/usage-tips.org")
"* %?\n"
diff --git a/emacs.d/custom.el b/emacs.d/custom.el
index 53651ca..0cc0520 100644
--- a/emacs.d/custom.el
+++ b/emacs.d/custom.el
@@ -56,13 +56,21 @@
'(meow-esc-mode t)
'(meow-global-mode t)
'(mode-line-compact 'long)
+ '(mode-line-format
+ '("%e" mode-line-front-space
+ (:propertize
+ ("" mode-line-modified)
+ (min-width
+ (5.0)))
+ (vc-mode vc-mode)
+ mode-line-frame-identification mode-line-buffer-identification))
'(mode-line-percent-position nil)
'(mode-line-position-line-format '(" "))
'(mu4e-modeline-mode nil)
'(org-babel-load-languages '((emacs-lisp . t) (lisp . t) (shell . t)))
'(org-fold-core-style 'overlays)
'(package-selected-packages
- '(typescript-mode slime eat avy monotropic-theme tempel vundo add-node-modules-path prettier password-store vc-fossil eldoc-box mu4e direnv elpher w3m elfeed-protocol elfeed ligature copilot f editorconfig s quelpa-use-package quelpa org-mime org-journal which-key consult orderless vertico markdown-mode smartparens tree-sitter-langs diff-hl magit corfu rg almost-mono-themes git-ps1-mode meow))
+ '(slime eat avy monotropic-theme tempel vundo add-node-modules-path prettier password-store vc-fossil eldoc-box mu4e direnv elpher w3m elfeed-protocol elfeed ligature copilot f editorconfig s quelpa-use-package quelpa org-mime org-journal which-key consult orderless vertico markdown-mode smartparens tree-sitter-langs diff-hl magit corfu rg almost-mono-themes git-ps1-mode meow))
'(project-switch-commands
'((project-find-file "Find file" nil)
(project-find-regexp "Find regexp" nil)
@@ -175,8 +183,9 @@
'(gnus-header-from ((t (:inherit gnus-header))))
'(gnus-header-name ((t (:inherit gnus-header))))
'(gnus-header-subject ((t (:inherit gnus-header))))
+ '(gnus-summary-cancelled ((t (:extend t :strike-through t))))
'(god-mode-lighter ((t (:inherit error))))
- '(header-line ((t (:inherit mode-line :background "#FFFFFF" :foreground "grey20" :box (:line-width (4 . 4) :color "#FFFFFF" :style flat-button) :underline (:color "grey" :style line :position t) :family "Iosevka Aile"))))
+ '(header-line ((t (:inherit mode-line :background "#FFFFFF" :foreground "grey20" :box (:line-width (4 . 4) :color "#FFFFFF" :style flat-button) :overline nil :underline (:color "grey" :style line :position t) :family "Iosevka Aile"))))
'(highlight ((t (:background "azure2"))))
'(line-number ((t (:foreground "#999999"))))
'(markdown-code-face ((t nil)))
@@ -185,6 +194,7 @@
'(meow-position-highlight-number ((t (:inherit default :background "grey80" :foreground "white"))))
'(mode-line ((t (:background "#FFFFFF" :foreground "#000000" :box (:line-width (4 . 4) :color "#FFFFFF" :style flat-button) :overline "grey" :height 0.8 :family "Iosevka Aile"))))
'(mode-line-inactive ((t (:background "#ffffff" :foreground "#dddddd" :box (:line-width (4 . 4) :color "#ffffff") :overline "grey" :height 0.8 :family "Iosevka Aile"))))
+ '(org-imminent-deadline ((t nil)))
'(show-paren-match ((t (:background "gainsboro" :foreground "green" :slant oblique :weight bold))))
'(tab-bar ((t (:family "Iosevka Aile" :background "#FFF" :foreground "black" :box (:line-width (4 . 4) :color "#FFF") :height 0.9))))
'(tab-bar-tab ((t (:inherit tab-bar :box nil))))