Add pyproject-fmt to apheleia formatters

lsp-mode should figure this out on its own now

.emacs.d/.gitignore

@@ -1,12 +0,0 @@
-/elpa
-/quelpa
-/auto-save-list
-/history
-/tramp
-/smex-items
-/url
-.yas-compiled-snippets.el
-/custom.el
-/semanticdb/
-/image-dired/
-/projectile-bookmarks.eld

.emacs.d/.mc-lists.el

@@ -3,57 +3,185 @@
 
 (setq mc/cmds-to-run-for-all
       '(
-		LaTeX-babel-insert-hyphen
-		LaTeX-environment
-		LaTeX-insert-left-brace
-		TeX-insert-backslash
-		TeX-insert-dollar
-		TeX-insert-sub-or-superscript
-		c-electric-brace
-		c-electric-colon
-		c-electric-lt-gt
-		c-electric-paren
-		c-electric-semi&comma
-		c-electric-slash
-		c-indent-line-or-region
-		comment-dwim
-		electric-newline-and-maybe-indent
-		electric-verilog-colon
-		electric-verilog-semi
-		electric-verilog-tab
-		hydra-mc/mc/edit-lines
-		indent-for-tab-command
-		kill-region
-		markdown-exdent-or-delete
-		reindent-then-newline-and-indent
-		yas-expand
-		))
+        LaTeX-babel-insert-hyphen
+        LaTeX-environment
+        LaTeX-insert-left-brace
+        TeX-insert-backslash
+        TeX-insert-dollar
+        TeX-insert-sub-or-superscript
+        antlr-electric-character
+        antlr-indent-command
+        beginning-of-buffer
+        c-electric-brace
+        c-electric-colon
+        c-electric-delete-forward
+        c-electric-lt-gt
+        c-electric-paren
+        c-electric-semi&comma
+        c-electric-slash
+        c-end-of-statement
+        c-indent-line-or-region
+        comment-dwim
+        crux-move-beginning-of-line
+        delete-indentation
+        downcase-region
+        electric-graphviz-dot-semi
+        electric-newline-and-maybe-indent
+        electric-verilog-colon
+        electric-verilog-semi
+        electric-verilog-tab
+        end-of-buffer
+        hydra--universal-argument
+        hydra-mc/mc/edit-lines
+        indent-for-tab-command
+        kill-region
+        handle-switch-frame
+        lispy-braces
+        lispy-brackets
+        lispy-delete
+        lispy-kill
+        lispy-parens
+        lispy-quotes
+        markdown-exdent-or-delete
+        message-beginning-of-line
+        org-beginning-of-line
+        org-cycle
+        org-delete-char
+        org-delete-indentation
+        org-end-of-line
+        org-force-self-insert
+        org-kill-line
+        org-return
+        org-return-indent
+        org-self-insert-command
+        org-shiftcontrolup
+        org-shiftright
+        org-yank
+        reindent-then-newline-and-indent
+        markdown-outdent-or-delete
+        sh-assignment
+        special-digit-argument
+        special-lh-knight/body
+        special-lispy-ace-char
+        special-lispy-ace-paren
+        special-lispy-ace-subword
+        special-lispy-ace-symbol
+        special-lispy-ace-symbol-replace
+        special-lispy-alt-multiline
+        special-lispy-back
+        special-lispy-barf
+        special-lispy-beginning-of-defun
+        special-lispy-clone
+        special-lispy-convolute
+        special-lispy-convolute-left
+        special-lispy-different
+        special-lispy-down
+        special-lispy-down-slurp
+        special-lispy-edebug-stop
+        special-lispy-ediff-regions
+        special-lispy-eval
+        special-lispy-eval-and-insert
+        special-lispy-eval-other-window
+        special-lispy-flow
+        special-lispy-follow
+        special-lispy-goto
+        special-lispy-goto-def-ace
+        special-lispy-goto-def-down
+        special-lispy-goto-elisp-commands
+        special-lispy-goto-local
+        special-lispy-goto-mode
+        special-lispy-goto-projectile
+        special-lispy-goto-recursive
+        special-lispy-join
+        special-lispy-left
+        special-lispy-mark-list
+        special-lispy-move-down
+        special-lispy-move-left
+        special-lispy-move-right
+        special-lispy-move-up
+        special-lispy-narrow
+        special-lispy-new-copy
+        special-lispy-occur
+        special-lispy-oneline
+        special-lispy-other-mode
+        special-lispy-other-space
+        special-lispy-outline-goto-child
+        special-lispy-outline-next
+        special-lispy-outline-prev
+        special-lispy-paste
+        special-lispy-quit
+        special-lispy-raise
+        special-lispy-raise-some
+        special-lispy-repeat
+        special-lispy-right
+        special-lispy-shifttab
+        special-lispy-slurp
+        special-lispy-splice
+        special-lispy-stringify
+        special-lispy-tab
+        special-lispy-teleport
+        special-lispy-tilde
+        special-lispy-underscore
+        special-lispy-undo
+        special-lispy-up
+        special-lispy-up-slurp
+        special-lispy-view
+        special-lispy-visit
+        special-lispy-widen
+        special-lispy-x
+        special-pop-tag-mark
+        transpose-words
+        upcase-region
+        yaml-electric-backspace
+        yaml-electric-dash-and-dot
+        yas-expand
+        ))
 
 (setq mc/cmds-to-run-once
       '(
-		TeX-view
-		hydra--digit-argument
-		hydra-mc-manual/body
-		hydra-mc-manual/lambda-<return>
-		hydra-mc-manual/lambda-<return>-and-exit
-		hydra-mc-manual/lambda-SPC
-		hydra-mc/body
-		hydra-mc/mc/edit-ends-of-lines
-		hydra-mc/mc/edit-lines
-		hydra-mc/mc/edit-lines-and-exit
-		hydra-mc/mc/insert-numbers
-		hydra-mc/mc/mark-all-dwim
-		hydra-mc/mc/mark-all-symbols-like-this
-		hydra-mc/mc/mark-next-like-this
-		hydra-mc/mc/mark-previous-like-this
-		hydra-mc/mc/skip-to-next-like-this
-		hydra-mc/mc/skip-to-previous-like-this
-		hydra-mc/mc/sort-regions
-		hydra-mc/mc/unmark-next-like-this
-		hydra-mc/mc/unmark-previous-like-this
-		hydra-mc/nil
-		mouse-set-region
-		recompile
-		smex
-		switch-to-buffer
-		))
+        TeX-view
+        avy-goto-char
+        c-electric-star
+        counsel-M-x
+        counsel-find-file
+        handle-switch-frame
+        eval-print-last-sexp
+        hydra--digit-argument
+        hydra-mc-manual/body
+        hydra-mc-manual/lambda-<return>
+        hydra-mc-manual/lambda-<return>-and-exit
+        hydra-mc-manual/lambda-SPC
+        hydra-mc/body
+        hydra-mc/mc/edit-ends-of-lines
+        hydra-mc/mc/edit-lines
+        hydra-mc/mc/edit-lines-and-exit
+        hydra-mc/mc/insert-numbers
+        hydra-mc/mc/mark-all-dwim
+        hydra-mc/mc/mark-all-in-region-regexp
+        hydra-mc/mc/mark-all-symbols-like-this
+        hydra-mc/mc/mark-next-like-this
+        hydra-mc/mc/mark-previous-like-this
+        hydra-mc/mc/skip-to-next-like-this
+        hydra-mc/mc/skip-to-previous-like-this
+        hydra-mc/mc/sort-regions
+        hydra-mc/mc/unmark-next-like-this
+        hydra-mc/mc/unmark-previous-like-this
+        hydra-mc/nil
+        iedit-switch-to-mc-mode
+        lispy-cursor-down
+        magit-status
+        mouse-set-region
+        nm-tag
+        org-edit-src-save
+        org-insert-heading-respect-content
+        org-latex-export-to-pdf-no-kr
+        org-src-export-to-pdf
+        previous-buffer
+        python-shell-send-buffer
+        recompile
+        show-marks
+        smex
+        swiper
+        switch-to-buffer
+        undo-tree-visualize
+        ))

.emacs.d/fred-theme.el

@@ -9,6 +9,10 @@
 
 (custom-theme-set-faces
  'fred
+ '(default ((default (:foundry "SRC" :family "Hack" :height 110))
+            (((class color) (min-colors 4096)) (:foreground "#eeeeec" :background "#151515"))
+            (((class color) (min-colors 256)) (:foreground "#eeeeec" :background "#222"))
+            (((class color) (min-colors 89)) (:foreground "#eeeeec" :background "black"))))
  '(highlight ((((class color) (min-colors 89)) (:foreground "#2e3436" :background "#edd400"))))
  '(mode-line ((((class color) (min-colors 89)) (:box (:line-width -1 :style released-button) :background "#285577" :foreground "#eeeeec"))
 			  (t (:background "#555"))))
@@ -26,6 +30,7 @@
  '(error ((((class color) (min-colors 89)) (:foreground "#ff4b4b"))))
  '(warning ((((class color) (min-colors 89)) (:foreground "#fcaf3e"))))
  '(success ((((class color) (min-colors 89)) (:foreground "#8ae234"))))
+
  '(font-lock-builtin-face ((((class color) (min-colors 89)) (:foreground "#e090d7"))))
  '(font-lock-comment-face ((((class color) (min-colors 89)) (:foreground "#73d216"))))
  '(font-lock-constant-face ((((class color) (min-colors 89)) (:foreground "#e9b2e3"))))
@@ -34,19 +39,19 @@
  '(font-lock-string-face ((((class color) (min-colors 89)) (:foreground "#e9b96e"))))
  '(font-lock-type-face ((((class color) (min-colors 89)) (:foreground "#8cc4ff"))))
  '(font-lock-variable-name-face ((((class color) (min-colors 89)) (:foreground "#fcaf3e"))))
+
  '(link ((((class color) (min-colors 89)) (:underline t :foreground "#729fcf"))
 		 (t (:foreground "yellow" :underline t))))
  '(link-visited ((((class color) (min-colors 89)) (:underline t :foreground "#3465a4"))))
- '(default ((((class color) (min-colors 4096)) (:foreground "#eeeeec" :background "#151515")) (((class color) (min-colors 256)) (:foreground "#eeeeec" :background "#222")) (((class color) (min-colors 89)) (:foreground "#eeeeec" :background "black"))))
  '(button ((t (:foreground "yellow"))))
 
  '(company-tooltip ((t (:background "#0f0f0f"))))
  '(company-scrollbar-bg ((t (:background "#232323"))))
  '(company-scrollbar-fg ((t (:background "#161616"))))
- '(company-tooltip-selection ((t (:inherit font-lock-function-name-face))))
+ '(company-tooltip-selection ((t (:background "#433323"))))
  '(company-tooltip-common ((t (:inherit font-lock-constant-face))))
 
- '(ivy-current-match ((t (:background "#555" :foreground "light grey"))))
+ '(ivy-current-match ((t (:foreground "#1BFFFF" :weight bold))))
  '(ivy-minibuffer-match-face-3 ((t (:background "#777ccc" :weight bold))))
  '(ivy-remote ((t (:foreground "deep sky blue"))))
  '(ivy-subdir ((t (:inherit dired-directory))))
@@ -58,7 +63,20 @@
  '(diredp-file-name ((t (:foreground "light grey"))))
  '(diredp-file-suffix ((t (:foreground "dark gray"))))
 
+ '(nm-authors-face ((t (:inherit default))))
+ '(nm-read-face ((t (:inherit default))))
+
  '(column-enforce-face ((((class mono)) :inverse-video t :weight bold :underline t)
-                         (t :background "gray20" :foreground "violet"))))
+                        (t :background "gray20" :foreground "violet")))
+
+ '(rainbow-delimiters-depth-1-face ((t (:inherit rainbow-delimiters-base-face :foreground "grey80"))))
+ '(rainbow-delimiters-depth-2-face ((t (:inherit rainbow-delimiters-base-face :foreground "red"))))
+ '(rainbow-delimiters-depth-3-face ((t (:inherit rainbow-delimiters-base-face :foreground "orange"))))
+ '(rainbow-delimiters-depth-4-face ((t (:inherit rainbow-delimiters-base-face :foreground "yellow"))))
+ '(rainbow-delimiters-depth-5-face ((t (:inherit rainbow-delimiters-base-face :foreground "green"))))
+ '(rainbow-delimiters-depth-6-face ((t (:inherit rainbow-delimiters-base-face :foreground "#44444ff"))))
+ '(rainbow-delimiters-depth-7-face ((t (:inherit rainbow-delimiters-base-face :foreground "#dd1299"))))
+ '(rainbow-delimiters-depth-8-face ((t (:inherit rainbow-delimiters-base-face :foreground "violet"))))
+ '(rainbow-delimiters-depth-9-face ((t (:inherit rainbow-delimiters-base-face :foreground "lime")))))
 
 (provide-theme 'fred)

.emacs.d/hydra-defs.el

@@ -0,0 +1,115 @@
+(require 'hydra-examples)
+(defhydra hydra-window (:hint nil)
+  "
+          Split: _v_:vert  _x_:horz
+         Delete: _c_lose  _o_nly
+  Switch Window: _h_:left  _j_:down  _k_:up  _l_:right
+            Ace: _a_ce  _s_:swap
+        Buffers: _p_revious  _n_ext  _b_:select  _f_ind-file
+         Resize: _H_:splitter left  _J_:splitter down  _K_:splitter up  _L_:splitter right"
+
+  ("h" windmove-left)
+  ("j" windmove-down)
+  ("k" windmove-up)
+  ("l" windmove-right)
+
+  ("p" previous-buffer)
+  ("n" next-buffer)
+  ("b" ido-switch-buffer)
+  ("f" ido-find-file)
+
+  ("x" split-window-below)
+  ("v" split-window-right)
+
+  ("a" ace-window)
+  ("s" ace-swap-window)
+
+  ("c" delete-window)
+  ("o" delete-other-windows)
+
+  ("H" hydra-move-splitter-left)
+  ("J" hydra-move-splitter-down)
+  ("K" hydra-move-splitter-up)
+  ("L" hydra-move-splitter-right)
+
+  ("q" nil))
+
+(defhydra hydra-shortcuts (:hint nil :color blue :columns 3)
+  "Shortcuts"
+  ("d" insert-date "insert date")
+  ("t" todotxt-open-file "open todotxt")
+  ("q" nil))
+
+(defhydra hydra-mc ()
+  "Marks: %(mc/num-cursors)"
+  ("a" mc/mark-all-dwim "all" :column "Bulk")
+  ("s" mc/mark-all-symbols-like-this "symbols")
+  ("r" mc/mark-all-in-region-regexp "regex")
+
+  ("l" mc/edit-lines "lines" :column "Edit")
+  ("e" mc/edit-ends-of-lines "ends")
+
+  ("n" mc/insert-numbers "number" :column "Misc")
+  ("S" mc/sort-regions "sort" :column "Misc")
+
+  ("<up>" mc/mark-previous-like-this "prev" :column "Manual")
+  ("<down>" mc/mark-next-like-this "next")
+  ("S-<up>" mc/unmark-next-like-this nil)
+  ("S-<down>" mc/unmark-previous-like-this nil)
+  ("<left>" mc/skip-to-previous-like-this "skip prev")
+  ("<right>" mc/skip-to-next-like-this "skip next")
+
+  ("C-p" mc/mark-previous-like-this "prev" :column "Manual (Alt)")
+  ("C-n" mc/mark-next-like-this "next")
+  ("C-S-p" mc/unmark-next-like-this nil)
+  ("C-S-n" mc/unmark-previous-like-this nil)
+  ("M-p" mc/skip-to-previous-like-this "skip prev")
+  ("M-n" mc/skip-to-next-like-this "skip next")
+
+  ("<return>" nil nil))
+
+(defhydra hydra-mc-manual (:hint nil :foreign-keys run)
+  "
+_SPC_: Add at point  _C-g_: Abort  _<return>_: Start"
+  ("SPC" (mc/create-fake-cursor-at-point))
+  ("C-g" (multiple-cursors-mode 0) :exit t)
+  ("<return>" (multiple-cursors-mode 1) :exit t))
+
+(defhydra hydra-avy (:hint nil :color blue)
+  "
+char: _c_: 1 char  _C_: 2 char
+word: _w_: 1 char  _W_: 0 char"
+
+  ("c" avy-goto-char)
+  ("C" avy-goto-char-2)
+  ("w" avy-goto-word-1)
+  ("W" avy-goto-word-0)
+  ("q" nil))
+
+(defhydra hydra-smerge (:hint nil :color pink :post (smerge-auto-leave))
+  "
+^Move^       ^Keep^               ^Diff^                 ^Other^
+^^-----------^^-------------------^^---------------------^^-------
+_n_ext       _b_ase               _<_: upper/base        _C_ombine
+_p_rev       _u_pper              _=_: upper/lower       _r_esolve
+^^           _l_ower              _>_: base/lower        _k_ill current
+^^           _a_ll                _R_efine
+^^           _RET_: current       _E_diff                _q_: cancel
+"
+  ("n" smerge-next)
+  ("p" smerge-prev)
+  ("b" smerge-keep-base)
+  ("u" smerge-keep-upper)
+  ("l" smerge-keep-lower)
+  ("a" smerge-keep-all)
+  ("RET" smerge-keep-current)
+  ("\C-m" smerge-keep-current)
+  ("<" smerge-diff-base-upper)
+  ("=" smerge-diff-upper-lower)
+  (">" smerge-diff-base-lower)
+  ("R" smerge-refine)
+  ("E" smerge-ediff)
+  ("C" smerge-combine-with-next)
+  ("r" smerge-resolve)
+  ("k" smerge-kill-current)
+  ("q" nil :color blue))

.emacs.d/init-hydra.el

@@ -1,84 +0,0 @@
-(require 'hydra-examples)
-(defhydra hydra-window (:hint nil)
-  "
-          Split: _v_:vert  _x_:horz
-         Delete: _c_lose  _o_nly
-  Switch Window: _h_:left  _j_:down  _k_:up  _l_:right
-            Ace: _a_ce  _s_:swap
-        Buffers: _p_revious  _n_ext  _b_:select  _f_ind-file
-         Resize: _H_:splitter left  _J_:splitter down  _K_:splitter up  _L_:splitter right"
-
-  ("h" windmove-left)
-  ("j" windmove-down)
-  ("k" windmove-up)
-  ("l" windmove-right)
-
-  ("p" previous-buffer)
-  ("n" next-buffer)
-  ("b" ido-switch-buffer) 
-  ("f" ido-find-file)
-
-  ("x" split-window-below)
-  ("v" split-window-right)
-
-  ("a" ace-window)
-  ("s" ace-swap-window)
-
-  ("c" delete-window)
-  ("o" delete-other-windows)
-
-  ("H" hydra-move-splitter-left)
-  ("J" hydra-move-splitter-down)
-  ("K" hydra-move-splitter-up)
-  ("L" hydra-move-splitter-right)
-
-  ("q" nil))
-
-(defhydra hydra-shortcuts (:hint nil :color blue :columns 3)
-  "Shortcuts"
-  ("d" insert-date "insert date")
-  ("t" todotxt-open-file "open todotxt")
-  ("q" nil))
-
-(defhydra hydra-mc (:hint nil)
-  "
-       Mark Bulk: _a_ll       _s_ymbols     _r_egex
-            Edit: _l_ines     _e_nds
-            Misc: _n_umbers   _S_ort
-Mark (+S=unmark): _<up>_:prev _<down>_:next _<left>_:skip prev _<right>_:skip next"
- ("a" mc/mark-all-dwim)
- ("s" mc/mark-all-symbols-like-this)
- ("r" mc/mark-all-in-region-regexp)
-
- ("l" mc/edit-lines)
- ("e" mc/edit-ends-of-lines)
-
- ("n" mc/insert-numbers)
- ("S" mc/sort-regions)
-
- ("<down>" mc/mark-next-like-this)
- ("<up>" mc/mark-previous-like-this)
- ("S-<down>" mc/unmark-previous-like-this)
- ("S-<up>" mc/unmark-next-like-this)
- ("<right>" mc/skip-to-next-like-this)
- ("<left>" mc/skip-to-previous-like-this)
-
- ("<return>" nil))
-
-(defhydra hydra-mc-manual (:hint nil :foreign-keys run)
-  "
-_SPC_: Add at point  _C-g_: Abort  _<return>_: Start"
-  ("SPC" (mc/create-fake-cursor-at-point))
-  ("C-g" (multiple-cursors-mode 0) :exit t)
-  ("<return>" (multiple-cursors-mode 1) :exit t))
-
-(defhydra hydra-avy (:hint nil :color blue)
-  "
-char: _c_: 1 char  _C_: 2 char
-word: _w_: 1 char  _W_: 0 char"
-
-  ("c" avy-goto-char)
-  ("C" avy-goto-char-2)
-  ("w" avy-goto-word-1)
-  ("W" avy-goto-word-0)
-  ("q" nil))

.emacs.d/snippets/latex-mode/inlinejs

@@ -0,0 +1,5 @@
+# -*- mode: snippet; require-final-newline: nil -*-
+# name: inlinejs
+# key: ijs
+# --
+\mintinline{js}{$0}

.emacs.d/snippets/latex-mode/mintjs

@@ -0,0 +1,10 @@
+# -*- mode: snippet; require-final-newline: nil -*-
+# name: mintjs
+# key: mintjs
+# --
+\begin{listing}[htbp]
+  \begin{minted}{js}
+  $0
+  \end{minted}
+  \caption{$1}\label{lst:$2}
+\end{listing}

.emacs.d/snippets/org-mode/hwhead

@@ -0,0 +1,17 @@
+# -*- mode: snippet -*-
+# name: Homework Header
+# key: hwhead
+# --
+
+#+Author: Adam Goldsmith
+#+Title: ${1:title}
+#+Date: `(format-time-string "%Y-%m-%d")`
+#+LaTeX_HEADER: \newcommand{\class}{${2:class}}
+
+#+LATEX_CLASS_OPTIONS: [12pt]
+#+OPTIONS: toc:nil num:nil ^:{}
+#+LATEX_HEADER: \usepackage[margin=1in, nohead, nofoot]{geometry}
+#+LATEX_HEADER: \makeatletter \def\@maketitle{{\noindent\@title} {\hfill\@author\unskip\strut\\\\} {\noindent\class\unskip\strut} {\hfill\@date\par \vspace{\baselineskip}}\makeatother}
+#+LATEX_HEADER: \pagenumbering{gobble}
+
+$0

.gitignore

@@ -0,0 +1,34 @@
+/.emacs.d/%backup%~
+/.emacs.d/abbrev_defs
+/.emacs.d/eclipse.jdt.ls/
+/.emacs.d/jdt-language-server-latest.tar.gz
+/.emacs.d/elpa
+/.emacs.d/quelpa
+/.emacs.d/auto-save-list
+/.emacs.d/history
+/.emacs.d/tramp
+/.emacs.d/smex-items
+/.emacs.d/url
+/.emacs.d/.yas-compiled-snippets.el
+/.emacs.d/custom.el
+/.emacs.d/semanticdb/
+/.emacs.d/image-dired/
+/.emacs.d/projectile-bookmarks.eld
+/.emacs.d/workspace/
+/.emacs.d/.lsp-session-v1
+/.emacs.d/.org-id-locations
+/.emacs.d/.python-environments/
+/.emacs.d/ede-projects.el
+/.emacs.d/jdee-server/
+/.emacs.d/persp-confs/
+/.emacs.d/.cache/
+/.emacs.d/.last-package-update-day
+/.emacs.d/.dap-breakpoints
+/.emacs.d/request/
+/.emacs.d/transient/
+/.emacs.d/lsp-cache/
+/.emacs.d/eln-cache/
+/.emacs.d/eshell/history
+/.emacs.d/eaf/
+/.emacs.d/recentf
+/.emacs.d/undo-tree-hist/

.local/share/applications/emacs.desktop

@@ -0,0 +1,11 @@
+[Desktop Entry]
+Name=Emacsclient
+GenericName=Text Editor
+Comment=Edit text
+MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++;
+Exec=emacsclient -c -n -a "" %F
+Icon=emacs
+Type=Application
+Terminal=false
+Categories=Development;TextEditor;
+#StartupWMClass=Emacs

.tern-config

@@ -0,0 +1,8 @@
+{
+  "libs": [
+    "browser"
+  ],
+  "plugins": {
+    "node": {}
+  }
+}

PRESTOW

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+mkdir -p ~/.local/share/applications