move some files around, drop org-roam-ui in favor of org-roam-graph

4 files changed, 56 insertions, 59 deletions

diff --git a/code.el b/code.el
new file mode 100644
index 0000000..7afb676
--- /dev/null
+++ b/code.el
@@ -0,0 +1,11 @@
+(use-package scad-mode
+  :defer t)
+
+(use-package eglot
+  :hook
+  ((lua-mode . eglot))
+  :config
+  (fset #'jsonrpc--log-event #'ignore))
+
+(use-package magit
+  :bind (("C-x g" . magit-status)))
diff --git a/init.el b/init.el
index 39c62b8..14d6e42 100644
--- a/init.el
+++ b/init.el
@@ -1,4 +1,6 @@
-(load-file (expand-file-name "straight-bootstrap.el" user-emacs-directory))
+(defun my/load-config-file (filename)
+  (load-file (expand-file-name filename user-emacs-directory)))
+(my/load-config-file "straight-bootstrap.el")
 
 (straight-use-package 'org)		; org complains about this for some reason
 
@@ -21,9 +23,6 @@
 
 (menu-bar-mode -1)
 
-(when (display-graphic-p)
-  (context-menu-mode))
-
 (setopt enable-recursive-minibuffers t)
 (setopt completion-cycle-threshold 1)
 (setopt completions-detailed t)
@@ -88,19 +87,10 @@
   (completion-styles '(orderless))
   (completion-category-overrides '((file (styles partial-completion)))))
 
-(use-package magit
-  :bind (("C-x g" . magit-status)))
-
 (use-package which-key
   :config
   (which-key-mode))
 
-(use-package eglot
-  :hook
-  ((lua-mode . eglot))
-  :config
-  (fset #'jsonrpc--log-event #'ignore))
-
 (use-package marginalia
   :config
   (marginalia-mode))
@@ -122,11 +112,9 @@
   :custom
   (custom-file (no-littering-expand-etc-file-name "custom.el")))
 
-(use-package scad-mode
-  :defer t)
-
 (use-package org-publish-rss
   :straight (org-publish-rss :type git :host nil
 			     :repo "https://git.sr.ht/~taingram/org-publish-rss"))
 
-(load-file (expand-file-name "org.el" user-emacs-directory))
+(my/load-config-file "writing.el")
+(my/load-config-file "code.el")
diff --git a/org.el b/org.el
deleted file mode 100644
index 6d7a7bb..0000000
--- a/org.el
+++ /dev/null
@@ -1,42 +0,0 @@
-(setq org-directory "~/Documents/org/")
-(setq org-agenda-files '("agenda.org"))
-
-(use-package org
-  :hook
-  ((org-mode . visual-line-mode))
-  :config
-  (setq org-export-with-smart-quotes t)
-  ;; (dolist (i '("amsmath" "amssymb" "mathtools" "mathrsfs"))
-  ;; 	  (add-to-list 'org-latex-packages-alist '("" i t)))
-  )
-
-(use-package org-roam
-  :init
-  (make-directory "~/Documents/roam" t)
-  :custom
-  (org-roam-directory "~/Documents/roam")
-  :bind
-  (("C-c r n" . org-roam-node-insert)
-   ("C-c r f" . org-roam-node-find)
-   ("C-c r l" . org-roam-buffer-toggle))
-  :config
-  (require 'org-roam-export)
-  (org-roam-db-autosync-mode))
-
-(use-package org-roam-ui
-  :straight
-  (:host github :repo "org-roam/org-roam-ui" :branch "main" :files ("*.el" "out"))
-  :after org-roam
-  :bind
-  (("C-c r o" . org-roam-ui-open))
-  :config
-  (setq org-roam-ui-sync-theme t
-        org-roam-ui-follow t
-        org-roam-ui-update-on-save t))
-
-(use-package xenops
-  :hook
-  ((org-mode . xenops-mode))
-  :config
-  (setq xenops-reveal-on-entry t))
-
diff --git a/writing.el b/writing.el
new file mode 100644
index 0000000..9641e62
--- /dev/null
+++ b/writing.el
@@ -0,0 +1,40 @@
+(setq org-directory "~/Documents/org/")
+(setq org-agenda-files '("agenda.org"))
+
+(use-package org
+  :hook
+  ((org-mode . visual-line-mode)
+   (org-mode . turn-on-org-cdlatex))
+  :config
+  (setq org-export-with-smart-quotes t
+	org-html-validation-link nil))
+
+(use-package org-roam
+  :init
+  (make-directory "~/Documents/roam" t)
+  :custom
+  (org-roam-directory "~/Documents/roam")
+  :bind
+  (("C-c r i" . org-roam-node-insert)
+   ("C-c r f" . org-roam-node-find)
+   ("C-c r l" . org-roam-buffer-toggle)
+   ("C-c r t a" . org-roam-tag-add)
+   ("C-c r t r" . org-roam-tag-remove)
+   ("C-c r g" . org-roam-graph))
+  :config
+  (require 'org-roam-export)
+  (org-roam-db-autosync-mode))
+
+;; (use-package org-roam-ui
+;;   :straight
+;;   (:host github :repo "org-roam/org-roam-ui" :branch "main" :files ("*.el" "out"))
+;;   :after org-roam
+;;   :bind
+;;   (("C-c r o" . org-roam-ui-open))
+;;   :config
+;;   (setq org-roam-ui-sync-theme t
+;;         org-roam-ui-follow t
+;;         org-roam-ui-update-on-save t))
+
+(use-package cdlatex)
+(use-package auctex)