X-Git-Url: https://git.armaanb.net/?a=blobdiff_plain;f=config.org;h=b1cf44d1e160f99f6bf4ead7cf9b4a3541e43789;hb=c861a38a6c190004485565950021cbc28e66a7a8;hp=f002cd18c4ebe7b3f2c3122f5ab47562c67cb520;hpb=392bb4b56af86d66b9aecb20e3d00004f364d79d;p=config.org.git diff --git a/config.org b/config.org index f002cd1..b1cf44d 100644 --- a/config.org +++ b/config.org @@ -13,9 +13,6 @@ I chose to create a powerful, yet not overly heavy Emacs configuration. Things l Another important choice has been to integrate Emacs into a large part of my computing environment (see [[*Emacs OS]]). I use email, IRC, RSS, et cetera, all through Emacs which simplifies my workflow and creates an amazingly integrated environment. Lastly, I use Evil mode. Modal keybindings are simpler and more ergonomic than standard Emacs style, and Vim keybindings are what I'm comfortable with and are pervasive throughout computing. -** TODOs -*** TODO Turn keybinding and hook declarations into use-package declarations where possible -*** TODO Include offlineimap config ** License Released under the [[https://opensource.org/licenses/MIT][MIT license]] by Armaan Bhojwani, 2021. Note that many snippets are taken from online, and other sources, who are credited for their work near their contributions. * Package management @@ -45,12 +42,14 @@ straight.el is really nice for managing package, and it integrates nicely with u ** Theme Use the Modus Operandi theme by Protesilaos Stavrou. Its the best theme for Emacs by far, because how clear and readable it is. It is highly customizable, but I just set a few options here. #+begin_src emacs-lisp - (setq modus-themes-slanted-constructs t - modus-themes-bold-constructs t - modus-themes-mode-line '3d - modus-themes-scale-headings t - modus-themes-diffs 'desaturated) - (load-theme 'modus-vivendi t) + (use-package modus-themes + :custom + (modus-themes-slanted-constructs t) + (modus-themes-bold-constructs t) + (modus-themes-mode-line '3d) + (modus-themes-scale-headings t) + (modus-themes-diffs 'desaturated) + :config (load-theme 'modus-vivendi t)) #+end_src ** Typography *** Font @@ -114,14 +113,16 @@ Show current column and file size. (use-package minions :config (minions-mode)) #+end_src -** Ruler -Show a ruler at a certain number of chars depending on mode. +** Whitespace mode +Highlight whitespace and other bad text practices. #+begin_src emacs-lisp - (setq display-fill-column-indicator-column 80) - (global-display-fill-column-indicator-mode) + (use-package whitespace + :custom (whitespace-style '(face lines-tail))) + (dolist (hook '(prog-mode-hook)) + (add-hook hook (lambda () (whitespace-mode 1)))) #+end_src ** Highlight todo items in comments -#+begin_src emacs-lisp ++begin_src emacs-lisp (use-package hl-todo :straight (hl-todo :type git :host github :repo "tarsius/hl-todo") :config (global-hl-todo-mode 1)) @@ -131,14 +132,19 @@ Show a ruler at a certain number of chars depending on mode. (blink-cursor-mode) #+end_src ** Visual line mode -Soft wrap words and do operations by visual lines except in programming modes. +Soft wrap words and do operations by visual lines in some modes. #+begin_src emacs-lisp - (global-visual-line-mode 1) - (dolist (hook '(prog-mode-hook - calc-trail-mode-hook - org-agenda-mode-hook - mu4e-headers-mode-hook)) - (add-hook hook (lambda () (visual-line-mode -1)))) + (dolist (hook '(text-mode-hook + org-mode-hook + markdown-mode-hook + mu4e-view-mode-hook)) + (add-hook hook (lambda () (visual-line-mode 1)))) +#+end_src +** Auto fill mode +#+begin_src emacs-lisp + (dolist (hook '(scdoc-mode-hook + mu4e-compose-mode-hook)) + (add-hook hook (lambda () (auto-fill-mode 1)))) #+end_src ** Display number of matches in search #+begin_src emacs-lisp @@ -148,6 +154,7 @@ Soft wrap words and do operations by visual lines except in programming modes. ([remap query-replace] . anzu-query-replace) ([remap query-replace-regexp] . anzu-query-replace-regexp)) #+end_src +*** TODO This config doesn't work right ** Visual bell Invert modeline color instead of audible bell or the standard visual bell. #+begin_src emacs-lisp @@ -247,30 +254,31 @@ Define templates for lots of common structure elements. Mostly just used within :after org :straight (:type built-in) :config - ;; TODO: There's gotta be a more efficient way to write this - (add-to-list 'org-structure-template-alist '("el" . "src emacs-lisp")) - (add-to-list 'org-structure-template-alist '("sp" . "src conf :tangle ~/.spectrwm.conf")) - (add-to-list 'org-structure-template-alist '("ash" . "src shell :tangle ~/.config/ash/ashrc")) - (add-to-list 'org-structure-template-alist '("pi" . "src conf :tangle ~/.config/picom/picom.conf")) - (add-to-list 'org-structure-template-alist '("git" . "src conf :tangle ~/.gitconfig")) - (add-to-list 'org-structure-template-alist '("du" . "src conf :tangle ~/.config/dunst/dunstrc")) - (add-to-list 'org-structure-template-alist '("za" . "src conf :tangle ~/.config/zathura/zathurarc")) - (add-to-list 'org-structure-template-alist '("ff1" . "src css :tangle ~/.mozilla/firefox/armaan-release/chrome/userChrome.css")) - (add-to-list 'org-structure-template-alist '("ff2" . "src css :tangle ~/.mozilla/firefox/armaan-release/chrome/userContent.css")) - (add-to-list 'org-structure-template-alist '("xr" . "src conf :tangle ~/.Xresources")) - (add-to-list 'org-structure-template-alist '("tm" . "src conf :tangle ~/.tmux.conf")) - (add-to-list 'org-structure-template-alist '("gp" . "src conf :tangle ~/.gnupg/gpg.conf")) - (add-to-list 'org-structure-template-alist '("ag" . "src conf :tangle ~/.gnupg/gpg-agent.conf"))) + (dolist (addition '(("el" . "src emacs-lisp") + ("el" . "src emacs-lisp") + ("sp" . "src conf :tangle ~/.spectrwm.conf") + ("ash" . "src shell :tangle ~/.config/ash/ashrc") + ("pi" . "src conf :tangle ~/.config/picom/picom.conf") + ("git" . "src conf :tangle ~/.gitconfig") + ("du" . "src conf :tangle ~/.config/dunst/dunstrc") + ("za" . "src conf :tangle ~/.config/zathura/zathurarc") + ("ff1" . "src css :tangle ~/.mozilla/firefox/armaan-release/chrome/userChrome.css") + ("ff2" . "src css :tangle ~/.mozilla/firefox/armaan-release/chrome/userContent.css") + ("xr" . "src conf :tangle ~/.Xresources") + ("tm" . "src conf :tangle ~/.tmux.conf") + ("gp" . "src conf :tangle ~/.gnupg/gpg.conf") + ("ag" . "src conf :tangle ~/.gnupg/gpg-agent.conf") + ("xm" . "src conf :tangle ~/.config/xmodmap"))) + (add-to-list 'org-structure-template-alist addition))) #+end_src * Autocompletion ** Ivy A well balanced completion framework. #+begin_src emacs-lisp (use-package ivy - :bind (("C-s" . swiper) - :map ivy-minibuffer-map - ("TAB" . ivy-alt-done) - :map ivy-switch-buffer-map + :bind (:map ivy-minibuffer-map + ("TAB" . ivy-alt-done)) + (:map ivy-switch-buffer-map ("M-d" . ivy-switch-buffer-kill)) :config (ivy-mode)) #+end_src @@ -284,49 +292,34 @@ A well balanced completion framework. Ivy everywhere. #+begin_src emacs-lisp (use-package counsel - :bind (("C-M-j" . 'counsel-switch-buffer) - :map minibuffer-local-map - ("C-r" . 'counsel-minibuffer-history)) - :custom (counsel-linux-app-format-function #'counsel-linux-app-format-function-name-only) + :bind ("C-M-j" . 'counsel-switch-buffer) :config (counsel-mode)) #+end_src ** Remember frequent commands #+begin_src emacs-lisp (use-package ivy-prescient :after counsel - :custom (ivy-prescient-enable-filtering nil) :config (prescient-persist-mode) (ivy-prescient-mode)) #+end_src -** Swiper -Better search utility. -#+begin_src emacs-lisp - (use-package swiper) -#+end_src * Emacs OS ** RSS Use elfeed for reading RSS. I have another file with all the feeds in it that I'd rather keep private. #+begin_src emacs-lisp (use-package elfeed :bind (("C-c e" . elfeed)) - :config - (load "~/.emacs.d/feeds.el") - (add-hook 'elfeed-new-entry-hook - (elfeed-make-tagger :feed-url "youtube\\.com" - :add '(youtube))) + :config (load "~/.emacs.d/feeds.el") :bind (:map elfeed-search-mode-map ("C-c C-o" . 'elfeed-show-visit))) - - (use-package elfeed-goodies - :after elfeed - :config (elfeed-goodies/setup)) #+end_src ** Email Use mu4e for reading emails. - -I use `offlineimap` to sync my maildirs. It is slower than mbsync, but is fast enough for me, especially when ran with the =-q= option. - 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. +*** TODO Switch to mbsync +=offlineimap= really crappy (slow and requires python2), and I need to replace it with =mbsync=. +*** TODO Include mbsync/offlineimap config +*** TODO Split up and document this config a bit +*** Setup #+begin_src emacs-lisp (use-package smtpmail :straight (:type built-in)) @@ -347,7 +340,7 @@ Contexts are a not very well known feature of mu4e that makes it super easy to m mu4e-confirm-quit nil mu4e-view-use-gnus t mail-user-agent 'mu4e-user-agent - mail-context-policy 'pick-first + mu4e-context-policy 'pick-first mu4e-contexts `( ,(make-mu4e-context :name "school" @@ -385,12 +378,10 @@ Contexts are a not very well known feature of mu4e that makes it super easy to m :query "maildir:\"/personal/INBOX\" or maildir:\"/school/INBOX\"" :key ?b)) :hook ((mu4e-compose-mode . flyspell-mode) - (mu4e-compose-mode . auto-fill-mode) - (mu4e-view-mode-hook . turn-on-visual-line-mode) (message-send-hook . (lambda () (unless (yes-or-no-p "Ya sure 'bout that?") (signal 'quit nil)))))) #+end_src -Discourage Gnus from displaying HTML emails +*** Discourage Gnus from displaying HTML emails #+begin_src emacs-lisp (with-eval-after-load "mm-decode" (add-to-list 'mm-discouraged-alternatives "text/html") @@ -400,7 +391,7 @@ Discourage Gnus from displaying HTML emails Set EWW as default browser except for multimedia which should open in MPV. #+begin_src emacs-lisp (defun browse-url-mpv (url &optional new-window) - "Open URL in MPV." + "Ask MPV to load URL." (interactive) (start-process "mpv" "*mpv*" "mpv" url)) @@ -484,12 +475,21 @@ Circe is a really nice IRC client that claims to be above RCIRC and below ERC in :pass (lambda (null) (fetch-password :login "emacs" :machine "irc.armaanb.net" - :port 6696))) - (circe "libera") - (circe "oftc") - (circe "tilde"))) + :port 6696))))) :custom (circe-default-part-message "goodbye!") :bind (:map circe-mode-map ("C-c C-r" . circe-reconnect-all))) + + (defun acheam-irc () + "Open circe" + (interactive) + (if (get-buffer "irc.armaanb.net:6696") + (switch-to-buffer "irc.armaanb.net:6696") + (progn (switch-to-buffer "*scratch*") + (circe "libera") + (circe "oftc") + (circe "tilde")))) + + (global-set-key (kbd "C-c i") 'acheam-irc) #+end_src ** Calendar Still experimenting with this setup. Not sure if I will keep it, but it works well for seeing my calendar events. I use =vdirsyncer= to sync my calendar events which I'm really not happy with. @@ -594,7 +594,6 @@ The best file manager! #+end_src ** Git *** Magit -**** TODO Write a command that commits hunk, skipping staging step. A very good Git interface. #+begin_src emacs-lisp (use-package magit) @@ -616,7 +615,9 @@ Automatically indent after every change. I'm not sure how much I like this. It s ** Spell checking Spell check in text mode, and in prog-mode comments. #+begin_src emacs-lisp - (dolist (hook '(text-mode-hook)) + (dolist (hook '(text-mode-hook + markdown-mode-hook + scdoc-mode-hook)) (add-hook hook (lambda () (flyspell-mode)))) (dolist (hook '(change-log-mode-hook log-edit-mode-hook)) (add-hook hook (lambda () (flyspell-mode -1)))) @@ -675,6 +676,13 @@ Abbreviate things! I just use this for things like my email address and copyrigh #+begin_src emacs-lisp (use-package markdown-mode) #+end_src +** scdoc mode +Get it for yourself at https://git.armaanb.net/scdoc +#+begin_src emacs-lisp + (add-to-list 'load-path "~/Code/scdoc-mode") + (autoload 'scdoc-mode "scdoc-mode" "Major mode for editing scdoc files" t) + (add-to-list 'auto-mode-alist '("\\.scd\\'" . scdoc-mode)) +#+end_src * Keybindings ** Switch windows #+begin_src emacs-lisp @@ -738,6 +746,8 @@ No more clogging up init.el. :straight (0x0 :type git :repo "https://git.sr.ht/~zge/nullpointer-emacs") :custom (0x0-default-service 'envs)) #+end_src +*** TODO Replace this with uploading to my own server +Similar to the ufile alias in my ashrc ** Automatically clean buffers Automatically close unused buffers (except those of Circe) at midnight. #+begin_src emacs-lisp @@ -808,8 +818,8 @@ I'm not a huge fan of how spectrwm handles keybindings, probably my biggest grip #+end_src **** Programs #+begin_src conf :tangle ~/.spectrwm.conf - program[email] = emacsclient -ce "(mu4e)" - program[irc] = emacsclient -ce '(switch-to-buffer "irc.armaanb.net:6698")' + program[email] = emacsclient -ce '(progn (switch-to-buffer "*scratch*") (mu4e))' + program[irc] = emacsclient -ce '(acheam-irc)' program[rss] = emacsclient -ce '(elfeed)' program[calendar] = emacsclient -ce '(acheam-calendar)' program[calc] = emacsclient -ce '(progn (calc) (windmove-up) (delete-window))' @@ -893,6 +903,8 @@ Use the vi editing mode. I still haven't found a good way to show visual feedbac export LC_CTYPE="en_US.UTF-8" export LANGUAGE="en_US.UTF-8" + export CDPATH=:~ + export KISS_PATH="/home/armaa/Virtual/kiss/home/armaa/kiss-repo" export KISS_PATH="$KISS_PATH:/home/armaa/Clone/repo-main/core" export KISS_PATH="$KISS_PATH:/home/armaa/Clone/repo-main/extra" @@ -916,7 +928,7 @@ Use the vi editing mode. I still haven't found a good way to show visual feedbac #+end_src **** File management #+begin_src shell :tangle ~/.config/ash/ashrc - alias ls='ls -lh --group-directories-first' + alias ls='LC_COLLATE=C ls -lh --group-directories-first' alias la='ls -A' alias df='df -h / /boot' alias du='du -h' @@ -1240,8 +1252,33 @@ I use tmux in order to keep my st build light. Still learning how it works. #+end_src *** Agent #+begin_src conf :tangle ~/.gnupg/gpg-agent.conf - pinentry-program /sbin/pinentry-gnome3 + pinentry-program /sbin/pinentry-fltk max-cache-ttl 600 default-cache-ttl 600 allow-emacs-pinentry #+end_src +** Xmodmap +#+begin_src conf :tangle ~/.config/xmodmap + ! + ! Unmap left super + ! + clear mod4 + + ! + ! Turn right alt into super + ! + remove mod1 = Alt_R + add mod4 = Alt_R + + ! + ! Swap caps and control + ! + remove Lock = Caps_Lock + remove Control = Control_L + remove Lock = Control_L + remove Control = Caps_Lock + keysym Control_L = Caps_Lock + keysym Caps_Lock = Control_L + add Lock = Caps_Lock + add Control = Control_L +#+end_src