Merge branch 'master' of gitlab.com:chriscochrun/dotemacs

init.el

@@ -57,6 +57,7 @@
 
 (recentf-mode +1)
 
+(setq straight-fix-org t)
 (defvar bootstrap-version)
 (let ((bootstrap-file
        (expand-file-name "straight/repos/straight.el/bootstrap.el" user-emacs-directory))
@@ -324,13 +325,20 @@ vertically."
 (use-package dired
   :ensure nil
   :straight nil
+  :config
+  (defun chris/dired-open-xdg ()
+    "Open the file-at-point in the appropriate program"
+    (interactive)
+    (let ((file (ignore-errors (dired-get-file-for-visit))))
+      (browse-url (file-truename file))))
   :general
   (chris/leader-keys
     :states 'normal
     :keymaps 'override
     "od" '(dired-jump :which-key "open dired here"))
   (general-def 'normal dired-mode-map
-    "q" 'kill-this-buffer))
+    "q" 'kill-this-buffer
+    "C-<return>" 'chris/dired-open-xdg))
 
 (defun chris/dired-yank-filename ()
   "Get the full filename from file at point and put into kill-ring"
@@ -367,7 +375,6 @@ vertically."
   (variable-pitch-mode +1))
 
 (use-package org
-  :straight (:type built-in)
   :config
   (setq org-startup-indented t
 	org-edit-src-content-indentation 0
@@ -1005,12 +1012,12 @@ If on a:
                 (propertize path 'face `(:inherit org-level-1))))
              (when chris/eshell-status-p
                (propertize (or (chris/eshell-status-display) "") 'face font-lock-comment-face))
-             (propertize "\n" 'face '(:inherit org-todo :weight ultra-bold))
+             (propertize "\n" 'face '(:inherit org-todo :weight ultra-bold))
              " "))))
 
   ;;; If the prompt spans over multiple lines, the regexp should match
   ;;; last line only.
-  (setq-default eshell-prompt-regexp "^ ")
+  (setq-default eshell-prompt-regexp "^ ")
   (setq eshell-destroy-buffer-when-process-dies t)
 
   (defun chris/pop-eshell ()