diff --git a/init.el b/init.el index e40265d5..1ab44d2e 100644 --- a/init.el +++ b/init.el @@ -275,7 +275,7 @@ "fs" '(save-buffer :which-key "save") "fE" '(consult-file-externally :which-key "find file externally") "fe" '(chris/edit-emacs-config :which-key "open config") - "hf" '(helpful-callable :which-key "describe-function") + "hf" '(helpful-function :which-key "describe-function") "hv" '(helpful-variable :which-key "describe-variable") "hk" '(helpful-key :which-key "describe-key") "hF" '(describe-face :which-key "describe-face") @@ -466,6 +466,8 @@ much faster. The hope is to also make this a faster version of imenu." :config (setq org-startup-indented t org-edit-src-content-indentation 0 + org-indent-turns-on-hiding-stars nil + org-indent-mode-turns-on-hiding-stars nil org-agenda-sticky t org-fontify-quote-and-verse-blocks t org-src-preserve-indentation t @@ -565,7 +567,7 @@ much faster. The hope is to also make this a faster version of imenu." "/home/chris/dev/church-presenter/TODO.org" "/home/chris/dev/tfcconnection/TODO.org" "/home/chris/org/lessons/" - "/home/chris/org/daily/") + "/home/chris/org/dailies/") org-id-method 'ts org-agenda-tags-column -75 org-columns-summary-types '(("+" . org-columns--summary-sum) @@ -739,7 +741,8 @@ much faster. The hope is to also make this a faster version of imenu." :config (setq org-roam-directory "~/org" org-roam-buffer-width 0.25 - org-roam-file-exclude-regexp ".stversion.*\|.stfolder.*\|.*~.*\|.*sync.*" + org-roam-list-files-commands '(fd rg find fdfind) + org-roam-file-exclude-regexp '(".stversion/|logseq/|presentations/|.stfolder/|.*~.*|.*sync.*") org-roam-db-location "~/.emacs.d/org-roam.db" org-roam-completion-everywhere t org-roam-dailies-directory "dailies/" @@ -792,6 +795,25 @@ much faster. The hope is to also make this a faster version of imenu." (org-id-get-create) (org-roam-alias-add)) ;; (set-face-attribute 'magit-section-highlight nil :inherit 'variable-pitch) + +(defun chris/consult-ripgrep-files-with-matches (&optional dir initial) + "Use consult-find style to return matches with \"rg --file-with-matches \". No live preview." + (interactive "P") + (let ((consult-find-command "rg --null --ignore-case -g presentations --type org --max-columns=500 --no-heading --line-buffered --line-number . -e ARG OPTS")) + (consult-find dir initial))) + +(defun chris/org-roam-rg-search () + "Search org-roam directory using consult-ripgrep. With live-preview." + (interactive) + (let ((consult-ripgrep-command "rg --null --ignore-case --type org --line-buffered --color=always --max-columns=500 --no-heading --line-number . -e ARG OPTS")) + (consult-ripgrep org-roam-directory))) + +(defun chris/org-roam-rg-file-search () + "Search org-roam directory using consult-find with \"rg --file-with-matches \". No live preview." + (interactive) + (chris/consult-ripgrep-files-with-matches org-roam-directory)) + + (org-roam-setup) :general (chris/leader-keys @@ -806,6 +828,7 @@ much faster. The hope is to also make this a faster version of imenu." "ng" 'org-roam-graph "na" 'org-roam-alias-add "in" 'org-roam-node-insert + "ns" 'chris/org-roam-rg-search "nA" 'chris/org-roam-node-id-create) (chris/leader-keys :states 'visual @@ -2343,6 +2366,16 @@ targets." '(nil "\\`root\\'" "/ssh:%h:")) (add-to-list 'tramp-default-proxies-alist '((regexp-quote (system-name)) nil nil)) +(add-to-list 'tramp-remote-path 'tramp-own-remote-path) + +(connection-local-set-profile-variables + 'guix-system + '((tramp-remote-path . (tramp-own-remote-path)))) +(connection-local-set-profiles + '(:application tramp :protocol "sudo" :machine "hostname") + 'guix-system) + +(setq tramp-default-proxies-alist '()) (use-package ledger-mode) @@ -2354,9 +2387,9 @@ targets." mu4e-change-filenames-when-moving t mu4e-get-mail-command "mbsync -a" mu4e-update-interval (* 15 60) - mu4e-attachment-dir "/home/chris/nextcloud/home/Documents/attachments" + mu4e-attachment-dir "/home/chris/nc/home/Documents/attachments" mu4e-completing-read-function #'completing-read - mu4e-mu-binary "/home/chris/.guix-home/profile/bin/mu" + ;; mu4e-mu-binary "/home/chris/.guix-home/profile/bin/mu" ;; mu4e-mu-binary "/etc/profiles/per-user/chris/bin/mu" mu4e-compose-signature-auto-include nil mu4e-headers-fields @@ -2369,6 +2402,7 @@ targets." mu4e-headers-personal-mark '("p" . " ") mu4e-headers-list-mark '("s" . " ")) + :config (setq mail-user-agent 'mu4e-user-agent) @@ -2700,7 +2734,7 @@ targets." (add-hook 'eshell-mode-hook (lambda () (display-line-numbers-mode -1))) (setq eshell-command-aliases-list - '(("q" "exit") + `(("q" "exit") ("f" "find-file $1") ("ff" "find-file $1") ("d" "dired $1") @@ -2722,7 +2756,7 @@ targets." ("ws" "rsync -avzP public/ chris@staff.tfcconnection.org:tfcconnection") ("wttr" "curl wttr.in/@home.cochrun.xyz") ("gh" "guix home -L ~/dotfiles/guix reconfigure /home/chris/dotfiles/guix/home.scm") - ("gs" "guix system -L ~/dotfiles/guix reconfigure /home/chris/dotfiles/guix/system.scm"))) + ("gs" ,(concat "sudo guix system -L ~/dotfiles/guix reconfigure /home/chris/dotfiles/guix/" (system-name) ".scm")))) (defun chris/eshell-new() "Open a new eshell buffer"