X-Git-Url: https://git.armaanb.net/?p=config.org.git;a=blobdiff_plain;f=config.org;h=697255662ff4fa8185e50180e2ed552477e5fb48;hp=9be0949d112615e203b638323643a247dc7464ad;hb=HEAD;hpb=f68d8391f2067e5c9920ee38bae0dc9d072bbf34 diff --git a/config.org b/config.org index 9be0949..6972556 100644 --- a/config.org +++ b/config.org @@ -6,24 +6,20 @@ * Welcome Welcome to my system configuration! This file contains my Emacs configuration, but also my config files for many of the other programs on my system! ** Compatability -I am currently using GCCEmacs 28 from the feature/native-comp branch, so some settings may not be available for older versions of Emacs. This is a purely personal configuration, so while I can garuntee that it works on my setup, I can't for anything else. +I am currently using Emacs 27.2 on Linux, so some settings and packages may not be available for older versions of Emacs. This is a purely personal configuration, so while I can guarantee that it works on my setup, it might not work for you. ** Choices -I chose to create a powerful, yet not overly heavy Emacs configuration. Things like LSP mode are important to my workflow and help me be productive, so despite its weight, it is kept. Things like a fancy modeline or icons on the other hand, do not increase my productivity, and create visual clutter, and thus have been excluded. +I chose to create a powerful, yet not overly heavy Emacs configuration. Things like a fancy modeline, icons, or LSP mode do not increase my productivity, and create visual clutter, and thus have been excluded. -Another important choice has been to integrate Emacs into a large part of my computing environment (see [[*EmacsOS]]). I use Email, IRC, et cetera, all through Emacs which simplifies my workflow. +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. I think modal keybindings are simple 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 Put configs with passwords in here with some kind of authentication -- Offlineimap -- irc.el +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. ** 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 at the snippet. +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 ** 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)) @@ -37,38 +33,29 @@ straight.el is really nice for managing package, and it integrates nicely with u (eval-print-last-sexp))) (load bootstrap-file nil 'nomessage)) #+end_src -** Replace use-package with straight +** Replace package.el with straight #+begin_src emacs-lisp (straight-use-package 'use-package) (setq straight-use-package-by-default t) #+end_src * Visual options ** Theme -Very nice high contrast theme. - -Its fine to set this here because I run Emacs in daemon mode, but if I were not, then putting it in early-init.el would be a better choice to eliminate the window being white before the theme is loaded. -#+begin_src emacs-lisp - (setq modus-themes-slanted-constructs t - modus-themes-bold-constructs t - modus-themes-org-blocks 'grayscale - modus-themes-mode-line '3d - modus-themes-scale-headings t - modus-themes-region 'no-extend - modus-themes-diffs 'desaturated) - (load-theme 'modus-vivendi t) -#+end_src -** Tree-sitter +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 - (use-package tree-sitter-langs) - (use-package tree-sitter - :config (global-tree-sitter-mode) - :hook (tree-sitter-after-on-hook . tree-sitter-hl-mode)) + (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-operandi t)) #+end_src ** Typography *** Font -Great programming font with ligatures. +JetBrains Mono is a great programming font with ligatures. The "NF" means that it has been patched with the [[https://www.nerdfonts.com/][Nerd Fonts]]. #+begin_src emacs-lisp - (add-to-list 'default-frame-alist '(font . "JetBrainsMonoNF-12")) + (add-to-list 'default-frame-alist '(font . "JetBrainsMonoNF-11")) #+end_src *** Ligatures #+begin_src emacs-lisp @@ -89,32 +76,24 @@ Great programming font with ligatures. "[||]" "[<" "[|" "{|" "?." "?=" "?:" "##" "###" "####" "#[" "#{" "#=" "#!" "#:" "#_(" "#_" "#?" "#(" ";;" "_|_" "__" "~~" "~~>" "~>" "~-" "~@" "$>" "^=" "]#")) - (global-ligature-mode t)) -#+end_src -*** Emoji -#+begin_src emacs-lisp - (use-package emojify - :config (global-emojify-mode)) - - ;; http://ergoemacs.org/emacs/emacs_list_and_set_font.html - (set-fontset-font - t - '(#x1f300 . #x1fad0) - (cond - ((member "Twitter Color Emoji" (font-family-list)) "Twitter Color Emoji") - ((member "Noto Color Emoji" (font-family-list)) "Noto Color Emoji") - ((member "Noto Emoji" (font-family-list)) "Noto Emoji"))) + ;; (global-ligature-mode t)) + ) #+end_src ** Line numbers -Display relative line numbers except in some modes +Display relative line numbers except in certain modes. #+begin_src emacs-lisp (global-display-line-numbers-mode) (setq display-line-numbers-type 'relative) - (dolist (no-line-num '(term-mode-hook + (dolist (no-line-num '( + Man-mode-hook + circe-mode-hook + eshell-mode-hook + helpful-mode-hook + org-mode-hook pdf-view-mode-hook shell-mode-hook - org-mode-hook - eshell-mode-hook)) + term-mode-hook + )) (add-hook no-line-num (lambda () (display-line-numbers-mode 0)))) #+end_src ** Highlight matching parenthesis @@ -139,67 +118,104 @@ Show current column and file size. (use-package minions :config (minions-mode)) #+end_src -** Word count -#+begin_src emacs-lisp - (use-package wc-mode - :straight (wc-mode :type git :host github :repo "bnbeckwith/wc-mode") - :hook (text-mode-hook . wc-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 - (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 -** Keybinding hints -Whenever starting a key chord, show possible future steps. -#+begin_src emacs-lisp - (use-package which-key - :config (which-key-mode) - :custom (which-key-idle-delay 0.3)) -#+end_src -** Highlight TODOs in comments +** Highlight todo items in comments #+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)) #+end_src -** Don't lose cursor +** Blink cursor #+begin_src emacs-lisp (blink-cursor-mode) #+end_src ** Visual line mode -Soft wrap words and do operations by visual lines. +Soft wrap words and do operations by visual lines in some modes. #+begin_src emacs-lisp - (add-hook 'text-mode-hook 'turn-on-visual-line-mode) + (dolist (hook '( + markdown-mode-hook + mu4e-view-mode-hook + org-mode-hook + text-mode-hook + )) + (add-hook hook (lambda () (visual-line-mode 1)))) +#+end_src +** Auto fill mode +#+begin_src emacs-lisp + (dolist (hook '( + mu4e-compose-mode-hook + scdoc-mode-hook + )) + (add-hook hook (lambda () (auto-fill-mode 1)))) #+end_src ** Display number of matches in search #+begin_src emacs-lisp (use-package anzu - :config (global-anzu-mode)) + :after (evil) + :config (global-anzu-mode) + :bind + ([remap isearch-forward] . isearch-forward-regexp) + ([remap isearch-backward] . isearch-backward-regexp) + ([remap query-replace] . anzu-query-replace) + ([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 -Inverts modeline instead of audible bell or the standard visual bell. +Invert modeline color instead of audible bell or the standard visual bell. #+begin_src emacs-lisp (setq visible-bell nil - ring-bell-function 'flash-mode-line) - (defun flash-mode-line () - (invert-face 'mode-line) - (run-with-timer 0.1 nil #'invert-face 'mode-line)) + ring-bell-function + (lambda () (invert-face 'mode-line) + (run-with-timer 0.1 nil #'invert-face 'mode-line))) +#+end_src +** GUI +#+begin_src emacs-lisp + (scroll-bar-mode -1) + (tool-bar-mode -1) + (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 +** Shackle +#+begin_src emacs-lisp + (use-package shackle + :config (shackle-mode) + :custom (shackle-rules '( + (Man-mode :select t) + ))) #+end_src * Evil mode ** General #+begin_src emacs-lisp (use-package evil :custom (select-enable-clipboard nil) + :init (setq evil-want-keybinding nil + evil-want-minibuffer t + evil-want-C-d-scroll t + evil-want-C-u-scroll t) :config (evil-mode) (fset 'evil-visual-update-x-selection 'ignore) ;; Keep clipboard and register seperate ;; Use visual line motions even outside of visual-line-mode buffers (evil-global-set-key 'motion "j" 'evil-next-visual-line) (evil-global-set-key 'motion "k" 'evil-previous-visual-line) - (global-set-key (kbd "") 'keyboard-escape-quit)) + :bind + ("" . keyboard-escape-quit) + ("C-M-u" . universal-argument)) #+end_src ** Evil collection +Evil bindings for tons of packages. #+begin_src emacs-lisp (use-package evil-collection :after evil @@ -212,17 +228,9 @@ tpope prevails! (use-package evil-surround :config (global-evil-surround-mode)) #+end_src -** Leader key -#+begin_src emacs-lisp - (use-package evil-leader - :straight (evil-leader :type git :host github :repo "cofi/evil-leader") - :config - (evil-leader/set-leader "") - (global-evil-leader-mode)) -#+end_src ** Nerd commenter +Makes commenting super easy #+begin_src emacs-lisp - ;; Nerd commenter (use-package evil-nerd-commenter :bind (:map evil-normal-state-map ("gc" . evilnc-comment-or-uncomment-lines)) @@ -231,10 +239,14 @@ tpope prevails! ** Undo redo Fix the oopsies! #+begin_src emacs-lisp - (evil-set-undo-system 'undo-redo) + (use-package undo-fu + :config (evil-set-undo-system 'undo-fu)) + + (use-package undo-fu-session + :config (global-undo-fu-session-mode)) #+end_src ** Number incrementing -Add back C-a/C-x +Add back C-a/C-x bindings. #+begin_src emacs-lisp (use-package evil-numbers :straight (evil-numbers :type git :host github :repo "juliapath/evil-numbers") @@ -243,25 +255,17 @@ Add back C-a/C-x ("C-M-x" . evil-numbers/dec-at-pt))) #+end_src ** Evil org -*** Init #+begin_src emacs-lisp (use-package evil-org :after org :hook (org-mode . evil-org-mode) :config (evil-org-set-key-theme '(textobjects insert navigation shift todo))) + (use-package evil-org-agenda :straight (:type built-in) :after evil-org - :config - (evil-org-agenda-set-keys)) -#+end_src -*** Leader maps -#+begin_src emacs-lisp - (evil-leader/set-key-for-mode 'org-mode - "T" 'org-show-todo-tree - "a" 'org-agenda - "c" 'org-archive-subtree) + :config (evil-org-agenda-set-keys)) #+end_src * Org mode ** General @@ -272,7 +276,7 @@ Add back C-a/C-x :custom (org-ellipsis " ▾") (org-agenda-start-with-log-mode t) - (org-agenda-files (quote ("~/Org/tasks.org" "~/Org/break.org"))) + (org-agenda-files (quote ("~/org/tasks.org"))) (org-log-done 'time) (org-log-into-drawer t) (org-src-tab-acts-natively t) @@ -280,42 +284,44 @@ Add back C-a/C-x (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. #+begin_src emacs-lisp (use-package org-tempo :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 '("zsh" . "src shell :tangle ~/.config/zsh/zshrc")) - (add-to-list 'org-structure-template-alist '("al" . "src yml :tangle ~/.config/alacritty/alacritty.yml")) - (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"))) -#+end_src -** Presentations -#+begin_src emacs-lisp - (use-package org-present - :straight (org-present :type git :host github :repo "rlister/org-present")) + (dolist (addition '( + ("ash" . "src shell :tangle ~/.config/ash/ashrc") + ("el" . "src emacs-lisp") + ("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))) +#+end_src +** Tables +#+begin_src emacs-lisp + (use-package org-table-wrap-functions + :straight (:repo "analyticd/org-table-wrap-functions" :host github) + :bind (:map org-mode-map + ("C-\\" . org-table-column-wrap-to-width) + ("C-|" . 'org-table-unwrap-cell-region))) #+end_src * Autocompletion ** Ivy -Simple, but not too simple autocompletion. +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 @@ -329,50 +335,81 @@ Simple, but not too simple autocompletion. 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 -* EmacsOS +* Emacs OS ** RSS -Use elfeed for RSS. I have another file with all the feeds in it. +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") + :custom (elfeed-db-directory "~/.emacs.d/elfeed") :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. +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 ~/.config/mbsync/mbsyncrc + Create Near + Expunge Both + SyncState * +#+end_src +**** Personal +#+begin_src conf :tangle ~/.config/mbsync/mbsyncrc + IMAPStore personal-remote + Host imap.mailbox.org + User me@armaanb.net + PassCmd "pash show login.mailbox.org/me@armaanb.net | head -n 1" + + MaildirStore personal-local + Path ~/mail/personal/ + Inbox ~/mail/personal/Inbox + Subfolders Verbatim + + Channel personal-channel + Far :personal-remote: + Near :personal-local: + Patterns "INBOX*" "Drafts" "Archive" "Sent" "Trash" + + Group personal + Channel personal-channel +#+end_src +**** School +#+begin_src conf :tangle ~/.config/mbsync/mbsyncrc + IMAPStore school-remote + SSLType IMAPS + Host imap.gmail.com + User abhojwani22@nobles.edu + PassCmd "pash show gmail-otp/abhojwani22@nobles.edu | head -n 1" + + MaildirStore school-local + Path ~/mail/school/ + Inbox ~/mail/school/Inbox + Subfolders Verbatim + + Channel school-channel + Far :school-remote: + Near :school-local: + Patterns * ![Gmail]* + + Group school + Channel school-channel +#+end_src +*** mu4e +**** Setup #+begin_src emacs-lisp (use-package smtpmail :straight (:type built-in)) @@ -386,12 +423,14 @@ 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 "offlineimap -q" + 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 mu4e-confirm-quit nil + mu4e-view-use-gnus t mail-user-agent 'mu4e-user-agent + mu4e-context-policy 'pick-first mu4e-contexts `( ,(make-mu4e-context :name "school" @@ -405,6 +444,7 @@ Contexts are a not very well known feature of mu4e that makes it super easy to m (mu4e-drafts-folder . "/school/Drafts") (mu4e-trash-folder . "/school/Trash") (mu4e-refile-folder . "/school/Archive") + (message-cite-reply-position . above) (user-mail-address . "abhojwani22@nobles.edu") (smtpmail-smtp-user . "abhojwani22@nobles.edu") (smtpmail-smtp-server . "smtp.gmail.com"))) @@ -420,31 +460,43 @@ Contexts are a not very well known feature of mu4e that makes it super easy to m (mu4e-trash-folder . "/personal/Trash") (mu4e-refile-folder . "/personal/Archive") (user-mail-address . "me@armaanb.net") + (message-cite-reply-position . below) (smtpmail-smtp-user . "me@armaanb.net") - (smtpmail-smtp-server "smtp.mailbox.org") - (mu4e-drafts-folder . "/school/Drafts") - (mu4e-trash-folder . "/school/Trash"))))) + (smtpmail-smtp-server . "smtp.mailbox.org"))))) (add-to-list 'mu4e-bookmarks '(:name "Unified inbox" - :query "maildir:\"/personal/INBOX\" or maildir:\"/school/INBOX\"" + :query "maildir:\"/personal/Inbox\" or maildir:\"/school/Inbox\"" :key ?b)) :hook ((mu4e-compose-mode . flyspell-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 +#+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. +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)) + (setq browse-url-browser-function 'browse-url-generic + browse-url-generic-program "chorizo") + (setq browse-url-handlers (quote (("youtu\\.?be" . browse-url-mpv) ("peertube.*" . browse-url-mpv) ("vid.*" . browse-url-mpv) ("vid.*" . browse-url-mpv) - ("." . eww-browse-url) + ("*.mp4" . browse-url-mpv) + ("*.mp3" . browse-url-mpv) + ("*.ogg" . browse-url-mpv) ))) #+end_src ** EWW @@ -454,163 +506,247 @@ Some EWW enhancements. ;; From https://protesilaos.com/dotemacs/ (defun prot-eww--rename-buffer () "Rename EWW buffer using page title or URL. - To be used by `eww-after-render-hook'." + To be used by `eww-after-render-hook'." (let ((name (if (eq "" (plist-get eww-data :title)) (plist-get eww-data :url) (plist-get eww-data :title)))) (rename-buffer (format "*%s # eww*" name) t))) - (add-hook 'eww-after-render-hook #'prot-eww--rename-buffer) + (use-package eww + :straight (:type built-in) + :bind (("C-c w" . eww)) + :hook (eww-after-render-hook prot-eww--rename-buffer)) #+end_src -*** Better entrypoint +*** Keybinding #+begin_src emacs-lisp - ;; From https://protesilaos.com/dotemacs/ - (defun prot-eww-browse-dwim (url &optional arg) - "Visit a URL, maybe from `eww-prompt-history', with completion. - - With optional prefix ARG (\\[universal-argument]) open URL in a - new eww buffer. - - If URL does not look like a valid link, run a web query using - `eww-search-prefix'. - - When called from an eww buffer, provide the current link as - initial input." - (interactive - (list - (completing-read "Query:" eww-prompt-history - nil nil (plist-get eww-data :url) 'eww-prompt-history) - current-prefix-arg)) - (eww url (if arg 4 nil))) - - (global-set-key (kbd "C-c w") 'prot-eww-browse-dwim) + (global-set-key (kbd "C-c w") 'eww) #+end_src ** IRC -#+begin_src emacs-lisp - (use-package erc - :straight (:type built-in) +Circe is a really nice IRC client that claims to be above RCIRC and below ERC in terms of features. ERC felt a bit messy and finicky to me, and Circe has all the features that I need. This setup gets the password for my bouncer (Pounce) instances via my =~/.authinfo.gpg= file. +#+begin_src emacs-lisp + (defun fetch-password (&rest params) + (require 'auth-source) + (let ((match (car (apply 'auth-source-search params)))) + (if match + (let ((secret (plist-get match :secret))) + (if (functionp secret) + (funcall secret) + secret)) + (error "Password not found for %S" params)))) + + (use-package circe :config - (load "~/.emacs.d/irc.el") - (acheam-irc) - (erc-notifications-enable) - (erc-smiley-disable)) + (enable-lui-track) + (enable-circe-color-nicks) + (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 (switch-to-buffer "*scratch*") + (circe "libera") + (circe "oftc") + (circe "tilde")))) - (use-package erc-hl-nicks - :config (erc-hl-nicks-mode 1)) + (global-set-key (kbd "C-c i") 'acheam-irc) #+end_src -** Emacs Anywhere -Use Emacs globally. Use the Emacs daemon and bind a key in your wm to -=emacsclient --eval "(emacs-everywhere)"=. +** 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. #+begin_src emacs-lisp - (use-package emacs-everywhere) + (defun sync-calendar () + "Sync calendars with vdirsyncer" + (interactive) + (async-shell-command "vdirsyncer sync")) + + (use-package calfw + :bind (:map cfw:calendar-mode-map ("C-S-u" . sync-calendar))) + (use-package calfw-ical) + (use-package calfw-org) + + (defun acheam-calendar () + "Open calendars" + (interactive) + (cfw:open-calendar-buffer + :contents-sources (list + (cfw:org-create-source "Green") + (cfw:ical-create-source + "Personal" + "~/.local/share/vdirsyncer/mailbox/Y2FsOi8vMC8zMQ.ics" + "Gray") + (cfw:ical-create-source + "Personal" + "~/.local/share/vdirsyncer/mailbox/Y2FsOi8vMC8zMQ.ics" + "Red") + (cfw:ical-create-source + "School" + "~/.local/share/vdirsyncer/school/abhojwani22@nobles.edu.ics" + "Cyan")) + :view 'week)) + + (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 -** Code cleanup +** Python formatting #+begin_src emacs-lisp (use-package blacken :hook (python-mode . blacken-mode) - :config - (setq blacken-line-length 79)) + :custom (blacken-line-length 79)) - ;; Purge whitespace +#+end_src +** Strip trailing whitespace +#+begin_src emacs-lisp (use-package ws-butler - :config - (ws-butler-global-mode)) + :config (ws-butler-global-mode)) #+end_src ** Flycheck +Automatic linting. I need to look into configuring this more. #+begin_src emacs-lisp (use-package flycheck - :config - (global-flycheck-mode)) + :config (global-flycheck-mode)) #+end_src ** Project management +I never use this, but apparently its very powerful. Another item on my todo list. #+begin_src emacs-lisp (use-package projectile :config (projectile-mode) :custom ((projectile-completion-system 'ivy)) - :bind-keymap - ("C-c p" . projectile-command-map) - :init - (when (file-directory-p "~/Code") - (setq projectile-project-search-path '("~/Code"))) - (setq projectile-switch-project-action #'projectile-dired)) + :bind-keymap ("C-c p" . projectile-command-map) + :init (setq projectile-switch-project-action #'projectile-dired)) (use-package counsel-projectile :after projectile :config (counsel-projectile-mode)) #+end_src ** Dired +The best file manager! #+begin_src emacs-lisp (use-package dired :straight (:type built-in) :commands (dired dired-jump) - :custom ((dired-listing-switches "-agho --group-directories-first")) - :config - (evil-collection-define-key 'normal 'dired-mode-map - "h" 'dired-single-up-directory - "l" 'dired-single-buffer)) + :custom (dired-listing-switches "-agh --group-directories-first") + :bind + ([remap dired-find-file] . dired-single-buffer) + ([remap dired-mouse-find-file-other-window] . dired-single-buffer-mouse) + ([remap dired-up-directory] . dired-single-up-directory) + ("C-x C-j" . dired-jump)) (use-package dired-single :commands (dired dired-jump)) (use-package dired-open :commands (dired dired-jump) - :custom - (dired-open-extensions '(("png" . "feh") - ("mkv" . "mpv")))) + :custom (dired-open-extensions '(("png" . "feh") + ("mkv" . "mpv")))) (use-package dired-hide-dotfiles :hook (dired-mode . dired-hide-dotfiles-mode) - :config - (evil-collection-define-key 'normal 'dired-mode-map + :config (evil-collection-define-key 'normal 'dired-mode-map "H" 'dired-hide-dotfiles-mode)) #+end_src +** Man +#+begin_src emacs-lisp + (use-package man + :bind ("C-c t" . man)) +#+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) #+end_src -*** Colored diff in line number area +*** Email #+begin_src emacs-lisp - (use-package diff-hl - :straight (diff-hl :type git :host github :repo "dgutov/diff-hl") - :hook ((magit-pre-refresh-hook . diff-hl-magit-pre-refresh) - (magit-post-refresh-hook . diff-hl-magit-post-refresh)) - :config (global-diff-hl-mode)) + (use-package piem) + ;; (use-package git-email + ;; :straight (git-email :repo "https://git.sr.ht/~yoctocell/git-email") + ;; :config (git-email-piem-mode)) #+end_src -* General text editing -** Indentation -Indent after every change. +** C +Modified from https://eklitzke.org/smarter-emacs-clang-format. + +Style is basically ddevault's style guide but with 4 spaces instead of 8 char tabs. #+begin_src emacs-lisp - (use-package aggressive-indent - :config (global-aggressive-indent-mode)) + (use-package clang-format + :custom (clang-format-style "{ + BasedOnStyle: llvm, + AlwaysBreakAfterReturnType: AllDefinitions, + IndentWidth: 4, + }")) + + (defun clang-format-buffer-smart () + "Reformat buffer if .clang-format exists in the projectile root." + (when (file-exists-p (expand-file-name ".clang-format" (projectile-project-root))) + (when (if (eq major-mode 'c-mode)) + (message "Formatting with clang-format...") + (clang-format-buffer)))) + + (add-hook 'before-save-hook 'clang-format-buffer-smart nil) #+end_src +** KISS +#+begin_src emacs-lisp + (append auto-mode-alist '("/home/armaa/repos/" . sh-mode)) +#+end_src +** Shell +#+begin_src emacs-lisp + (add-hook 'after-save-hook 'executable-make-buffer-file-executable-if-script-p) +#+end_src +* General text editing ** Spell checking Spell check in text mode, and in prog-mode comments. #+begin_src emacs-lisp - (dolist (hook '(text-mode-hook)) + (dolist (hook '( + markdown-mode-hook + scdoc-mode-hook + text-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)))) (add-hook 'prog-mode (lambda () (flyspell-prog mode))) + (setq ispell-silently-savep t) #+end_src -** Expand tabs to spaces +** Sane tab width #+begin_src emacs-lisp (setq-default tab-width 2) #+end_src -** Copy kill ring to clipboard -#+begin_src emacs-lisp - (setq x-select-enable-clipboard t) - (defun copy-kill-ring-to-xorg () - "Copy the current kill ring to the xorg clipboard." - (interactive) - (x-select-text (current-kill 0))) -#+end_src -** Browse kill ring -#+begin_src emacs-lisp - (use-package browse-kill-ring) -#+end_src ** Save place Opens file where you left it. #+begin_src emacs-lisp @@ -620,13 +756,12 @@ Opens file where you left it. Distraction free writing a la junegunn/goyo. #+begin_src emacs-lisp (use-package olivetti - :config - (evil-leader/set-key "o" 'olivetti-mode)) + :bind ("C-c o" . olivetti-mode)) #+end_src ** Abbreviations -Abbreviate things! +Abbreviate things! I just use this for things like my email address and copyright notice. #+begin_src emacs-lisp - (setq abbrev-file-name "~/.emacs.d/abbrevs") + (setq abbrev-file-name "~/.emacs.d/abbrevs.el") (setq save-abbrevs 'silent) (setq-default abbrev-mode t) #+end_src @@ -634,46 +769,37 @@ Abbreviate things! #+begin_src emacs-lisp (setq tramp-default-method "ssh") #+end_src -** Don't ask about following symlinks in vc +** Follow version controlled symlinks #+begin_src emacs-lisp (setq vc-follow-symlinks t) #+end_src -* Functions -** Easily convert splits -Converts splits from horizontal to vertical and vice versa. Lifted from EmacsWiki. +** Open file as root #+begin_src emacs-lisp - (defun toggle-window-split () - (interactive) - (if (= (count-windows) 2) - (let* ((this-win-buffer (window-buffer)) - (next-win-buffer (window-buffer (next-window))) - (this-win-edges (window-edges (selected-window))) - (next-win-edges (window-edges (next-window))) - (this-win-2nd (not (and (<= (car this-win-edges) - (car next-win-edges)) - (<= (cadr this-win-edges) - (cadr next-win-edges))))) - (splitter - (if (= (car this-win-edges) - (car (window-edges (next-window)))) - 'split-window-horizontally - 'split-window-vertically))) - (delete-other-windows) - (let ((first-win (selected-window))) - (funcall splitter) - (if this-win-2nd (other-window 1)) - (set-window-buffer (selected-window) this-win-buffer) - (set-window-buffer (next-window) next-win-buffer) - (select-window first-win) - (if this-win-2nd (other-window 1)))))) + (defun doas-edit (&optional arg) + "Edit currently visited file as root. + + With a prefix ARG prompt for a file to visit. Will also prompt + for a file to visit if current buffer is not visiting a file. + + Modified from Emacs Redux." + (interactive "P") + (if (or arg (not buffer-file-name)) + (find-file (concat "/doas:root@localhost:" + (ido-read-file-name "Find file(as root): "))) + (find-alternate-file (concat "/doas:root@localhost:" buffer-file-name)))) - (define-key ctl-x-4-map "t" 'toggle-window-split) + (global-set-key (kbd "C-x C-r") #'doas-edit) #+end_src -** Insert date +** Markdown mode #+begin_src emacs-lisp - (defun insert-date () - (interactive) - (insert (format-time-string "%Y-%m-%d"))) + (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 "~/src/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 @@ -687,19 +813,15 @@ Makes "C-x k" binding faster. (substitute-key-definition 'kill-buffer 'kill-buffer-and-window global-map) #+end_src * Other settings -** OpenSCAD -Render OpenSCAD files, and add a preview window. - -Personal fork just merges a PR. +** OpenSCAD syntax #+begin_src emacs-lisp (use-package scad-mode) - (use-package scad-preview - :straight (scad-preview :type git :host github :repo "Armaanb/scad-preview")) #+end_src -** Control backup files +** Control backup and lock files Stop backup files from spewing everywhere. #+begin_src emacs-lisp - (setq backup-directory-alist `(("." . "~/.emacs.d/backups"))) + (setq backup-directory-alist `(("." . "~/.emacs.d/backups")) + create-lockfiles nil) #+end_src ** Make yes/no easier #+begin_src emacs-lisp @@ -740,327 +862,185 @@ No more clogging up init.el. #+begin_src emacs-lisp (use-package 0x0 :straight (0x0 :type git :repo "https://git.sr.ht/~zge/nullpointer-emacs") - :custom (0x0-default-service 'envs) - :config (evil-leader/set-key - "00" '0x0-upload - "0f" '0x0-upload-file - "0s" '0x0-upload-string - "0c" '0x0-upload-kill-ring - "0p" '0x0-upload-popup)) -#+end_src -* Tangles -** Spectrwm -*** General settings -#+begin_src conf :tangle ~/.spectrwm.conf - workspace_limit = 5 - warp_pointer = 1 - modkey = Mod4 - autorun = ws[1]:/home/armaa/Code/scripts/autostart -#+end_src -*** Bar -#+begin_src conf :tangle ~/.spectrwm.conf - bar_enabled = 0 - bar_font = xos4 Fira Code:pixelsize=14:antialias=true # any installed font -#+end_src -*** Keybindings -**** WM actions -#+begin_src conf :tangle ~/.spectrwm.conf - program[term] = alacritty - program[screenshot_all] = flameshot gui - program[notif] = /home/armaa/Code/scripts/setter status - - bind[notif] = MOD+n -#+end_src -**** Media keys -#+begin_src conf :tangle ~/.spectrwm.conf - program[paup] = /home/armaa/Code/scripts/setter audio +5 - program[padown] = /home/armaa/Code/scripts/setter audio -5 - program[pamute] = /home/armaa/Code/scripts/setter audio - program[brigup] = /home/armaa/Code/scripts/setter brightness +10% - program[brigdown] = /home/armaa/Code/scripts/setter brightness 10%- - program[next] = playerctl next - program[prev] = playerctl previous - program[pause] = playerctl play-pause - - bind[padown] = XF86AudioLowerVolume - bind[paup] = XF86AudioRaiseVolume - bind[pamute] = XF86AudioMute - bind[brigdown] = XF86MonBrightnessDown - bind[brigup] = XF86MonBrightnessUp - bind[pause] = XF86AudioPlay - bind[next] = XF86AudioNext - bind[prev] = XF86AudioPrev -#+end_src -**** HJKL -#+begin_src conf :tangle ~/.spectrwm.conf - program[h] = xdotool keyup h key --clearmodifiers Left - program[j] = xdotool keyup j key --clearmodifiers Down - program[k] = xdotool keyup k key --clearmodifiers Up - program[l] = xdotool keyup l key --clearmodifiers Right - - bind[h] = MOD + Control + h - bind[j] = MOD + Control + j - bind[k] = MOD + Control + k - bind[l] = MOD + Control + l -#+end_src -**** Programs -#+begin_src conf :tangle ~/.spectrwm.conf - program[aerc] = alacritty -e aerc - program[catgirl] = alacritty --hold -e sh -c "while : ; do ssh root@armaanb.net -t abduco -A irc catgirl freenode; sleep 2; done" - program[emacs] = emacsclient -c - program[firefox] = firefox - program[calc] = alacritty -e bc - program[emacs-anywhere] = emacsclient --eval "(emacs-everywhere)" - - bind[aerc] = MOD+Control+1 - bind[catgirl] = MOD+Control+2 - bind[firefox] = MOD+Control+3 - bind[emacs-anywhere] = MOD+Control+4 - bind[calc] = MOD+Control+5 - bind[emacs] = MOD+Control+Return -#+end_src -** Zsh -*** Settings -**** Completions -#+begin_src shell :tangle ~/.config/zsh/zshrc - autoload -Uz compinit - compinit - - setopt no_case_glob - unsetopt glob_complete - - # Fragment completions - zstyle ':completion:*' list-suffixes
zstyle ':completion:*' expand prefix suffix - - # Menu completions - zstyle ':completion:*' menu select - zmodload zsh/complist - bindkey -M menuselect '^n' expand-or-complete - bindkey -M menuselect '^p' reverse-menu-complete - + :custom (0x0-default-service 'envs)) #+end_src -**** Vim bindings -#+begin_src shell :tangle ~/.config/zsh/zshrc - bindkey -v - KEYTIMEOUT=1 - - bindkey -M vicmd "^[[3~" delete-char - bindkey "^[[3~" delete-char - - autoload edit-command-line - zle -N edit-command-line - bindkey -M vicmd ^e edit-command-line - bindkey ^e edit-command-line -#+end_src -**** History -#+begin_src shell :tangle ~/.config/zsh/zshrc - setopt extended_history - setopt share_history - setopt inc_append_history - setopt hist_ignore_dups - setopt hist_reduce_blanks - - HISTSIZE=100000 - SAVEHIST=100000 - HISTFILE=~/.local/share/zsh/history +*** 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)))) #+end_src -*** Plugins -I manage plugins using my own plugin manager, ZPE. https://git.sr.ht/~armaan/zpe - -Right now, I'm only using fast-syntax-highlighting. It's a really nice visual addition. -**** ZPE -#+begin_src conf :tangle ~/.config/zpe/repositories - https://github.com/zdharma/fast-syntax-highlighting -#+end_src -**** Zshrc -#+begin_src shell :tangle ~/.config/zsh/zshrc - source ~/Code/zpe/zpe.sh - source ~/Code/admone/admone.zsh - source ~/.config/zsh/fzf-bindings.zsh - - zpe-source fast-syntax-highlighting/fast-syntax-highlighting.plugin.zsh +* Tangles +** Ash +*** Options +Use the vi editing mode. I still haven't found a good way to show visual feedback of the current mode. Ideally the cursor would change to a beam when in insert mode, and a box when in normal mode. +#+begin_src conf :tangle ~/.config/ash/ashrc + set -o vi #+end_src *** Functions -**** Time Zsh startup -#+begin_src shell :tangle ~/.config/zsh/zshrc - timer() { - for i in $(seq 1 10); do time "$1" -i -c exit; done +**** Finger +#+begin_src shell :tangle ~/.config/ash/ashrc + finger() { + user=$(echo "$1" | cut -f 1 -d '@') + host=$(echo "$1" | cut -f 2 -d '@') + echo $user | nc "$host" 79 } #+end_src -**** Update all packages -#+begin_src shell :tangle ~/.config/zsh/zshrc - color=$(tput setaf 5) - reset=$(tput sgr0) +**** Upload to ftp.armaanb.net +#+begin_src shell :tangle ~/.config/ash/ashrc + _uprint() { + echo "https://l.armaanb.net/$(basename "$1")" | tee /dev/tty | xclip -sel c + } - apu() { - sudo echo "${color}== upgrading with yay ==${reset}" - yay - echo "" - echo "${color}== checking for pacnew files ==${reset}" - sudo pacdiff - echo - echo "${color}== upgrading flatpaks ==${reset}" - flatpak update - echo "" - echo "${color}== upgrading zsh plugins ==${reset}" - zpe-pull - 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}" + _uup() { + rsync "$1" "armaa@armaanb.net:/srv/ftp/pub/$2" --chmod 644 --progress } -#+end_src -**** Clean all packages -#+begin_src shell :tangle ~/.config/zsh/zshrc - apap() { - sudo echo "${color}== cleaning pacman orphans ==${reset}" - (pacman -Qtdq | sudo pacman -Rns - 2> /dev/null) || echo "No orphans" - echo "" - echo "${color}== cleaning flatpaks ==${reset}" - flatpak remove --unused - echo "" - echo "${color}== cleaning zsh plugins ==${reset}" - zpe-clean - echo "" - echo "${color}== cleaning nvim plugins ==${reset}" - nvim +PlugClean +qall - echo "Cleaned nvim plugins" - echo "" - echo "${color}All orphans cleaned!${reset}" + + ufile() { + _uup "$1" "$2" + _uprint "$1" } -#+end_src -**** Setup anaconda -#+begin_src shell :tangle ~/.config/zsh/zshrc - zconda() { - __conda_setup="$('/opt/anaconda/bin/conda' 'shell.zsh' 'hook' 2> /dev/null)" - if [ $? -eq 0 ]; then - eval "$__conda_setup" - else - if [ -f "/opt/anaconda/etc/profile.d/conda.sh" ]; then - . "/opt/anaconda/etc/profile.d/conda.sh" - else - export PATH="/opt/anaconda/bin:$PATH" - fi - fi - unset __conda_setup + + uclip() { + tmp=$(mktemp) + xclip -o -sel c >> "$tmp" + basetmp=$(echo "$tmp" | tail -c +5) + _uup "$tmp" "$basetmp" + _uprint "$basetmp" + rm -f "$tmp" } #+end_src -**** Interact with 0x0 -#+begin_src shell :tangle ~/.config/zsh/zshrc - zxz="https://envs.sh" - 0file() { curl -F"file=@$1" "$zxz" ; } - 0pb() { curl -F"file=@-;" "$zxz" ; } - 0url() { curl -F"url=$1" "$zxz" ; } - 0short() { curl -F"shorten=$1" "$zxz" ; } - 0clip() { xclip -out | curl -F"file=@-;" "$zxz" ; } +*** Exports +**** Default programs +#+begin_src shell :tangle ~/.config/ash/ashrc + export EDITOR="emacsclient -c" + export VISUAL="$EDITOR" + export TERM=xterm-256color # for compatability + #+end_src +**** General program configs +#+begin_src shell :tangle ~/.config/ash/ashrc + export GPG_TTY="$(tty)" + + export GNUPGHOME="$HOME/.local/share/gnupg" + export GOPATH="$HOME/.local/share/go" + export JUPYTER_CONFIG_DIR="$HOME/.config/jupyter" + export IPYTHON_DIR="$HOME/.local/share/ipython" + export DISTCC_DIR="$HOME/.local/state/distcc" + + 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 -**** Finger -#+begin_src shell :tangle ~/.config/zsh/zshrc - finger() { - user=$(echo "$1" | cut -f 1 -d '@') - host=$(echo "$1" | cut -f 2 -d '@') - echo $user | nc "$host" 79 -N - } +**** PATH +#+begin_src shell :tangle ~/.config/ash/ashrc + export PATH="/home/armaa/src/bin:$PATH" + export PATH="/home/armaa/src/bin/bin:$PATH" + export PATH="/home/armaa/.local/bin:$PATH" + export PATH="/usr/lib/ccache/bin:$PATH" #+end_src -**** Upload to ftp.armaanb.net -#+begin_src shell :tangle ~/.config/zsh/zshrc - pubup() { - rsync "$1" "root@armaanb.net:/var/ftp/pub/${2}" - echo "https://ftp.armaanb.net/pub/"$(basename "$1") | tee /dev/tty | xclip -sel c - } +**** Locale +#+begin_src shell :tangle ~/.config/ash/ashrc + export LC_ALL="en_US.UTF-8" + export LC_CTYPE="en_US.UTF-8" + export LANGUAGE="en_US.UTF-8" + export TZ="America/New_York" +#+end_src +**** KISS +#+begin_src shell :tangle ~/.config/ash/ashrc + export KISS_PATH="" + export KISS_PATH="$KISS_PATH:$HOME/repos/personal" + export KISS_PATH="$KISS_PATH:$HOME/repos/main/core" + export KISS_PATH="$KISS_PATH:$HOME/repos/main/extra" + export KISS_PATH="$KISS_PATH:$HOME/repos/main/xorg" + export KISS_PATH="$KISS_PATH:$HOME/repos/community/community" + export KISS_PATH="$KISS_PATH:$HOME/repos/mid/ports" + + export KISS_COMPRESS=zst +#+end_src +**** Compilation flags +#+begin_src shell :tangle ~/.config/ash/ashrc + export CC=clang + export CFLAGS="-O3 -pipe -march=native -w -D_FORTIFY_SOURCE=1 -fPIE -fPIC" + export CXX=clang++ + export CXXFLAGS="$CFLAGS -stdlib=libc++" + export MAKEFLAGS="-j$(nproc)" + export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/local/lib/pkgconfig" +#+end_src +**** XDG desktop dirs +#+begin_src shell :tangle ~/.config/ash/ashrc + export XDG_DESKTOP_DIR="/dev/null" + export XDG_DOCUMENTS_DIR="$HOME/documents" + export XDG_DOWNLOAD_DIR="$HOME/downloads" + export XDG_MUSIC_DIR="$HOME/music" + export XDG_PICTURES_DIR="$HOME/pictures" + export XDG_VIDEOS_DIR="$HOME/videos" #+end_src *** Aliases **** SSH -#+begin_src shell :tangle ~/.config/zsh/zshrc - alias bhoji-drop='ssh -p 23 root@armaanb.net' - alias catgirl='ssh root@armaanb.net -t abduco -A irc catgirl freenode' +#+begin_src shell :tangle ~/.config/ash/ashrc + alias poki='ssh armaanb.net' + alias irc='ssh root@armaanb.net -t abduco -A irc catgirl freenode' alias union='ssh 192.168.1.18' alias mine='ssh -p 23 root@pickupserver.cc' alias tcf='ssh root@204.48.23.68' alias ngmun='ssh root@157.245.89.25' alias prox='ssh root@192.168.1.224' alias ncq='ssh root@143.198.123.17' - alias dock='ssh root@192.168.1.225' - alias jenkins='ssh root@192.168.1.226' alias envs='ssh acheam@envs.net' #+end_src **** File management -#+begin_src shell :tangle ~/.config/zsh/zshrc - alias ls='exa -lh --icons --git --group-directories-first' - alias la='exa -lha --icons --git --group-directories-first' +#+begin_src shell :tangle ~/.config/ash/ashrc + alias ls='LC_COLLATE=C ls -lh --group-directories-first' + 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 rm='rm -iv' alias mv='mv -iv' - alias ln='ln -iv' - alias grep='grep -in --exclude-dir=.git --color=auto' - alias fname='find -name' + alias ln='ln -v' + alias grep='grep -in' alias mkdir='mkdir -pv' - alias unar='atool -x' - alias wget='wget -e robots=off' - alias lanex='~/.local/share/lxc/lxc' -#+end_src -**** Editing -#+begin_src shell :tangle ~/.config/zsh/zshrc - alias v='nvim' - alias vim='nvim' - alias vw="nvim ~/Documents/vimwiki/index.md" + alias kmake='make LLVM=1 LLVM_IAS=1 YACC=byacc' + emacs() { $EDITOR "$@" & } + alias vim="emacs" #+end_src **** System management -#+begin_src shell :tangle ~/.config/zsh/zshrc - alias jctl='journalctl -p 3 -xb' - alias pkill='pkill -i' - alias cx='chmod +x' - alias redoas='doas $(fc -ln -1)' +#+begin_src shell :tangle ~/.config/ash/ashrc alias crontab='crontab-argh' - alias sudo='doas ' # allows aliases to be run with doas - alias pasc='pass -c' - alias pasu='\pass git push' + alias sudo='doas' + alias pasu='git -C ~/.password-store push' alias yadu='yadm add -u && yadm commit -m "Updated `date -Iseconds`" && \ yadm push' #+end_src **** Networking -#+begin_src shell :tangle ~/.config/zsh/zshrc +#+begin_src shell :tangle ~/.config/ash/ashrc alias ping='ping -c 10' - alias speed='speedtest-cli' - alias ip='ip --color=auto' - alias cip='curl https://armaanb.net/ip' 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" && \ - rsync "$TT" root@armaanb.net:/etc/finger/plan.txt' - alias wttr='curl -s "wttr.in/02445?n" | head -n -3' -#+end_src -**** Other -#+begin_src shell :tangle ~/.config/zsh/zshrc - alias bigrandomfile='dd if=/dev/urandom of=1GB-urandom bs=1M count=1024 \ - iflag=fullblock status=progress' - alias bigboringfile='dd if=/dev/zero of=1GB-zero bs=1M count=1024 \ - iflag=fullblock status=progress' - alias ts='gen-shell -c task' - alias ts='gen-shell -c task' - alias tetris='autoload -Uz tetriscurses && tetriscurses' - alias news='newsboat' - alias tilderadio="\mpv https://radio.tildeverse.org/radio/8000/radio.ogg" - 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' + rsync armaanb.net:/home/armaa/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" armaanb.net:/home/armaa/plan.txt && \ + rm -f "$T"' #+end_src **** Virtual machines, chroots -#+begin_src shell :tangle ~/.config/zsh/zshrc - alias ckiss="sudo chrooter ~/Virtual/kiss" - alias cdebian="sudo chrooter ~/Virtual/debian bash" - alias cwindows='devour qemu-system-x86_64 \ +#+begin_src shell :tangle ~/.config/ash/ashrc + alias cwindows='qemu-system-x86_64 \ -smp 3 \ -cpu host \ -enable-kvm \ @@ -1069,177 +1049,23 @@ Right now, I'm only using fast-syntax-highlighting. It's a really nice visual ad -device intel-hda \ -device hda-duplex \ -net nic \ - -net user,smb=/home/armaa/Public \ - -drive format=qcow2,file=/home/armaa/Virtual/windows.qcow2' -#+end_src -**** Python -#+begin_src shell :tangle ~/.config/zsh/zshrc - alias ipy="ipython" - alias zpy="zconda && ipython" - alias math="ipython --profile=math" - alias pypi="python setup.py sdist && twine upload dist/*" - alias pip="python -m pip" - alias black="black -l 79" + -net user,smb=/home/armaa/public \ + -drive format=qcow2,file=/home/armaa/virtual/windows.qcow2' #+end_src **** Latin -#+begin_src shell :tangle ~/.config/zsh/zshrc +#+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/zsh/zshrc - alias zathura='devour zathura' - alias mpv='devour mpv' - alias sql='devour sqlitebrowser' - alias cad='devour openscad' - alias feh='devour feh' -#+end_src -**** Package management (Pacman) -#+begin_src shell :tangle ~/.config/zsh/zshrc - alias aps='yay -Ss' - alias api='yay -Syu' - alias apii='sudo pacman -S' - alias app='yay -Rns' - alias apc='yay -Sc' - alias apo='yay -Qttd' - alias azf='pacman -Q | fzf' - alias favorites='pacman -Qe | cut -d " " -f 1 > ~/Documents/favorites' - alias ufetch='ufetch-arch' - alias reflect='reflector --verbose --sort rate --save \ - ~/.local/etc/pacman.d/mirrorlist --download-timeout 60' # Takes ~45m to run -#+end_src -**** Package management (KISS) -#+begin_src shell :tangle ~/.config/zsh/zshrc - alias kzf="kiss s \* | xargs -l basename | \ - fzf --preview 'kiss search {} | xargs -l dirname'" -#+end_src -*** Exports -#+begin_src shell :tangle ~/.config/zsh/zshrc - export EDITOR="emacsclient -c" - export VISUAL="$EDITOR" - export TERM=xterm-256color # for compatability - - export GPG_TTY="$(tty)" - export MANPAGER='nvim +Man!' - export PAGER='less' - - export GTK_USE_PORTAL=1 - - export PATH="/home/armaa/.local/bin:$PATH" # prioritize .local/bin - export PATH="/home/armaa/Code/scripts:$PATH" # prioritize my scripts - export PATH="/home/armaa/Code/scripts/bin:$PATH" # prioritize my bins - export PATH="$PATH:/home/armaa/.cargo/bin" - export PATH="$PATH:/home/armaa/.local/share/gem/ruby/2.7.0/bin" - export PATH="$PATH:/usr/sbin" - export PATH="$PATH:/opt/FreeTube/freetube" - - export LC_ALL="en_US.UTF-8" - export LC_CTYPE="en_US.UTF-8" - export LANGUAGE="en_US.UTF-8" - - 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" - 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" -#+end_src -** Alacritty -*** Appearance -#+begin_src yml :tangle ~/.config/alacritty/alacritty.yml -font: - normal: - family: JetBrains Mono Nerd Font - style: Medium - italic: - style: Italic - Bold: - style: Bold - size: 7 - ligatures: true # Requires ligature patch - -window: - padding: - x: 5 - y: 5 - -background_opacity: 1 -#+end_src -*** Color scheme -Modus vivendi. Source: https://github.com/ishan9299/Nixos/blob/d4bbb7536be95b59466bb9cca4d671be46e04e81/user/alacritty/alacritty.yml#L30-L118 -#+begin_src yml :tangle ~/.config/alacritty/alacritty.yml -colors: - # Default colors - primary: - background: '#000000' - foreground: '#ffffff' - - cursor: - text: '#000000' - background: '#ffffff' - - # Normal colors (except green it is from intense colors) - normal: - black: '#000000' - red: '#ff8059' - green: '#00fc50' - yellow: '#eecc00' - blue: '#29aeff' - magenta: '#feacd0' - cyan: '#00d3d0' - white: '#eeeeee' - - # Bright colors [all the faint colors in the modus theme] - bright: - black: '#555555' - red: '#ffa0a0' - green: '#88cf88' - yellow: '#d2b580' - blue: '#92baff' - magenta: '#e0b2d6' - cyan: '#a0bfdf' - white: '#ffffff' - - # dim [all the intense colors in modus theme] - dim: - black: '#222222' - red: '#fb6859' - green: '#00fc50' - yellow: '#ffdd00' - blue: '#00a2ff' - magenta: '#ff8bd4' - cyan: '#30ffc0' - white: '#dddddd' -#+end_src -** IPython -*** General -Symlink profile_default/ipython_config.py to profile_math/ipython_config.py -#+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 -*** Math -#+begin_src python :tangle ~/.ipython/profile_math/startup.py - from math import * - - def deg(x): - return x * (180 / pi) - - def rad(x): - return x * (pi / 180) - - def rad(x, unit): - return (x * (pi / 180)) / unit - - def csc(x): - return 1 / sin(x) - - def sec(x): - return 1 / cos(x) - - def cot(x): - return 1 / tan(x) +**** Other +#+begin_src shell :tangle ~/.config/ash/ashrc + alias bigrandomfile='dd if=/dev/urandom of=1GB-urandom bs=1M count=1024 \ + iflag=fullblock' + alias bigboringfile='dd if=/dev/zero of=1GB-zero bs=1M count=1024 \ + iflag=fullblock' + alias ytmusic="youtube-dl -x --add-metadata --audio-format aac \ + --restrict-filenames -o '%(title)s.%(ext)s'" + alias bc='bc -l' #+end_src ** MPV Make MPV play a little bit smoother. @@ -1247,253 +1073,126 @@ Make MPV play a little bit smoother. ytdl-format="bestvideo[height<=?1080]+bestaudio/best" hwdec=auto-copy #+end_src -** Inputrc -For any GNU Readline programs -#+begin_src conf :tangle ~/.inputrc - set editing-mode vi -#+end_src ** Git *** User -#+begin_src conf :tangle ~/.gitconfig -[user] +#+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 -[init] +#+begin_src conf :tangle ~/.config/git/config + [init] defaultBranch = main #+end_src *** GPG -#+begin_src conf :tangle ~/.gitconfig -[gpg] +#+begin_src conf :tangle ~/.config/git/config + [gpg] program = gpg #+end_src *** Sendemail -#+begin_src conf :tangle ~/.gitconfig -[sendemail] +#+begin_src conf :tangle ~/.config/git/config + [sendemail] smtpserver = smtp.mailbox.org smtpuser = me@armaanb.net smtpencryption = ssl smtpserverport = 465 confirm = auto #+end_src -*** Submodules -#+begin_src conf :tangle ~/.gitconfig -[submodule] +*** Submodule +#+begin_src conf :tangle ~/.config/git/config + [submodule] recurse = true #+end_src *** Aliases -#+begin_src conf :tangle ~/.gitconfig -[alias] +#+begin_src conf :tangle ~/.config/git/config + [alias] stat = diff --stat sclone = clone --depth 1 sclean = clean -dfX a = add aa = add . c = commit + quickfix = commit . --amend --no-edit p = push subup = submodule update --remote loc = diff --stat 4b825dc642cb6eb9a060e54bf8d69288fbee4904 # Empty hash - mirror = git config --global alias.mirrormirror + pushnc = push -o skip-ci #+end_src -*** Commits -#+begin_src conf :tangle ~/.gitconfig -[commit] +*** Commit +#+begin_src conf :tangle ~/.config/git/config + [commit] gpgsign = true verbose = true #+end_src -** Dunst -Lightweight notification daemon. -*** General -#+begin_src conf :tangle ~/.config/dunst/dunstrc - [global] - font = "JetBrains Mono Medium Nerd Font 11" - allow_markup = yes - format = "%s\n%b" - sort = no - indicate_hidden = yes - alignment = center - bounce_freq = 0 - show_age_threshold = 60 - word_wrap = yes - ignore_newline = no - geometry = "400x5-10+10" - transparency = 0 - idle_threshold = 120 - monitor = 0 - sticky_history = yes - line_height = 0 - separator_height = 1 - padding = 8 - horizontal_padding = 8 - max_icon_size = 32 - separator_color = "#ffffff" - startup_notification = false -#+end_src -*** Modes -#+begin_src conf :tangle ~/.config/dunst/dunstrc - [frame] - width = 1 - color = "#ffffff" - - [shortcuts] - close = mod4+c - close_all = mod4+shift+c - history = mod4+ctrl+c - - [urgency_low] - background = "#222222" - foreground = "#ffffff" - highlight = "#ffffff" - timeout = 5 - - [urgency_normal] - background = "#222222" - foreground = "#ffffff" - highlight = "#ffffff" - timeout = 15 - - [urgency_critical] - background = "#222222" - foreground = "#a60000" - highlight = "#ffffff" - timeout = 0 +*** Tag +#+begin_src conf :tangle ~/.config/git/config + [tag] + gpgsign = true #+end_src ** Zathura +The best document reader! *** Options #+begin_src conf :tangle ~/.config/zathura/zathurarc - map recolor - map toggle_statusbar set selection-clipboard clipboard set scroll-step 200 set window-title-basename "true" set selection-clipboard "clipboard" #+end_src -*** Colors -#+begin_src conf :tangle ~/.config/zathura/zathurarc - set default-bg "#000000" - set default-fg "#ffffff" - set render-loading true - set render-loading-bg "#000000" - set render-loading-fg "#ffffff" +** Tmux +I use tmux in order to keep my st build light. Still learning how it works. +#+begin_src conf :tangle ~/.config/tmux/tmux.conf + set -g status off + set -g mouse on - set recolor-lightcolor "#000000" # bg - set recolor-darkcolor "#ffffff" # fg - set recolor "true" -#+end_src -** Firefox -*** Swap tab and URL bars -#+begin_src css :tangle ~/.mozilla/firefox/armaan-release/chrome/userChrome.css - #nav-bar { - -moz-box-ordinal-group: 1 !important; - } + set-option -g history-limit 50000 - #PersonalToolbar { - -moz-box-ordinal-group: 2 !important; - } + set -g set-titles on + set -g set-titles-string "#W" - #titlebar { - -moz-box-ordinal-group: 3 !important; - } -#+end_src -*** Hide URL bar when not focused. -#+begin_src css :tangle ~/.mozilla/firefox/armaan-release/chrome/userChrome.css - #navigator-toolbox:not(:focus-within):not(:hover) { - margin-top: -30px; - } - - #navigator-toolbox { - transition: 0.1s margin-top ease-out; - } -#+end_src -** Black screen by default -#+begin_src css :tangle ~/.mozilla/firefox/armaan-release/chrome/userChrome.css - #main-window, - #browser, - #browser vbox#appcontent tabbrowser, - #content, - #tabbrowser-tabpanels, - #tabbrowser-tabbox, - browser[type="content-primary"], - browser[type="content"] > html, - .browserContainer { - background: black !important; - color: #fff !important; - } + 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' + unbind C-b + set-option -g prefix None #+end_src -#+begin_src css :tangle ~/.mozilla/firefox/armaan-release/chrome/userContent.css - @-moz-document url("about:home"), url("about:blank"), url("about:newtab") { - body { - background: black !important; - } - } -#+end_src -** Xresources -*** Font -#+begin_src conf :tangle ~/.Xresources - xterm*font: JetBrains Mono NF:pixelsize=15 - - XTerm.vt100.translations: #override \n\ - Ctrl minus: smaller-vt-font() \n\ - Ctrl plus: larger-vt-font() -#+end_src -*** Color scheme -Modus operandi. -#+begin_src conf :tangle ~/.Xresources - ! special - ,*.foreground: #ffffff - ,*.background: #000000 - ,*.cursorColor: #ffffff - - ! black - ,*.color0: #000000 - ,*.color8: #555555 - - ! red - ,*.color1: #ff8059 - ,*.color9: #ffa0a0 - - ! green - ,*.color2: #00fc50 - ,*.color10: #88cf88 - - ! yellow - ,*.color3: #eecc00 - ,*.color11: #d2b580 - - ! blue - ,*.color4: #29aeff - ,*.color12: #92baff - - ! magenta - ,*.color5: #feacd0 - ,*.color13: #e0b2d6 - - ! cyan - ,*.color6: #00d3d0 - ,*.color14: #a0bfdf - - ! white - ,*.color7: #eeeeee - ,*.color15: #dddddd -#+end_src -*** Copy paste -#+begin_src conf :tangle ~/.Xresources - xterm*VT100.Translations: #override \ - Shift Insert: insert-selection(CLIPBOARD) \n\ - Ctrl Shift V: insert-selection(CLIPBOARD) \n\ - Ctrl Shift C: copy-selection(CLIPBOARD) \n\ - Ctrl : exec-formatted("xdg-open '%t'", PRIMARY) -#+end_src -*** Blink cursor -#+begin_src conf :tangle ~/.Xresources - xterm*cursorBlink: true -#+end_src -*** Alt keys -#+begin_src conf :tangle ~/.Xresources - XTerm*eightBitInput: false - XTerm*eightBitOutput: true +** GPG +*** Config +#+begin_src conf :tangle ~/.local/share/gnupg/gpg.conf + default-key 3C9ED82FFE788E4A + use-agent +#+end_src +*** Agent +#+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 +#+end_src +** Xmodmap +#+begin_src conf :tangle (progn (if (string= (system-name) "frost.armaanb.net") "~/.config/xmodmap" "no")) + ! 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 +** sx +#+begin_src shell :tangle ~/.config/sx/sxrc :tangle-mode (identity #o755) + xhost + + exec dwm #+end_src