diff options
| -rw-r--r-- | org-roam-ui.el | 52 | ||||
| -rw-r--r-- | pages/_app.tsx | 25 |
2 files changed, 62 insertions, 15 deletions
diff --git a/org-roam-ui.el b/org-roam-ui.el index 83476e9..e2fbad4 100644 --- a/org-roam-ui.el +++ b/org-roam-ui.el @@ -59,6 +59,30 @@ (defvar org-roam-ui-port 35901 "Port to serve the org-roam-ui interface.") +(defcustom org-roam-ui-sync-theme t + "Syncs your current Emacs theme with org-raom-ui. Works best with doom-themes. +Ignored if a custom theme is provied for 'org-roam-ui-custom-theme'." + :group 'org-roam-ui + :type 'boolean) + +(defcustom org-roam-ui-custom-theme nil + "Custom theme for org-roam-ui. Blocks 'org-roam-ui-sync-theme. +Provide a list of cons with the following values: +bg, bg-alt, fg, fg-alt, red, orange, yellow, green, cyan, blue, violet, magenta. +E.g. '((bg . '#1E2029') + (bg-alt . '#282a36') + (fg . '#f8f8f2') + (fg-alt . '#6272a4') + (red . '#ff5555') + (orange . '#f1fa8c') + (yellow .'#ffb86c') + (green . '#50fa7b') + (cyan . '#8be9fd') +(blue . '#ff79c6') +(violet . '#8be9fd') +(magenta . '#bd93f9'))." + :group 'org-roam-ui + :type 'list) (define-minor-mode org-roam-ui-mode @@ -135,15 +159,35 @@ This function is added to `post-command-hook'." (condition-case nil (org-roam-id-at-point) (error nil)) org-roam-ui-current-node-id))) +(defun org-roam-ui-get-theme () + "Attempt to bring the current theme into a standardized format." +(list `(bg . ,(face-background hl-line-face)) + `(bg-alt . ,(face-background 'default)) + `(fg . ,(face-foreground 'default)) + `(fg-alt . ,(face-foreground font-lock-comment-face)) + `(red . ,(face-foreground 'error)) + `(orange . ,(face-foreground 'warning)) + `(yellow . ,(face-foreground font-lock-builtin-face)) + `(green . ,(face-foreground 'success)) + `(cyan . ,(face-foreground font-lock-constant-face)) + `(blue . ,(face-foreground font-lock-keyword-face)) + `(violet . ,(face-foreground font-lock-constant-face)) + `(magenta . ,(face-foreground font-lock-preprocessor-face)) + )) + (defservlet* theme text/stream () - (progn - (when (boundp 'doom-themes--colors) + (progn) + (if org-roam-ui-sync-theme + (if (boundp 'doom-themes--colors) (let* ((colors (butlast doom-themes--colors (- (length doom-themes--colors) 25))) ui-theme (list nil)) (progn (dolist (color colors) (push (cons (car color) (car (cdr color))) ui-theme)) - (insert (format "data: %s\n\n" (json-encode ui-theme)))))) - (httpd-send-header t "text/event-stream" 200 :Access-Control-Allow-Origin "*"))) + (insert (format "data: %s\n\n" (json-encode ui-theme))))) + (insert (format "data: %s\n\n" (json-encode (org-roam-ui-get-theme))))) + (when org-roam-ui-custom-theme + (insert (format "data %s\n\n" (json-encode org-roam-ui-custom-theme))))) + (httpd-send-header t "text/event-stream" 200 :Access-Control-Allow-Origin "*")) (provide 'org-roam-ui) ;;; org-roam-ui.el ends here diff --git a/pages/_app.tsx b/pages/_app.tsx index 6d2cefe..1455426 100644 --- a/pages/_app.tsx +++ b/pages/_app.tsx @@ -43,21 +43,24 @@ function MyApp({ Component, pageProps }: AppProps) { const theme = useMemo(() => { const borderColor = emacsTheme.violet + 'aa' + const bgfgInterpolate = d3int.interpolate(emacsTheme.bg, emacsTheme.fg) return extendTheme({ colors: { white: emacsTheme.bg, black: emacsTheme.fg, gray: { - 100: emacsTheme.base1, - 200: d3int.interpolate(emacsTheme.base1, emacsTheme.base2)(0.2), - 300: emacsTheme.base2, - 400: emacsTheme.base3, - 500: emacsTheme.base4, - 600: emacsTheme.base5, - 700: emacsTheme.base6, - 800: emacsTheme.base7, - 900: emacsTheme.base8, - inter: d3int.interpolate(emacsTheme.base4, emacsTheme.base3), + 100: emacsTheme.base1 ?? bgfgInterpolate(0.1), + 200: d3int.interpolate(emacsTheme.base1, emacsTheme.base2)(0.2) ?? bgfgInterpolate(0.2), + 300: emacsTheme.base2 ?? bgfgInterpolate(0.3), + 400: emacsTheme.base3 ?? bgfgInterpolate(0.4), + 500: emacsTheme.base4 ?? bgfgInterpolate(0.5), + 600: emacsTheme.base5 ?? bgfgInterpolate(0.6), + 700: emacsTheme.base6 ?? bgfgInterpolate(0.7), + 800: emacsTheme.base7 ?? bgfgInterpolate(0.8), + 900: emacsTheme.base8 ?? bgfgInterpolate(0.9), + inter: emacsTheme.base4 + ? d3int.interpolate(emacsTheme.base4, emacsTheme.base3) + : bgfgInterpolate(0.45), }, blue: { 500: emacsTheme.blue, @@ -79,7 +82,7 @@ function MyApp({ Component, pageProps }: AppProps) { }, purple: { 500: emacsTheme.violet, - inter: d3int.interpolate(emacsTheme.base4, emacsTheme.violet), + inter: d3int.interpolate(emacsTheme.base4 ?? bgfgInterpolate(0.5), emacsTheme.violet), }, pink: { 500: emacsTheme.magenta, |