From 80fcb8eb118803bce70b2c5ba03699c9401b72e2 Mon Sep 17 00:00:00 2001 From: Armaan Bhojwani Date: Tue, 22 Jun 2021 15:39:29 -0400 Subject: [PATCH] Move things into XDG base directories --- config.org | 48 +++++++++++++++++++++++++++++------------------- 1 file changed, 29 insertions(+), 19 deletions(-) diff --git a/config.org b/config.org index 6da58e3..cff07c8 100644 --- a/config.org +++ b/config.org @@ -175,6 +175,10 @@ Invert modeline color instead of audible bell or the standard visual bell. (menu-bar-mode -1) (setq-default frame-title-format '("%b [%m]")) #+end_src +** auth-source +#+begin_src emacs-lisp + (setq auth-sources '("~/.emacs.d/authinfo.gpg")) +#+end_src * Evil mode ** General #+begin_src emacs-lisp @@ -279,10 +283,9 @@ Define templates for lots of common structure elements. Mostly just used within (dolist (addition '( ("ash" . "src shell :tangle ~/.config/ash/ashrc") ("el" . "src emacs-lisp") - ("git" . "src conf :tangle ~/.gitconfig") - ("mb" . "src conf :tangle ~/.mbsyncrc") - ("sp" . "src conf :tangle ~/.spectrwm.conf") - ("tm" . "src conf :tangle ~/.tmux.conf") + ("git" . "src conf :tangle ~/.config/git/config") + ("mb" . "src conf :tangle ~/.config/mbsync/mbsyncrc") + ("tm" . "src conf :tangle ~/.config/tmux/f") ("za" . "src conf :tangle ~/.config/zathura/zathurarc") )) (add-to-list 'org-structure-template-alist addition))) @@ -335,13 +338,13 @@ Use mu4e and mbsync for reading emails. Contexts are a not very well known feature of mu4e that makes it super easy to manage multiple accounts. Much better than some of the hacky methods and external packages that I've seen. *** mbsync **** General -#+begin_src conf :tangle ~/.mbsyncrc +#+begin_src conf :tangle ~/.config/mbsync/mbsyncrc Create Near Expunge Both SyncState * #+end_src **** Personal -#+begin_src conf :tangle ~/.mbsyncrc +#+begin_src conf :tangle ~/.config/mbsync/mbsyncrc IMAPStore personal-remote Host imap.mailbox.org User me@armaanb.net @@ -361,7 +364,7 @@ Contexts are a not very well known feature of mu4e that makes it super easy to m Channel personal-channel #+end_src **** School -#+begin_src conf :tangle ~/.mbsyncrc +#+begin_src conf :tangle ~/.config/mbsync/mbsyncrc IMAPStore school-remote SSLType IMAPS Host imap.gmail.com @@ -396,7 +399,7 @@ Contexts are a not very well known feature of mu4e that makes it super easy to m smtpmail-stream-type 'ssl smtpmail-smtp-service '465 mu4e-change-filenames-when-moving t - mu4e-get-mail-command "mbsync -a" + mu4e-get-mail-command "mbsync -a -c ~/.config/mbsync/mbsyncrc" message-citation-line-format "On %a %d %b %Y at %R, %f wrote:\n" message-citation-line-function 'message-insert-formatted-citation-line mu4e-completing-read-function 'ivy-completing-read @@ -881,11 +884,17 @@ Use the vi editing mode. I still haven't found a good way to show visual feedbac **** General program configs #+begin_src shell :tangle ~/.config/ash/ashrc export GPG_TTY="$(tty)" + export GNUPGHOME="~/.local/share/gnupg" + + export GOPATH="~/.local/share/go" + export MANPAGER='nvim +Man!' export PAGER='less' + export GTK_USE_PORTAL=1 export CDPATH=:~ export LESSHISTFILE=/dev/null + export PASH_KEYID=me@armaanb.net export PASH_LENGTH=20 #+end_src @@ -1023,24 +1032,24 @@ Make MPV play a little bit smoother. #+end_src ** Git *** User -#+begin_src conf :tangle ~/.gitconfig +#+begin_src conf :tangle ~/.config/git/config [user] name = Armaan Bhojwani email = me@armaanb.net signingkey = 0FEB9471E19C49C60CFBEB133C9ED82FFE788E4A #+end_src *** Init -#+begin_src conf :tangle ~/.gitconfig +#+begin_src conf :tangle ~/.config/git/config [init] defaultBranch = main #+end_src *** GPG -#+begin_src conf :tangle ~/.gitconfig +#+begin_src conf :tangle ~/.config/git/config [gpg] program = gpg #+end_src *** Sendemail -#+begin_src conf :tangle ~/.gitconfig +#+begin_src conf :tangle ~/.config/git/config [sendemail] smtpserver = smtp.mailbox.org smtpuser = me@armaanb.net @@ -1049,12 +1058,12 @@ Make MPV play a little bit smoother. confirm = auto #+end_src *** Submodule -#+begin_src conf :tangle ~/.gitconfig +#+begin_src conf :tangle ~/.config/git/config [submodule] recurse = true #+end_src *** Aliases -#+begin_src conf :tangle ~/.gitconfig +#+begin_src conf :tangle ~/.config/git/config [alias] stat = diff --stat sclone = clone --depth 1 @@ -1069,13 +1078,13 @@ Make MPV play a little bit smoother. pushnc = push -o skip-ci #+end_src *** Commit -#+begin_src conf :tangle ~/.gitconfig +#+begin_src conf :tangle ~/.config/git/config [commit] gpgsign = true verbose = true #+end_src *** Tag -#+begin_src conf :tangle ~/.gitconfig +#+begin_src conf :tangle ~/.config/git/config [tag] gpgsign = true #+end_src @@ -1105,7 +1114,7 @@ The best document reader! #+end_src ** Tmux I use tmux in order to keep my st build light. Still learning how it works. -#+begin_src conf :tangle ~/.tmux.conf +#+begin_src conf :tangle ~/.config/tmux/tmux.conf set -g status off set -g mouse on @@ -1120,13 +1129,14 @@ I use tmux in order to keep my st build light. Still learning how it works. #+end_src ** GPG *** Config -#+begin_src conf :tangle ~/.gnupg/gpg.conf +#+begin_src conf :tangle ~/.local/share/gnupg/gpg.conf default-key 3C9ED82FFE788E4A use-agent #+end_src *** Agent -#+begin_src conf :tangle ~/.gnupg/gpg-agent.conf +#+begin_src conf :tangle ~/.local/share/gnupg/gpg-agent.conf pinentry-program /sbin/pinentry + max-cache-ttl 6000 default-cache-ttl 6000 allow-emacs-pinentry -- 2.39.2