From b1e8f4efa48ccd51e52e770f670806a74b313bd4 Mon Sep 17 00:00:00 2001 From: Emmet Date: Thu, 24 Aug 2023 10:47:47 -0500 Subject: [PATCH] Modified ORUI wrapper functions since eaf doesn't wayland --- user/app/doom-emacs/config.el | 16 ++++++++++++---- user/app/doom-emacs/doom.org | 17 +++++++++++++---- 2 files changed, 25 insertions(+), 8 deletions(-) diff --git a/user/app/doom-emacs/config.el b/user/app/doom-emacs/config.el index 2c99749..b0f00d3 100644 --- a/user/app/doom-emacs/config.el +++ b/user/app/doom-emacs/config.el @@ -683,7 +683,8 @@ same directory as the org-buffer and insert a link to this file." ; (window-width . 50) ;)) -(setq org-roam-ui-browser-function 'eaf-open-browser) +;;(setq org-roam-ui-browser-function 'eaf-open-browser) ; xorg +(setq org-roam-ui-browser-function 'browse-url) ; wayland (defun open-org-roam-ui () (interactive) @@ -693,15 +694,22 @@ same directory as the org-buffer and insert a link to this file." (defun kill-org-roam-ui () (interactive) - (delete-window (get-buffer-window "ORUI" t)) - (kill-buffer "ORUI") +;; (delete-window (get-buffer-window "ORUI" t)) ; xorg +;; (kill-buffer "ORUI") ; xorg (kill-buffer "*httpd*") ) +; xorg +;;(map! :leader +;; :prefix ("N" . "org-roam notes") +;; :desc "Visualize org-roam database with org-roam-ui" +;; "v" 'open-org-roam-ui) + +; wayland (map! :leader :prefix ("N" . "org-roam notes") :desc "Visualize org-roam database with org-roam-ui" - "v" 'open-org-roam-ui) + "v" 'org-roam-ui-open) (map! :leader :prefix ("N" . "org-roam notes") diff --git a/user/app/doom-emacs/doom.org b/user/app/doom-emacs/doom.org index 5e9e181..66066ea 100644 --- a/user/app/doom-emacs/doom.org +++ b/user/app/doom-emacs/doom.org @@ -801,6 +801,7 @@ This needs fixing on NixOS: #+END_SRC *** Org Roam UI Setup I want this to be able to automatically open ORUI in EAF Browser in a split to the right. This kinda works now? +On Wayland, EAF doesn't work. #+BEGIN_SRC emacs-lisp :tangle config.el ;(add-to-list 'display-buffer-alist '("^\\ORUI" display-buffer-in-side-window ; '(side . right) @@ -811,7 +812,8 @@ I want this to be able to automatically open ORUI in EAF Browser in a split to t ; (window-width . 50) ;)) -(setq org-roam-ui-browser-function 'eaf-open-browser) +;;(setq org-roam-ui-browser-function 'eaf-open-browser) ; xorg +(setq org-roam-ui-browser-function 'browse-url) ; wayland (defun open-org-roam-ui () (interactive) @@ -821,15 +823,22 @@ I want this to be able to automatically open ORUI in EAF Browser in a split to t (defun kill-org-roam-ui () (interactive) - (delete-window (get-buffer-window "ORUI" t)) - (kill-buffer "ORUI") +;; (delete-window (get-buffer-window "ORUI" t)) ; xorg +;; (kill-buffer "ORUI") ; xorg (kill-buffer "*httpd*") ) +; xorg +;;(map! :leader +;; :prefix ("N" . "org-roam notes") +;; :desc "Visualize org-roam database with org-roam-ui" +;; "v" 'open-org-roam-ui) + +; wayland (map! :leader :prefix ("N" . "org-roam notes") :desc "Visualize org-roam database with org-roam-ui" - "v" 'open-org-roam-ui) + "v" 'org-roam-ui-open) (map! :leader :prefix ("N" . "org-roam notes")