X-Git-Url: https://git.armaanb.net/?a=blobdiff_plain;f=config.org;h=ccd06831cebe1446b55bacf1fadf71fc86f9a745;hb=5e2469bceeac67b2306dfc6bdb2fed87d61e06b7;hp=9a986e82b781f5695ffa6f670df106159cca4c49;hpb=33f3880b909a2ae01e6b6a204e867adcfe55d372;p=config.org.git diff --git a/config.org b/config.org index 9a986e8..ccd0683 100644 --- a/config.org +++ b/config.org @@ -13,21 +13,13 @@ 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 -** Emacs 28 fix -This is temporary until some stuff gets fixed upstream -#+begin_src emacs-lisp - (setq straight-repository-branch "develop") - (setq straight-disable-native-compile t) -#+end_src ** Bootstrap straight.el straight.el is really nice for managing package, and it integrates nicely with use-package. It uses the bootstrapping system defined here for installation. #+begin_src emacs-lisp + (defvar native-comp-deferred-compilation-deny-list ()) (defvar bootstrap-version) (let ((bootstrap-file (expand-file-name "straight/repos/straight.el/bootstrap.el" user-emacs-directory)) @@ -93,6 +85,7 @@ Display relative line numbers except in certain modes. pdf-view-mode-hook shell-mode-hook org-mode-hook + circe-mode-hook eshell-mode-hook)) (add-hook no-line-num (lambda () (display-line-numbers-mode 0)))) #+end_src @@ -124,13 +117,6 @@ Show a ruler at a certain number of chars depending on mode. (setq display-fill-column-indicator-column 80) (global-display-fill-column-indicator-mode) #+end_src -** Keybinding hints -When starting a key chord, show possible future steps after 0.3 seconds. -#+begin_src emacs-lisp - (use-package which-key - :config (which-key-mode) - :custom (which-key-idle-delay 0.3)) -#+end_src ** Highlight todo items in comments #+begin_src emacs-lisp (use-package hl-todo @@ -142,16 +128,23 @@ When starting a key chord, show possible future steps after 0.3 seconds. (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 - (visual-line-mode 1) - (add-hook 'prog-mode-hook 'visual-line-mode 0) + (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 ** Display number of matches in search #+begin_src emacs-lisp (use-package anzu - :config (global-anzu-mode)) + :config (global-anzu-mode) + :bind + ([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 @@ -239,7 +232,10 @@ Add back C-a/C-x bindings. (org-startup-indented t) (org-hide-emphasis-markers t) (org-fontify-whole-block-delimiter-line nil) - :bind ("C-c a" . org-agenda)) + (org-archive-default-command 'org-archive-to-archive-sibling) + :bind + ("C-c a" . org-agenda) + (:map evil-normal-state-map ("ga" . org-archive-subtree-default))) #+end_src ** Tempo Define templates for lots of common structure elements. Mostly just used within this file. @@ -248,32 +244,27 @@ 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 '("ipy" . "src python :tangle ~/.ipython/")) - (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"))) + (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 - ("M-d" . ivy-switch-buffer-kill)) :config (ivy-mode)) #+end_src ** Ivy-rich @@ -286,49 +277,33 @@ 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) :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)) @@ -388,21 +363,21 @@ Contexts are a not very well known feature of mu4e that makes it super easy to m :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") (add-to-list 'mm-discouraged-alternatives "text/richtext")) #+end_src ** Default browser -Set EWW as default browser except for videos which should open in MPV. +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." + (interactive) (start-process "mpv" "*mpv*" "mpv" url)) (setq browse-url-handlers @@ -411,6 +386,9 @@ Set EWW as default browser except for videos which should open in MPV. ("peertube.*" . browse-url-mpv) ("vid.*" . browse-url-mpv) ("vid.*" . browse-url-mpv) + ("*.mp4" . browse-url-mpv) + ("*.mp3" . browse-url-mpv) + ("*.ogg" . browse-url-mpv) ("." . eww-browse-url) ))) #+end_src @@ -453,42 +431,49 @@ Circe is a really nice IRC client that claims to be above RCIRC and below ERC in :config (enable-lui-track) (enable-circe-color-nicks) - (circe "libera") - (circe "oftc") - (circe "tilde") - (setq circe-networks '(("libera" - :host "irc.armaanb.net" - :nick "emacs" - :user "emacs" - :use-tls t - :port "6698" - :pass (lambda (null) (fetch-password - :login "emacs" - :machine "irc.armaanb.net" - :port 6698))) - ("oftc" - :host "irc.armaanb.net" - :nick "emacs" - :user "emacs" - :use-tls t - :port "6699" - :pass (lambda (null) (fetch-password - :login "emacs" - :machine "irc.armaanb.net" - :port 6699))) - ("tilde" - :host "irc.armaanb.net" - :nick "emacs" - :user "emacs" - :use-tls t - :port "6696" - :pass (lambda (null) (fetch-password - :login "emacs" - :machine "irc.armaanb.net" - :port 6696))) - )) + (setq circe-network-defaults '(("libera" + :host "irc.armaanb.net" + :nick "emacs" + :user "emacs" + :use-tls t + :port 6698 + :pass (lambda (null) (fetch-password + :login "emacs" + :machine "irc.armaanb.net" + :port 6698))) + ("oftc" + :host "irc.armaanb.net" + :nick "emacs" + :user "emacs" + :use-tls t + :port 6699 + :pass (lambda (null) (fetch-password + :login "emacs" + :machine "irc.armaanb.net" + :port 6699))) + ("tilde" + :host "irc.armaanb.net" + :nick "emacs" + :user "emacs" + :use-tls t + :port 6696 + :pass (lambda (null) (fetch-password + :login "emacs" + :machine "irc.armaanb.net" + :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 (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. @@ -496,7 +481,7 @@ Still experimenting with this setup. Not sure if I will keep it, but it works we (defun sync-calendar () "Sync calendars with vdirsyncer" (interactive) - (shell-command "vdirsyncer -vcritical sync")) + (async-shell-command "vdirsyncer sync")) (use-package calfw :bind (:map cfw:calendar-mode-map ("C-S-u" . sync-calendar))) @@ -525,6 +510,11 @@ Still experimenting with this setup. Not sure if I will keep it, but it works we (global-set-key (kbd "C-c c") 'acheam-calendar) #+end_src +** PDF reader +#+begin_src emacs-lisp + (use-package pdf-tools + :hook (pdf-view-mode . pdf-view-midnight-minor-mode)) +#+end_src * Emacs IDE ** Python formatting #+begin_src emacs-lisp @@ -588,7 +578,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) @@ -665,6 +654,10 @@ Abbreviate things! I just use this for things like my email address and copyrigh (global-set-key (kbd "C-x C-r") #'doas-edit) #+end_src +** Markdown mode +#+begin_src emacs-lisp + (use-package markdown-mode) +#+end_src * Keybindings ** Switch windows #+begin_src emacs-lisp @@ -728,13 +721,15 @@ 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 + (midnight-mode) (add-to-list 'clean-buffer-list-kill-never-regexps (lambda (buffer-name) (with-current-buffer buffer-name (derived-mode-p 'lui-mode)))) - (midnight-mode) #+end_src * Tangles ** Spectrwm @@ -798,13 +793,13 @@ 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 -c --eval "(mu4e)" - program[irc] = emacsclient -c --eval '(switch-to-buffer "irc.armaanb.net:6698")' - program[rss] = emacsclient -c --eval '(elfeed)' - program[calendar] = emacsclient -c --eval '(acheam-calendar)' - program[emacs] = emacsclient -c + program[email] = emacsclient -ce "(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))' program[firefox] = firefox - program[calc] = st -e bc -l + program[emacs] = emacsclient -c bind[email] = MOD+Control+1 bind[irc] = MOD+Control+2 @@ -827,53 +822,6 @@ Use the vi editing mode. I still haven't found a good way to show visual feedbac set -o vi #+end_src *** Functions -**** Update all packages -#+begin_src shell :tangle ~/.config/ash/ashrc - color=$(tput setaf 5) - reset=$(tput sgr0) - - apu() { - doas echo "${color}== upgrading with yay ==${reset}" - yay - echo "" - echo "${color}== checking for pacnew files ==${reset}" - doas pacdiff - echo - echo "${color}== upgrading flatpaks ==${reset}" - flatpak update - echo "" - echo "${color}== updating nvim plugins ==${reset}" - nvim +PlugUpdate +PlugUpgrade +qall - echo "Updated nvim plugins" - echo "" - echo "${color}You are entirely up to date!${reset}" - } -#+end_src -**** Clean all packages -#+begin_src shell :tangle ~/.config/ash/ashrc - apap() { - doas echo "${color}== cleaning pacman orphans ==${reset}" - (pacman -Qtdq | doas pacman -Rns - 2> /dev/null) || echo "No orphans" - echo "" - echo "${color}== cleaning flatpaks ==${reset}" - flatpak remove --unused - echo "" - echo "${color}== cleaning nvim plugins ==${reset}" - nvim +PlugClean +qall - echo "Cleaned nvim plugins" - echo "" - echo "${color}All orphans cleaned!${reset}" - } -#+end_src -**** Interact with 0x0 -#+begin_src shell :tangle ~/.config/ash/ashrc - zxz="https://envs.sh" - ufile() { curl -F"file=@$1" "$zxz" ; } - upb() { curl -F"file=@-;" "$zxz" ; } - uurl() { curl -F"url=$1" "$zxz" ; } - ushort() { curl -F"shorten=$1" "$zxz" ; } - uclip() { xclip -out | curl -F"file=@-;" "$zxz" ; } -#+end_src **** Finger #+begin_src shell :tangle ~/.config/ash/ashrc finger() { @@ -884,9 +832,26 @@ Use the vi editing mode. I still haven't found a good way to show visual feedbac #+end_src **** Upload to ftp.armaanb.net #+begin_src shell :tangle ~/.config/ash/ashrc - pubup() { - rsync "$1" "root@armaanb.net:/var/ftp/pub/${2}" - echo "https://ftp.armaanb.net/pub/"$(basename "$1") | tee /dev/tty | xclip -sel c + _uprint() { + echo "https://l.armaanb.net/$(basename "$1")" | tee /dev/tty | xclip -sel c + } + + _uup() { + rsync "$1" "root@armaanb.net:/var/ftp/pub/$2" --chmod 644 + } + + ufile() { + _uup "$1" "$2" + _uprint "$1" + } + + uclip() { + tmp=$(mktemp) + xclip -o -sel c >> "$tmp" + basetmp=$(echo "$tmp" | tail -c +5) + _uup "$tmp" "$basetmp" + _uprint "$basetmp" + rm -f "$tmp" } #+end_src *** Exports @@ -919,6 +884,7 @@ Use the vi editing mode. I still haven't found a good way to show visual feedbac export KISS_PATH="$KISS_PATH:/home/armaa/Clone/repo-main/xorg" export KISS_PATH="$KISS_PATH:/home/armaa/Clone/repo-main/testing" export KISS_PATH="$KISS_PATH:/home/armaa/Clone/repo-community/community" + export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/local/lib/pkgconfig" #+end_src *** Aliases **** SSH @@ -939,12 +905,12 @@ Use the vi editing mode. I still haven't found a good way to show visual feedbac alias la='ls -A' alias df='df -h / /boot' alias du='du -h' - alias free='free -h' + alias free='free -m' alias cp='cp -riv' alias rm='rm -iv' alias mv='mv -iv' alias ln='ln -v' - alias grep='grep -in --color=auto' + alias grep='grep -in' alias mkdir='mkdir -pv' alias lanex='java -jar ~/.local/share/lxc/lanxchange.jar' emacs() { $EDITOR "$@" & } @@ -964,13 +930,15 @@ Use the vi editing mode. I still haven't found a good way to show visual feedbac alias gps='gpg --keyserver keyserver.ubuntu.com --search-keys' alias gpp='gpg --keyserver keyserver.ubuntu.com --recv-key' alias plan='T=$(mktemp) && \ - rsync root@armaanb.net:/etc/finger/plan.txt "$T" && \ - TT=$(mktemp) && \ - head -n -2 $T > $TT && \ - vim $TT && \ - echo "\nLast updated: $(date -R)" >> "$TT" && \ - fold -sw 72 "$TT" > "$T"| \ - rsync "$T" root@armaanb.net:/etc/finger/plan.txt' + rsync root@armaanb.net:/etc/finger/plan.txt "$T" && \ + TT=$(mktemp) && \ + head -n -2 $T > $TT && \ + /bin/nvim $TT && \ + echo >> "$TT" && \ + echo "Last updated: $(date -R)" >> "$TT" && \ + fold -sw 72 "$TT" > "$T"| \ + rsync "$T" root@armaanb.net:/etc/finger/plan.txt && \ + rm -f "$T"' #+end_src **** Virtual machines, chroots #+begin_src shell :tangle ~/.config/ash/ashrc @@ -988,48 +956,21 @@ Use the vi editing mode. I still haven't found a good way to show visual feedbac -net user,smb=/home/armaa/Public \ -drive format=qcow2,file=/home/armaa/Virtual/windows.qcow2' #+end_src -**** Python -#+begin_src shell :tangle ~/.config/ash/ashrc - alias pip="python -m pip" - alias black="black -l 79" -#+end_src **** Latin #+begin_src shell :tangle ~/.config/ash/ashrc alias words='gen-shell -c "words"' alias words-e='gen-shell -c "words ~E"' #+end_src -**** Devour -#+begin_src shell :tangle ~/.config/ash/ashrc - alias zathura='devour zathura' - alias cad='devour openscad' - alias feh='devour feh' -#+end_src -**** Pacman -#+begin_src shell :tangle ~/.config/ash/ashrc - alias aps='yay -Ss' - alias api='yay -Syu' - alias apii='doas pacman -S' - alias app='yay -Rns' - alias azf='pacman -Q | fzf' - alias favorites='pacman -Qe | cut -d " " -f 1 > ~/Documents/favorites' -#+end_src **** Other #+begin_src shell :tangle ~/.config/ash/ashrc alias bigrandomfile='dd if=/dev/urandom of=1GB-urandom bs=1M count=1024 \ - iflag=fullblock status=progress' + iflag=fullblock' alias bigboringfile='dd if=/dev/zero of=1GB-zero bs=1M count=1024 \ - iflag=fullblock status=progress' + iflag=fullblock' alias ytmusic="youtube-dl -x --add-metadata --audio-format aac \ --restrict-filenames -o '%(title)s.%(ext)s'" - alias cal="cal -3 --color=auto" alias bc='bc -l' #+end_src -** IPython -#+begin_src python :tangle ~/.ipython/profile_default/ipython_config.py - c.TerminalInteractiveShell.editing_mode = 'vi' - c.InteractiveShell.colors = 'linux' - c.TerminalInteractiveShell.confirm_exit = False -#+end_src ** MPV Make MPV play a little bit smoother. #+begin_src conf :tangle ~/.config/mpv/mpv.conf @@ -1271,6 +1212,7 @@ I use tmux in order to keep my st build light. Still learning how it works. #+begin_src conf :tangle ~/.tmux.conf set -g status off set -g mouse on + set-option -g history-limit 50000 set-window-option -g mode-keys vi bind-key -T copy-mode-vi 'v' send -X begin-selection bind -T copy-mode-vi y send-keys -X copy-pipe-and-cancel 'xclip -in -selection clipboard'