From 9c35a97343172c2253b84f490b3ea195dff0b54c Mon Sep 17 00:00:00 2001 From: mattkae Date: Sat, 18 Mar 2023 14:57:57 -0400 Subject: Including rust and some org-mode updates --- init.el | 36 ++++++++++++++++++++++++++++++++++++ lisp/org-custom.el | 7 +++++-- lisp/rust.el | 13 +++++++++++++ 3 files changed, 54 insertions(+), 2 deletions(-) create mode 100644 lisp/rust.el diff --git a/init.el b/init.el index 45cb7d8..d923196 100644 --- a/init.el +++ b/init.el @@ -40,8 +40,44 @@ (require 'json) (require 'python-custom) (require 'vc-annotate-lens-mode) +(require 'rust) (require 'server) (unless (server-running-p) (server-start)) +(custom-set-variables + ;; custom-set-variables was added by Custom. + ;; If you edit it by hand, you could mess it up, so be careful. + ;; Your init file should contain only one such instance. + ;; If there is more than one, they won't work right. + '(org-agenda-files (list org-directory)) + '(org-directory "~/OrgRoam") + '(package-selected-packages + '(rust-mode xref-js2 web-mode vterm-toggle vscode-dark-plus-theme treemacs-projectile tree-sitter-langs tide tern smartparens rtags req-package rainbow-mode pythonic python-mode perfect-margin org-roam org-notify org-modern org-bullets org-alert minimap markdown-mode json-mode js2-refactor js2-highlight-vars js-doc ido-vertical-mode hl-todo highlight-thing highlight-indent-guides helm-projectile helm-posframe helm-ag good-scroll go-mode git-gutter-fringe git-commit flycheck-irony evil eslint-fix emojify eldoc-box eglot drag-stuff doom-themes dashboard css-eldoc counsel company-quickhelp company-irony cmake-mode cmake-ide auctex all-the-icons ac-js2))) +(custom-set-faces + ;; custom-set-faces was added by Custom. + ;; If you edit it by hand, you could mess it up, so be careful. + ;; Your init file should contain only one such instance. + ;; If there is more than one, they won't work right. + '(org-block ((t (:inherit fixed-pitch)))) + '(org-code ((t (:inherit (shadow fixed-pitch))))) + '(org-document-info ((t (:foreground "dark orange")))) + '(org-document-info-keyword ((t (:inherit (shadow fixed-pitch))))) + '(org-document-title ((t (:inherit default :weight normal :foreground "#383a42" :font "Iosevka" :height 1.3 :weight:bold)))) + '(org-indent ((t (:inherit (org-hide fixed-pitch))))) + '(org-level-1 ((t (:inherit default :weight normal :foreground "#383a42" :font "Iosevka" :height 1.5 :weight bold)))) + '(org-level-2 ((t (:inherit default :weight normal :foreground "#383a42" :font "Iosevka" :height 1.3 :weight bold)))) + '(org-level-3 ((t (:inherit default :weight normal :foreground "#383a42" :font "Iosevka" :height 1.1)))) + '(org-level-4 ((t (:inherit default :weight normal :foreground "#383a42" :font "Iosevka" :height 1.0)))) + '(org-level-5 ((t (:inherit default :weight normal :foreground "#383a42" :font "Iosevka")))) + '(org-level-6 ((t (:inherit default :weight normal :foreground "#383a42" :font "Iosevka")))) + '(org-level-7 ((t (:inherit default :weight normal :foreground "#383a42" :font "Iosevka")))) + '(org-level-8 ((t (:inherit default :weight normal :foreground "#383a42" :font "Iosevka")))) + '(org-link ((t (:foreground "royal blue" :underline t)))) + '(org-meta-line ((t (:inherit (font-lock-comment-face fixed-pitch))))) + '(org-property-value ((t (:inherit fixed-pitch))) t) + '(org-special-keyword ((t (:inherit (font-lock-comment-face fixed-pitch))))) + '(org-table ((t (:inherit fixed-pitch :foreground "#83a598")))) + '(org-tag ((t (:inherit (shadow fixed-pitch) :weight bold :height 0.8)))) + '(org-verbatim ((t (:inherit (shadow fixed-pitch)))))) diff --git a/lisp/org-custom.el b/lisp/org-custom.el index e46a070..f06ebae 100644 --- a/lisp/org-custom.el +++ b/lisp/org-custom.el @@ -79,9 +79,10 @@ (use-package org-alert :ensure t :config + (org-alert-enable) (setq org-alert-interval 300 org-alert-notify-cutoff 10 - org-alert-notify-after-event-cutoff 10 + org-alert-notify-after-event-cutoff nil alert-default-style 'libnotify)) (use-package org-roam @@ -90,7 +91,9 @@ (org-roam-directory "~/OrgRoam") :bind (("C-c n l" . org-roam-buffer-toggle) ("C-c n f" . org-roam-node-find) - ("C-c n i" . org-roam-node-insert)) + ("C-c n i" . org-roam-node-insert) + ("C-c n g" . org-roam-graph) + ("C-c n j" . org-roam-dailies-capture-today)) :config (org-roam-setup) ) diff --git a/lisp/rust.el b/lisp/rust.el new file mode 100644 index 0000000..f200c40 --- /dev/null +++ b/lisp/rust.el @@ -0,0 +1,13 @@ + +(use-package rust-mode + :ensure t + :config + (setq rust-format-on-save t)) + +(use-package eglot + :ensure t + :after (rust-mode) + :config + (add-hook 'rust-mode-hook 'eglot-ensure)) + +(provide 'rust) -- cgit v1.2.1