diff options
| author | benj <benj@rse8.com> | 2021-07-02 11:09:58 -0700 |
|---|---|---|
| committer | benj <benj@rse8.com> | 2021-07-02 11:09:58 -0700 |
| commit | 6c3a78d144f5ced9902d910296aa38c51fde46b1 (patch) | |
| tree | aa60a674fd73e0e9e42ebb297fa56aea0c1b9f03 | |
| parent | e97f3ceeadf8d49c2baf8629086b77cf58120149 (diff) | |
| download | emacs-6c3a78d144f5ced9902d910296aa38c51fde46b1.tar emacs-6c3a78d144f5ced9902d910296aa38c51fde46b1.tar.gz emacs-6c3a78d144f5ced9902d910296aa38c51fde46b1.tar.bz2 emacs-6c3a78d144f5ced9902d910296aa38c51fde46b1.tar.lz emacs-6c3a78d144f5ced9902d910296aa38c51fde46b1.tar.xz emacs-6c3a78d144f5ced9902d910296aa38c51fde46b1.tar.zst emacs-6c3a78d144f5ced9902d910296aa38c51fde46b1.zip | |
mu4e filters
org-mode reset
clojure mode w/ lsp
| -rw-r--r-- | init.el | 2 | ||||
| -rw-r--r-- | settings/setup-clojure-mode.el | 15 | ||||
| -rw-r--r-- | settings/setup-custom.el | 7 | ||||
| -rw-r--r-- | settings/setup-mu4e.el | 13 | ||||
| -rw-r--r-- | settings/setup-org-mode.el | 84 | ||||
| -rw-r--r-- | settings/setup-web-mode.el | 1 | ||||
| -rw-r--r-- | templates/snippets/org-mode/blockquote | 7 | ||||
| -rw-r--r-- | templates/snippets/org-mode/codeblock | 7 | ||||
| -rw-r--r-- | templates/snippets/org-mode/screenplay-block-left | 6 | ||||
| -rw-r--r-- | templates/snippets/org-mode/screenplay-block-right | 6 |
10 files changed, 109 insertions, 39 deletions
@@ -59,6 +59,7 @@ clojure-mode-extra-font-locking clojure-snippets cmake-mode + csv-mode cquery dash dap-mode @@ -99,6 +100,7 @@ protobuf-mode purescript-mode pyvenv + rainbow-mode restclient rustic rust-playground diff --git a/settings/setup-clojure-mode.el b/settings/setup-clojure-mode.el index 109b074..9961f09 100644 --- a/settings/setup-clojure-mode.el +++ b/settings/setup-clojure-mode.el @@ -2,7 +2,22 @@ (require 'clojure-mode-extra-font-locking) (require 'flycheck-clojure) +(add-hook 'clojure-mode-hook 'lsp) +(add-hook 'clojurescript-mode-hook 'lsp) +(add-hook 'clojurec-mode-hook 'lsp) + (add-hook 'clojure-mode-hook 'enable-paredit-mode) (add-hook 'clojure-mode-hook 'prettify-symbols-mode) +(setq gc-cons-threshold (* 100 1024 1024) + read-process-output-max (* 1024 1024) + treemacs-space-between-root-nodes nil + company-minimum-prefix-length 1 + lsp-lens-enable t + lsp-signature-auto-activate nil + ; lsp-enable-indentation nil ; uncomment to use cider indentation instead of lsp + ; lsp-enable-completion-at-point nil ; uncomment to use cider completion instead of lsp + ) + + (provide 'setup-clojure-mode) diff --git a/settings/setup-custom.el b/settings/setup-custom.el index aceedd1..73c6b71 100644 --- a/settings/setup-custom.el +++ b/settings/setup-custom.el @@ -7,12 +7,7 @@ ;; 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. - '(default ((t (:height 90 :width normal :family "Source Code Pro Medium")))) - '(org-level-1 ((t (:inherit outline-1 :height 1.0)))) - '(org-level-2 ((t (:inherit outline-2 :height 1.0)))) - '(org-level-3 ((t (:inherit outline-3 :height 1.0)))) - '(org-level-4 ((t (:inherit outline-4 :height 1.0)))) - '(org-level-5 ((t (:inherit outline-5 :height 1.0))))) + '(default ((t (:height 90 :width normal :family "Source Code Pro Medium"))))) ;; no line highlight (hl-line-mode 0) diff --git a/settings/setup-mu4e.el b/settings/setup-mu4e.el index fec8970..7497150 100644 --- a/settings/setup-mu4e.el +++ b/settings/setup-mu4e.el @@ -79,10 +79,10 @@ ("/personal-gmail/[Gmail]/Trash" . ?t) ("/personal-gmail/[Gmail]/All Mail" . ?a))) - ;; (mu4e-bookmarks . (("date:today..now AND flag:unread AND (NOT maildir:/personal-gmail/[Gmail]/Trash OR NOT maildir:/personal-gmail/[Gmail]/Sent Mail)" "Inbox" ?i) - ;; ("flag:unread AND (NOT maildir:/personal-gmail/[Gmail]/Trash AND NOT maildir:/personal-gmail/[Gmail]/Sent Mail)" "Unread" ?u) - ;; ("date:7d..now AND (NOT maildir:/personal-gmail/[Gmail]/Trash OR NOT maildir:/personal-gmail/[Gmail]/Sent Mail)" "Last 7 Days" ?w) - ;; ("NOT maildir:/personal-gmail/[Gmail]/Trash AND NOT maildir:/personal-gmail/[Gmail]/Sent Mail" "All" ?a))) + (mu4e-bookmarks . (("date:today..now AND flag:unread AND NOT (\"maildir:/personal-gmail/[Gmail]/Trash\")" "Inbox" ?i) + ("date:today..now AND NOT (\"maildir:/personal-gmail/[Gmail]/Trash\" OR \"maildir:/personal-gmail/[Gmail]/Sent Mail\")" "Today" ?t) + ("date:7d..now AND NOT (\"maildir:/personal-gmail/[Gmail]/Trash\" OR \"maildir:/personal-gmail/[Gmail]/Sent Mail\")" "Last 7 Days" ?w) + ("NOT (\"maildir:/personal-gmail/[Gmail]/Trash\" OR \"maildir:/personal-gmail/[Gmail]/Sent Mail\")" "All" ?a))) (smtpmail-queue-dir . "~/.mail/personal-gmail/queue/cur") (smtpmail-smtp-user . ,personal-email) @@ -96,7 +96,8 @@ (add-to-list 'mu4e-view-actions '("View In Browser" . mu4e-action-view-in-browser) t) -;(add-hook 'message-send-hook (lambda () (mml-secure-message-sign-pgpmime))) +(add-hook 'mu4e-compose-mode-hook (lambda () (auto-fill-mode -1))) +(add-hook 'message-send-hook (lambda () (mml-secure-message-sign-pgpmime))) ;; mu4e-alerts (mu4e-alert-set-default-style 'libnotify) @@ -106,7 +107,7 @@ mu4e-alert-interesting-mail-query (concat "date:today..now" " AND flag:unread" - " AND (NOT maildir:/personal-gmail/[Gmail]/Trash OR NOT maildir:/personal-gmail/[Gmail]/Sent Mail)")) + " AND NOT (\"maildir:/personal-gmail/[Gmail]/Trash\" OR \"maildir:/personal-gmail/[Gmail]/Sent Mail\")")) (provide 'setup-mu4e) diff --git a/settings/setup-org-mode.el b/settings/setup-org-mode.el index a2ec85f..bef8ba1 100644 --- a/settings/setup-org-mode.el +++ b/settings/setup-org-mode.el @@ -1,31 +1,63 @@ ;; Pretty bullets -(add-hook 'org-mode-hook (lambda() (org-bullets-mode 1))) - -(setq org-log-done 'time) -(setq org-src-fontify-natively t) -(setq org-src-tab-acts-natively t) -(setq org-todo-keywords - '((sequence "TODO" "IN-PROGRESS" "BLOCKED" "DONE"))) -(setq org-tag-alist - '((:startgroup . nil) - ("blocker" . ?b) - ("!critical" . ?u) - ("!major" . ?m) - ("!minor" . ?n) - ("!trivial" . ?t) - (:endgroup . nil) - ("@home" . ?h) - ("@store" . ?s) - ("@work" . ?w) - ("reading" . ?r) - ("studying" . ?s) - ("implementation" . ?i))) - (global-set-key (kbd "C-c a") 'org-agenda) -(org-babel-do-load-languages - 'org-babel-load-languages - '((emacs-lisp . t) - (python . t))) +;; open org mode planner +(global-set-key (kbd "C-c b") + (lambda () (interactive) + (delete-other-windows) + (find-file "~/workspace/.org/planner.org"))) + +(require 'rainbow-mode) +(add-hook 'org-mode-hook 'rainbow-mode) + +(setq org-base-directory "~/workspace/.org") + +(setq + org-export-html-postamble nil + org-log-done 'note + org-todo-keywords '((sequence "Todo" "In-Progress" "Waiting" "Done")) + org-agenda-files (list "~/workspace/.org/planner.org")) + +;; org publish +(require 'ox-publish) + +(defun publishing-entry (project) + `(,project + :base-directory ,(concat org-base-directory "/" project) + :base-extension "org" + :headline-levels 4 + :html-head-include-default-style nil + :html-head-include-scripts nil + :html-head-extra ,(concat "<link rel=\"stylesheet\" type=\"text/css\" href=\"/css/style.css\"") + :html-mathjax nil + :html-preamble nil + :html-validation-link nil + :publishing-directory ,(concat org-base-directory "/" project "/public/") + :publishing-function org-html-publish-to-html + :recursive t + :section-numbers nil + :time-stamp-file nil + :with-toc nil + :with-author nil + :with-creator nil)) + +(defun publishing-static (project) + `(,(concat project "-static") + :base-directory ,(concat org-base-directory "/" project) + :base-extension "css\\|js\\|png\\|jpg\\|gif\\|pdf\\|mp3\\|ogg\\|swf" + :publishing-directory ,(concat org-base-directory "/" project "/public/") + :recursive t + :publishing-function org-publish-attachment)) + +(setq + projects '("rse8.com") + org-html-htmlize-output-type 'css) + +(setq org-publish-project-alist + `( + ,@(mapcar (lambda (proj) (publishing-entry proj)) projects) + ,@(mapcar (lambda (proj) (publishing-static proj)) projects) + ("rse8-site" :components ("rse8.com" "rse8.com-static")) + )) (provide 'setup-org-mode) diff --git a/settings/setup-web-mode.el b/settings/setup-web-mode.el index 9eae84d..443c713 100644 --- a/settings/setup-web-mode.el +++ b/settings/setup-web-mode.el @@ -9,7 +9,6 @@ (add-to-list 'auto-mode-alist '("\\.js\\'" . web-mode)) (add-to-list 'auto-mode-alist '("\\.ts\\'" . web-mode)) (add-to-list 'auto-mode-alist '("\\.tsx\\'" . web-mode)) -(add-to-list 'auto-mode-alist '("\\.json\\'" . web-mode)) (add-to-list 'auto-mode-alist '("\\.mustache\\'" . web-mode)) (add-to-list 'auto-mode-alist '("\\.tpl\\'" . web-mode)) (add-to-list 'auto-mode-alist '("\\.eex\\'" . web-mode)) diff --git a/templates/snippets/org-mode/blockquote b/templates/snippets/org-mode/blockquote new file mode 100644 index 0000000..82a837c --- /dev/null +++ b/templates/snippets/org-mode/blockquote @@ -0,0 +1,7 @@ +# -*- mode: snippet -*- +# name: blockquote +# key: > +# -- +#+begin_quote +$0 +#+end_quote
\ No newline at end of file diff --git a/templates/snippets/org-mode/codeblock b/templates/snippets/org-mode/codeblock new file mode 100644 index 0000000..88ddca4 --- /dev/null +++ b/templates/snippets/org-mode/codeblock @@ -0,0 +1,7 @@ +# -*- mode: snippet -*- +# name: codeblock +# key: ``` +# -- +#+begin_src $1 +$0 +#+end_src
\ No newline at end of file diff --git a/templates/snippets/org-mode/screenplay-block-left b/templates/snippets/org-mode/screenplay-block-left new file mode 100644 index 0000000..e825b88 --- /dev/null +++ b/templates/snippets/org-mode/screenplay-block-left @@ -0,0 +1,6 @@ +# key: "l +# name: screenplay-block-left +# -- +#+BEGIN_SCREENPLAY_LEFT +$0 +#+END_SCREENPLAY_LEFT
\ No newline at end of file diff --git a/templates/snippets/org-mode/screenplay-block-right b/templates/snippets/org-mode/screenplay-block-right new file mode 100644 index 0000000..84b7136 --- /dev/null +++ b/templates/snippets/org-mode/screenplay-block-right @@ -0,0 +1,6 @@ +# key: "r +# name: screenplay-block-right +# -- +#+BEGIN_SCREENPLAY_RIGHT +$0 +#+END_SCREENPLAY_RIGHT
\ No newline at end of file |
