From f562775f5c0cec0907a5b6f29efef2d07b74675f Mon Sep 17 00:00:00 2001 From: Chris Cochrun Date: Sat, 14 Aug 2021 09:39:21 -0500 Subject: [PATCH 1/2] Some changes of things --- README.org | 77 ++++++++++++++++----------- init.el | 150 ++++++++++++++++++++++++++++++----------------------- 2 files changed, 131 insertions(+), 96 deletions(-) diff --git a/README.org b/README.org index cb4a4183..2e0d07fa 100644 --- a/README.org +++ b/README.org @@ -34,7 +34,7 @@ - [[#bongo][Bongo]] - [[#transmission][Transmission]] - [[#pass][Pass]] - - [[#matrix][Matrix]] + - [[#matrixement][Matrix/Ement]] - [[#activitywatch][ActivityWatch]] - [[#mybible][MyBible]] - [[#performance][Performance]] @@ -605,10 +605,10 @@ Marginalia makes for some great decoration to our minibuffer completion items. W #+begin_src emacs-lisp (use-package marginalia :bind (:map minibuffer-local-map - ("C-M-a" . marginalia-cycle) - ;; :map embark-general-map - ;; ("A" . marginalia-cycle) - ) + ("C-M-a" . marginalia-cycle) + ;; :map embark-general-map + ;; ("A" . marginalia-cycle) + ) ;; The :init configuration is always executed (Not lazy!) :init @@ -623,7 +623,10 @@ Marginalia makes for some great decoration to our minibuffer completion items. W ;; Prefer richer, more heavy, annotations over the lighter default variant. (setq marginalia-annotators '(marginalia-annotators-heavy marginalia-annotators-light nil)) - :after selectrum) + :after selectrum + :config + (setq marginalia--cache-size 60000)) + #+end_src *** Company @@ -708,6 +711,10 @@ Ace link provides an avy like search for links. Upon using the keybindings prese (display-buffer-in-side-window) (side . right) (window-width . 0.4)) + ("*org-roam*" + (display-buffer-in-side-window) + (side . right) + (window-width . 0.4)) ("\\*elfeed-entry\\*" (display-buffer-in-side-window) (side . bottom) @@ -1255,9 +1262,7 @@ We also need to setup some capture templates to use some specific setups with my #+BEGIN_SRC emacs-lisp (use-package org-roam :after org - ;; :ensure t - :hook - (after-init . org-roam-mode) + :ensure t :config (setq org-roam-directory "~/org" org-roam-buffer-width 0.25 @@ -1287,13 +1292,18 @@ We also need to setup some capture templates to use some specific setups with my :immediate-finish t :file-name "%<%Y-%m-%d>-bib" :head "#+TITLE: %<%Y-%m-%d> - Biblical\n#+AUTHOR: Chris Cochrun"))) + (org-roam-setup) + (setq org-roam-v2-ack t) :general (chris/leader-keys :states 'normal :keymaps 'override - "nf" '(org-roam-find-file :which-key "org roam ff") - "nr" 'org-roam - "ni" 'org-roam-insert)) + "nf" '(org-roam-node-find :which-key "org roam ff") + "nr" 'org-roam-buffer-toggle + "ni" 'org-roam-node-insert + "nc" 'org-roam-capture + "njt" 'org-roam-dailies-capture-today + "ng" 'org-roam-graph)) #+END_SRC @@ -1301,19 +1311,16 @@ We also need to setup some capture templates to use some specific setups with my Org-Roam server. This let's me visualize my notes. In order to use it, I need to go to http://localhost:8080 #+BEGIN_SRC emacs-lisp -(use-package org-roam-server +(use-package websocket) +(use-package org-roam-ui + :straight (:host github :repo "org-roam/org-roam-ui" :files ("*.el" "out")) + :after org-roam :config - (setq org-roam-server-host "127.0.0.1" - org-roam-server-port 8080 - org-roam-server-export-inline-images t - org-roam-server-authenticate nil - org-roam-server-serve-files t - org-roam-server-network-label-truncate t - org-roam-server-network-label-truncate-length 60 - org-roam-server-network-label-wrap-length 20) - :after org-roam) + (setq org-roam-ui-sync-theme t + org-roam-ui-follow t + org-roam-ui-update-on-save t + org-roam-ui-open-on-start t)) -(add-hook 'org-roam-mode-hook org-roam-server-mode t) #+END_SRC *** Org-Superstar Org-Superstar makes the stars at the beginning of the line in =org-mode= a lot prettier. @@ -1795,9 +1802,7 @@ Let's add our own eshell prompt. and set the password cache to a significantly h (add-hook 'eshell-mode-hook '(display-line-numbers-mode -1)) (setq eshell-command-aliases-list - '(("ls" "exa $1") - ("la" "exa -la $1") - ("q" "exit") + '(("q" "exit") ("f" "find-file $1") ("ff" "find-file $1") ("d" "dired $1") @@ -1945,6 +1950,7 @@ interfere with the default `bongo-playlist-buffer'." :matcher '(("http:" "https:" "lbry:") . t)) (setq bongo-enabled-backends '(mpv) + bongo-mpv-extra-arguments '("--profile=fast") bongo-track-mark-icon-file-name "track-mark-icon.png") (defun chris/bongo-mark-line-forward () @@ -2042,11 +2048,22 @@ I like to keep my passwords in password-store for a very unixy way of doing thin "st" 'password-store-otp-token-copy)) #+end_src -** Matrix +** Matrix/Ement Matrix.el is a decent enough matrix client built in emacs. Like it. -#+begin_src emacs-lisp :tangle no -(use-package matrix-client - :straight (matrix-client :type git :host github :repo "alphapapa/matrix-client.el")) +#+begin_src emacs-lisp +(use-package plz + :straight (plz :type git :host github :repo "alphapapa/plz.el")) + +(use-package ement + :straight (ement :type git :host github :repo "alphapapa/ement.el") + :config + (setq ement-room-images t) + :general + (general-def 'normal ement-room-mode-map + "q" 'bury-buffer + "RET" 'ement-room-send-message) + (chris/leader-keys + "oM" 'ement-list-rooms)) #+end_src ** ActivityWatch diff --git a/init.el b/init.el index 6f96a706..5bbedff6 100644 --- a/init.el +++ b/init.el @@ -2,9 +2,9 @@ (defun chris/display-startup-time () (message "Emacs loaded in %s with %d garbage collections." (format "%.2f seconds" - (float-time - (time-subtract after-init-time before-init-time))) - gcs-done)) + (float-time + (time-subtract after-init-time before-init-time))) + gcs-done)) (add-hook 'emacs-startup-hook #'chris/display-startup-time) (setq inhibit-startup-message t) @@ -48,7 +48,7 @@ (with-selected-frame frame (chris/set-font-faces) (chris/set-transparency))) - (chris/set-font-faces)) + (chris/set-font-faces)) (chris/set-transparency)) (setq display-line-numbers-type 'relative) @@ -65,7 +65,7 @@ ;; ...especially on linux (setq x-gtk-use-system-tooltips nil) -;; Favor vertical splits over horizontal ones. Screens are usually wide. + ;; Favor vertical splits over horizontal ones. Screens are usually wide. (setq split-width-threshold 160 split-height-threshold nil) @@ -99,8 +99,8 @@ (straight-use-package 'use-package) (setq use-package-verbose t) -(use-package command-log-mode - :commands command-log-mode) + (use-package command-log-mode + :commands command-log-mode) (use-package all-the-icons) @@ -294,19 +294,19 @@ ;; We need to fix selectrums minibuffer handling for Emacs 28 (defun selectrum--set-window-height (window &optional height) - "Set window height of WINDOW to HEIGHT pixel. + "Set window height of WINDOW to HEIGHT pixel. If HEIGHT is not given WINDOW will be updated to fit its content vertically." - (let* ((lines (length - (split-string - (overlay-get selectrum--candidates-overlay 'after-string) - "\n" t))) - (dheight (or height - (* lines selectrum--line-height))) - (wheight (window-pixel-height window)) - (window-resize-pixelwise t)) - (window-resize - window (- dheight wheight) nil nil 'pixelwise))) + (let* ((lines (length + (split-string + (overlay-get selectrum--candidates-overlay 'after-string) + "\n" t))) + (dheight (or height + (* lines selectrum--line-height))) + (wheight (window-pixel-height window)) + (window-resize-pixelwise t)) + (window-resize + window (- dheight wheight) nil nil 'pixelwise))) :general @@ -359,7 +359,9 @@ vertically." ;; Prefer richer, more heavy, annotations over the lighter default variant. (setq marginalia-annotators '(marginalia-annotators-heavy marginalia-annotators-light nil)) - :after selectrum) + :after selectrum + :config + (setq marginalia--cache-size 60000)) (use-package company :config @@ -416,6 +418,10 @@ vertically." (display-buffer-in-side-window) (side . right) (window-width . 0.4)) + ("*org-roam*" + (display-buffer-in-side-window) + (side . right) + (window-width . 0.4)) ("\\*elfeed-entry\\*" (display-buffer-in-side-window) (side . bottom) @@ -483,7 +489,7 @@ vertically." (use-package friar :straight (:host github :repo "warreq/friar" :branch "master" - :files (:defaults "*.lua" "*.fnl")) + :files (:defaults "*.lua" "*.fnl")) :after fennel-mode) (use-package yaml-mode @@ -819,26 +825,24 @@ vertically." :after org :init (setq org-super-agenda-groups '((:name "Today" - :time-grid t - :scheduled today) + :time-grid t + :scheduled today) (:name "Due Today" - :deadline today) + :deadline today) (:name "Important" - :priority "A") + :priority "A") (:name "Overdue" - :time-grid t - :scheduled today) + :time-grid t + :scheduled today) (:name "Due soon" - :deadline future))) + :deadline future))) :config (org-super-agenda-mode) (setq org-super-agenda-header-map nil)) (use-package org-roam :after org - ;; :ensure t - :hook - (after-init . org-roam-mode) + :ensure t :config (setq org-roam-directory "~/org" org-roam-buffer-width 0.25 @@ -868,27 +872,28 @@ vertically." :immediate-finish t :file-name "%<%Y-%m-%d>-bib" :head "#+TITLE: %<%Y-%m-%d> - Biblical\n#+AUTHOR: Chris Cochrun"))) + (org-roam-setup) + (setq org-roam-v2-ack t) :general (chris/leader-keys :states 'normal :keymaps 'override - "nf" '(org-roam-find-file :which-key "org roam ff") - "nr" 'org-roam - "ni" 'org-roam-insert)) + "nf" '(org-roam-node-find :which-key "org roam ff") + "nr" 'org-roam-buffer-toggle + "ni" 'org-roam-node-insert + "nc" 'org-roam-capture + "njt" 'org-roam-dailies-capture-today + "ng" 'org-roam-graph)) -(use-package org-roam-server +(use-package websocket) +(use-package org-roam-ui + :straight (:host github :repo "org-roam/org-roam-ui" :files ("*.el" "out")) + :after org-roam :config - (setq org-roam-server-host "127.0.0.1" - org-roam-server-port 8080 - org-roam-server-export-inline-images t - org-roam-server-authenticate nil - org-roam-server-serve-files t - org-roam-server-network-label-truncate t - org-roam-server-network-label-truncate-length 60 - org-roam-server-network-label-wrap-length 20) - :after org-roam) - -(add-hook 'org-roam-mode-hook org-roam-server-mode t) + (setq org-roam-ui-sync-theme t + org-roam-ui-follow t + org-roam-ui-update-on-save t + org-roam-ui-open-on-start t)) (use-package org-superstar :after org @@ -1336,20 +1341,18 @@ If on a: (add-hook 'eshell-mode-hook '(display-line-numbers-mode -1)) (setq eshell-command-aliases-list - '(("ls" "exa $1") - ("la" "exa -la $1") - ("q" "exit") - ("f" "find-file $1") - ("ff" "find-file $1") - ("d" "dired $1") - ("bd" "eshell-up $1") - ("rg" "rg --color=always $*") - ("ll" "ls -lah $*") - ("gg" "magit-status") - ("clear" "clear-scrollback") - ("!c" "eshell-previous-input 2") - ("yay" "paru $1") - ("yeet" "paru -Rns $1"))) + '(("q" "exit") + ("f" "find-file $1") + ("ff" "find-file $1") + ("d" "dired $1") + ("bd" "eshell-up $1") + ("rg" "rg --color=always $*") + ("ll" "ls -lah $*") + ("gg" "magit-status") + ("clear" "clear-scrollback") + ("!c" "eshell-previous-input 2") + ("yay" "paru $1") + ("yeet" "paru -Rns $1"))) :general (chris/leader-keys @@ -1364,8 +1367,8 @@ If on a: (use-package pdf-tools :straight (:host github - :repo "flatwhatson/pdf-tools" - :branch "fix-macros") + :repo "flatwhatson/pdf-tools" + :branch "fix-macros") :defer 1 :config (pdf-tools-install) @@ -1467,6 +1470,7 @@ interfere with the default `bongo-playlist-buffer'." :matcher '(("http:" "https:" "lbry:") . t)) (setq bongo-enabled-backends '(mpv) + bongo-mpv-extra-arguments '("--profile=fast") bongo-track-mark-icon-file-name "track-mark-icon.png") (defun chris/bongo-mark-line-forward () @@ -1524,11 +1528,11 @@ interfere with the default `bongo-playlist-buffer'." transmission-files-mode transmission-info-mode transmission-peers-mode))) - :general - (chris/leader-keys - :states 'normal - :keymaps 'override - "ot" 'transmission)) + :general + (chris/leader-keys + :states 'normal + :keymaps 'override + "ot" 'transmission)) (use-package auth-source-pass :defer 1 @@ -1549,6 +1553,20 @@ interfere with the default `bongo-playlist-buffer'." (chris/leader-keys "st" 'password-store-otp-token-copy)) +(use-package plz + :straight (plz :type git :host github :repo "alphapapa/plz.el")) + +(use-package ement + :straight (ement :type git :host github :repo "alphapapa/ement.el") + :config + (setq ement-room-images t) + :general + (general-def 'normal ement-room-mode-map + "q" 'bury-buffer + "RET" 'ement-room-send-message) + (chris/leader-keys + "oM" 'ement-list-rooms)) + (use-package activity-watch-mode :init (if (string-equal (system-name) "syl") From 1dfaaf62dc48f8b133c6cbaa7cf00c8620c0349d Mon Sep 17 00:00:00 2001 From: Chris Cochrun Date: Mon, 16 Aug 2021 06:14:33 -0500 Subject: [PATCH 2/2] Making org mode work better on phone --- README.org | 12 ++++++------ init.el | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/README.org b/README.org index 2e0d07fa..8c5fdd19 100644 --- a/README.org +++ b/README.org @@ -1068,10 +1068,10 @@ Part of this config includes some special capture templates for my work as a you (setq org-capture-templates '(("t" "Personal todo" entry - (file+headline "todo.org" "Inbox") + (file+headline "todo/todo.org" "Inbox") (file ".templates/tasks.org") :prepend t) ("n" "Personal notes" entry - (file+headline "notes.org" "Inbox") + (file+headline "todo/notes.org" "Inbox") "* %u %?\n%i\n%a" :prepend t) ("j" "Journal" entry (file+olp+datetree +org-capture-journal-file) @@ -1083,7 +1083,7 @@ Part of this config includes some special capture templates for my work as a you :jump-to-captured t :empty-lines 1) ("P" "TFC Posts" entry - (file+headline "/home/chris/org/nvtfc_social_media.org" "Posts") + (file+headline "nvtfc_social_media.org" "Posts") (file ".templates/posts.org") :prepend t :jump-to-captured t) @@ -1115,13 +1115,13 @@ Part of this config includes some special capture templates for my work as a you '((sequence "TODO(t)" "PROJ(p)" "STRT(s)" "WAIT(w)" "HOLD(h)" "|" "DONE(d)" "CNCL(c)") (sequence "[ ](T)" "[-](S)" "[?](W)" "|" "[X](D)")) org-agenda-files - '("/home/chris/org/inbox.org" - "/home/chris/org/notes.org" + '("/home/chris/org/todo/inbox.org" + "/home/chris/org/todo/notes.org" "/home/chris/org/repetition.org" "/home/chris/org/tasks.org" "/home/chris/org/tfc_plans.org" "/home/chris/org/ministry_team.org" - "/home/chris/org/todo.org" + "/home/chris/org/todo/todo.org" "/home/chris/org/newsletter.org" "/home/chris/org/nvtfc_social_media.org" "/home/chris/org/lessons/") diff --git a/init.el b/init.el index 5bbedff6..2f7efa18 100644 --- a/init.el +++ b/init.el @@ -671,10 +671,10 @@ vertically." (setq org-capture-templates '(("t" "Personal todo" entry - (file+headline "todo.org" "Inbox") + (file+headline "todo/todo.org" "Inbox") (file ".templates/tasks.org") :prepend t) ("n" "Personal notes" entry - (file+headline "notes.org" "Inbox") + (file+headline "todo/notes.org" "Inbox") "* %u %?\n%i\n%a" :prepend t) ("j" "Journal" entry (file+olp+datetree +org-capture-journal-file) @@ -686,7 +686,7 @@ vertically." :jump-to-captured t :empty-lines 1) ("P" "TFC Posts" entry - (file+headline "/home/chris/org/nvtfc_social_media.org" "Posts") + (file+headline "nvtfc_social_media.org" "Posts") (file ".templates/posts.org") :prepend t :jump-to-captured t) @@ -718,13 +718,13 @@ vertically." '((sequence "TODO(t)" "PROJ(p)" "STRT(s)" "WAIT(w)" "HOLD(h)" "|" "DONE(d)" "CNCL(c)") (sequence "[ ](T)" "[-](S)" "[?](W)" "|" "[X](D)")) org-agenda-files - '("/home/chris/org/inbox.org" - "/home/chris/org/notes.org" + '("/home/chris/org/todo/inbox.org" + "/home/chris/org/todo/notes.org" "/home/chris/org/repetition.org" "/home/chris/org/tasks.org" "/home/chris/org/tfc_plans.org" "/home/chris/org/ministry_team.org" - "/home/chris/org/todo.org" + "/home/chris/org/todo/todo.org" "/home/chris/org/newsletter.org" "/home/chris/org/nvtfc_social_media.org" "/home/chris/org/lessons/")