Fix relative directories in emacs 29

1 files changed, 38 insertions, 28 deletions

diff --git a/init.el b/init.el
index 27d7911..1690e1e 100644
--- a/init.el
+++ b/init.el
@@ -57,7 +57,7 @@
 (use-package emacs
   :straight nil
   :init
-  (setq gnus-init-file (concat user-emacs-directory "gnus.el"))
+  (setq gnus-init-file (expand-file-name "gnus.el" user-emacs-directory))
   
   (setq-default fill-column 80)
 
@@ -82,7 +82,7 @@
   (setq face-remapping-alist '((proof-locked-face . region)))
 
   (defvar --backup-directory)
-  (setq --backup-directory (concat user-emacs-directory "backups"))
+  (setq --backup-directory (expand-file-name "backups" user-emacs-directory))
   (if (not (file-exists-p --backup-directory))
       (make-directory --backup-directory t))
   (setq backup-directory-alist `(("." . ,--backup-directory)))
@@ -120,6 +120,7 @@
     (menu-bar-mode -1))
   (tool-bar-mode -1)
   (scroll-bar-mode -1)
+  (column-number-mode 1)
 
   ;; Enable those
   (dolist (c '(overwrite-mode narrow-to-region narrow-to-page upcase-region downcase-region))
@@ -479,39 +480,38 @@ https://yannherklotz.com"))
   :init
   (setq org-zettelkasten-directory "~/Dropbox/zk")
   :config
+  (defun org-zettelkasten-abs-file (file) (expand-file-name file org-zettelkasten-directory))
+
   (defun org-zettelkasten-goto-id (id)
     "Go to an ID."
     (interactive "sID: #")
-    (cond ((string-prefix-p "1" id)
-           (org-link-open-from-string
-            (concat "[[file:" org-zettelkasten-directory
-                    "/hls.org::#" id "]]")))
-          ((string-prefix-p "2" id)
-           (org-link-open-from-string
-            (concat "[[file:" org-zettelkasten-directory
-                    "/computing.org::#" id "]]")))
-          ((string-prefix-p "3" id)
-           (org-link-open-from-string
-            (concat "[[file:" org-zettelkasten-directory
-                    "/verification.org::#" id "]]")))
-          ((string-prefix-p "4" id)
-           (org-link-open-from-string
-            (concat "[[file:" org-zettelkasten-directory
-                    "/mathematics.org::#" id "]]")))
-          ((string-prefix-p "5" id)
-           (org-link-open-from-string
-            (concat "[[file:" org-zettelkasten-directory
-                    "/hardware.org::#" id "]]")))))
+    (let (abs-link org-zettelkasten-abs-file)
+      (cond ((string-prefix-p "1" id)
+             (org-link-open-from-string
+              (concat "[[file:" (abs-link "hls.org") "::#" id "]]")))
+            ((string-prefix-p "2" id)
+             (org-link-open-from-string
+              (concat "[[file:" (abs-link "computing.org") "::#" id "]]")))
+            ((string-prefix-p "3" id)
+             (org-link-open-from-string
+              (concat "[[file:" (abs-link "verification.org") "::#" id "]]")))
+            ((string-prefix-p "4" id)
+             (org-link-open-from-string
+              (concat "[[file:" (abs-link "mathematics.org") "::#" id "]]")))
+            ((string-prefix-p "5" id)
+             (org-link-open-from-string
+              (concat "[[file:" (abs-link "hardware.org") "::#" id "]]"))))))
   (define-key ymh-map (kbd "C-g") #'org-zettelkasten-goto-id)
 
   (define-key ymh-map (kbd "s")
     (lambda () (interactive)
       (let ((org-agenda-files
-             '("~/Dropbox/zk/hls.org"
-               "~/Dropbox/zk/computing.org"
-               "~/Dropbox/zk/verification.org"
-               "~/Dropbox/zk/mathematics.org"
-               "~/Dropbox/zk/hardware.org"))) (org-search-view))))
+             (mapcar #'org-zettelkasten-abs-file
+                     '("hls.org"
+                       "computing.org"
+                       "verification.org"
+                       "mathematics.org"
+                       "hardware.org")))) (org-search-view))))
   (add-hook 'org-mode-hook #'org-zettelkasten-mode))
 
 (use-package pdf-tools
@@ -829,7 +829,17 @@ https://yannherklotz.com"))
   (setq auto-mode-alist (delete '("\\.v\\'" . verilog-mode) auto-mode-alist))
   (add-to-list 'auto-mode-alist '("\\.sv\\'" . verilog-mode)))
 
+(use-package hungry-delete
+  :config
+  (global-hungry-delete-mode))
+
+(use-package eglot
+  :config
+  (add-to-list 'eglot-server-programs '(prolog-mode . ("swipl" "-g" "use_module(library(lsp_server))." "-g"
+                                                       "lsp_server:main" "-t" "halt" "--"
+                                                       "stdio"))))
+
 (setq gc-cons-threshold (* 1024 1024 10))
 
-(setq custom-file (concat user-emacs-directory "custom.el"))
+(setq custom-file (expand-file-name "custom.el" user-emacs-directory))
 (load custom-file)