emacs/.config/emacs/Emacs.org

@@ -30,67 +30,21 @@
         auto-save-default t)
 #+end_src
 * Packages
-** Elpaca
-Set up variables.
-#+begin_src emacs-lisp
-  (defvar elpaca-installer-version 0.11)
-  (defvar elpaca-directory (expand-file-name "elpaca/" user-emacs-directory))
-  (defvar elpaca-builds-directory (expand-file-name "builds/" elpaca-directory))
-  (defvar elpaca-repos-directory (expand-file-name "repos/" elpaca-directory))
-  (defvar elpaca-order '(elpaca :repo "https://github.com/progfolio/elpaca.git"
-                                :ref nil :depth 1 :inherit ignore
-                                :files (:defaults "elpaca-test.el" (:exclude "extensions"))
-                                :build (:not elpaca--activate-package)))
-#+end_src
-
-Bootstrap elpaca
-#+begin_src emacs-lisp
-  (let* ((repo  (expand-file-name "elpaca/" elpaca-repos-directory))
-         (build (expand-file-name "elpaca/" elpaca-builds-directory))
-         (order (cdr elpaca-order))
-         (default-directory repo))
-    (add-to-list 'load-path (if (file-exists-p build) build repo))
-    (unless (file-exists-p repo)
-      (make-directory repo t)
-      (when (<= emacs-major-version 28) (require 'subr-x))
-      (condition-case-unless-debug err
-          (if-let* ((buffer (pop-to-buffer-same-window "*elpaca-bootstrap*"))
-                    ((zerop (apply #'call-process `("git" nil ,buffer t "clone"
-                                                    ,@(when-let* ((depth (plist-get order :depth)))
-                                                        (list (format "--depth=%d" depth) "--no-single-branch"))
-                                                    ,(plist-get order :repo) ,repo))))
-                    ((zerop (call-process "git" nil buffer t "checkout"
-                                          (or (plist-get order :ref) "--"))))
-                    (emacs (concat invocation-directory invocation-name))
-                    ((zerop (call-process emacs nil buffer nil "-Q" "-L" "." "--batch"
-                                          "--eval" "(byte-recompile-directory \".\" 0 'force)")))
-                    ((require 'elpaca))
-                    ((elpaca-generate-autoloads "elpaca" repo)))
-              (progn (message "%s" (buffer-string)) (kill-buffer buffer))
-            (error "%s" (with-current-buffer buffer (buffer-string))))
-        ((error) (warn "%s" err) (delete-directory repo 'recursive))))
-    (unless (require 'elpaca-autoloads nil t)
-      (require 'elpaca)
-      (elpaca-generate-autoloads "elpaca" repo)
-      (let ((load-source-file-function nil)) (load "./elpaca-autoloads"))))
-  (add-hook 'after-init-hook #'elpaca-process-queues)
-  (elpaca `(,@elpaca-order))
-#+end_src
-
-Enable =use-package= integration
-#+begin_src emacs-lisp
-  (elpaca elpaca-use-package
-    (elpaca-use-package-mode))
-#+end_src
 ** use-package
 #+begin_src emacs-lisp
+  (require 'use-package)
   (setq use-package-always-ensure t)
+  (setq use-package-verbose t)
+
+  (require 'package)
+  (add-to-list 'package-archives '("melpa" . "https://melpa.org/packages/") t)
+  (package-initialize)
 #+end_src
 ** Set up path correctly
 #+begin_src emacs-lisp
   (use-package exec-path-from-shell
-    :config
+      :config
-    (exec-path-from-shell-initialize))
+      (exec-path-from-shell-initialize))
 #+end_src
 ** Automatic updates
 #+begin_src emacs-lisp
@@ -149,7 +103,6 @@ Enable =use-package= integration
 *** Modus Themes
 #+begin_src emacs-lisp
   (use-package emacs
-    :ensure nil
     :config
     (require-theme 'modus-themes)
     (setq modus-themes-italic-constructs t
@@ -158,18 +111,18 @@ Enable =use-package= integration
           modus-themes-prompts '(bold intense)
           modus-themes-mode-line '(borderless accented moody)
           modus-themes-org-blocks 'gray-background
-          modus-themes-region '(bg-only no-extend))
+          modus-themes-region '(bg-only no-extend)))
-    (load-theme 'modus-operandi :no-confirm))
+    ;; (load-theme 'modus-vivendi :no-confirm))
+#+end_src
+*** Italic Comments
+#+begin_src emacs-lisp
+  (advice-add #'load-theme :after (lambda (&rest _) (set-face-italic 'font-lock-comment-face t)))
 #+end_src
 *** Catpuccin
 #+begin_src emacs-lisp
   (use-package catppuccin-theme
     :init (setq catppuccin-flavor 'mocha)
     :hook (after-init . (lambda () (load-theme 'catppuccin :no-confirm))))
-
-*** Italic Comments
-#+begin_src emacs-lisp
-  (advice-add #'load-theme :after (lambda (&rest _) (set-face-italic 'font-lock-comment-face t)))
 #+end_src
 ** Line Numbers
 #+begin_src emacs-lisp
@@ -180,9 +133,6 @@ Enable =use-package= integration
   (use-package doom-modeline
     :init (doom-modeline-mode 1))
 #+end_src
-#+begin_src emacs-lisp
-  (use-package hide-mode-line)
-#+end_src
 ** Smooth Scroll
 #+begin_src emacs-lisp
   (use-package ultra-scroll
@@ -209,7 +159,6 @@ Enable =use-package= integration
 ** Savehist
 #+begin_src emacs-lisp
   (use-package emacs
-    :ensure nil
     :init (savehist-mode))
 #+end_src
 ** Orderless
@@ -325,7 +274,6 @@ Enable =use-package= integration
 ** eglot
 #+begin_src emacs-lisp
   (use-package eglot
-    :ensure nil
     :bind (:map eglot-mode-map
                 ("C-c l r" . eglot-rename)
                 ("C-c l f" . eglot-format-buffer)
@@ -390,22 +338,6 @@ I don't really use markdown ([[Org Mode]] is a strict improvement imo), but it's
 #+begin_src emacs-lisp
   (use-package zig-mode)
 #+end_src
-** C
-#+begin_src emacs-lisp
-  (use-package emacs
-    :ensure nil
-    :hook
-    (c-mode . electric-pair-mode)
-    :custom
-    (c-default-style '((java-mode . "java")
-  		     (awk-mode . "awk")
-  		     (other . "linux"))))
-#+end_src
-** Perga
-#+begin_src emacs-lisp
-  (use-package perga-mode
-    :ensure (:repo "https://forgejo.ballcloud.cc/wball/perga-mode.git"))
-#+end_src
 * Latex
 ** Auctex
 #+begin_src emacs-lisp
@@ -428,7 +360,7 @@ I don't really use markdown ([[Org Mode]] is a strict improvement imo), but it's
      '(((output-dvi has-no-display-manager) "dvi2tty")
        ((output-dvi style-pstricks) "dvips and gv")
        (output-dvi "xdvi")
-       (output-pdf "zathura")
+       (output-pdf "Zathura")
        (output-html "xdg-open"))))
 #+end_src
 ** CDLatex
@@ -501,8 +433,6 @@ I don't really use markdown ([[Org Mode]] is a strict improvement imo), but it's
 ** Org itself
 #+begin_src emacs-lisp
   (use-package org
-    :ensure `(org :repo "https://code.tecosaur.net/tec/org-mode.git/"
-                  :branch "dev")
     :defer
     :init
     (setq org-list-allow-alphabetical t)
@@ -517,11 +447,9 @@ I don't really use markdown ([[Org Mode]] is a strict improvement imo), but it's
     (org-agenda-files `(,org-directory))
     (org-default-notes-file (mapcar (lambda (x) (concat org-directory x))
                                     '("/todo.org" "/done.org")))
-    (org-latex-preview-mode-display-live t)
     :config
     (setq org-format-latex-options (plist-put org-format-latex-options :scale 0.6))
     (require 'ox-latex)
-    (require 'ox-beamer)
     (add-to-list 'org-latex-classes '("myreport" "\\documentclass[11pt]{report}"
                                       ("\\chapter{%s}" . "\\chapter*{%s}")
                                       ("\\section{%s}" . "\\section*{%s}")
@@ -529,8 +457,7 @@ I don't really use markdown ([[Org Mode]] is a strict improvement imo), but it's
                                       ("\\subsubsection{%s}" . "\\subsubsection*{%s}")))
     :hook
     (org-mode . visual-line-mode)
-    (org-mode . flyspell-mode)
+    (org-mode . flyspell-mode))
-    (org-mode . org-latex-preview-mode))
 #+end_src
 ** toki pona support
 #+begin_src emacs-lisp
@@ -550,10 +477,6 @@ I don't really use markdown ([[Org Mode]] is a strict improvement imo), but it's
     :hook ((org-mode . org-modern-mode)
            (org-agenda-finalize . org-modern-agenda)))
 #+end_src
-** Simple Presentations
-#+begin_src emacs-lisp
-  (use-package org-present)
-#+end_src
 ** Org Bloggy stuff
 #+begin_src emacs-lisp
   (setq org-publish-project-alist
@@ -644,7 +567,6 @@ I don't really use markdown ([[Org Mode]] is a strict improvement imo), but it's
 ** Dired
 #+begin_src emacs-lisp
   (use-package emacs
-    :ensure nil
     :commands (dired dired-jump)
     :custom ((dired-listing-switches "-agho --group-directories-first"))
     :config

fish/.config/fish/fish_variables

@@ -1,7 +1,7 @@
 # This file contains fish universal variable definitions.
 # VERSION: 3.0
 SETUVAR --export FZF_DEFAULT_OPTS:\x2d\x2dcolor\x3dbg\x2b\x3a\x23313244\x2cbg\x3a\x231e1e2e\x2cspinner\x3a\x23f5e0dc\x2chl\x3a\x23f38ba8\x20\x2d\x2dcolor\x3dfg\x3a\x23cdd6f4\x2cheader\x3a\x23f38ba8\x2cinfo\x3a\x23cba6f7\x2cpointer\x3a\x23f5e0dc\x20\x2d\x2dcolor\x3dmarker\x3a\x23f5e0dc\x2cfg\x2b\x3a\x23cdd6f4\x2cprompt\x3a\x23cba6f7\x2chl\x2b\x3a\x23f38ba8
-SETUVAR --export GPG_TTY:/dev/pts/0
+SETUVAR --export GPG_TTY:not\x20a\x20tty
 SETUVAR --export SSH_AGENT_PID:786479
 SETUVAR --export SSH_AUTH_SOCK:/tmp/ssh\x2dXXXXXXkRTHwG/agent\x2e786475
 SETUVAR ZO_CMD:zo
@@ -56,5 +56,5 @@ SETUVAR fish_pager_color_selected_background:\x1d
 SETUVAR fish_pager_color_selected_completion:\x1d
 SETUVAR fish_pager_color_selected_description:\x1d
 SETUVAR fish_pager_color_selected_prefix:\x1d
-SETUVAR fish_user_paths:/var/home/wball/\x2elocal/bin\x1e/home/wball/\x2ezvm/bin\x1e/home/wball/\x2elocal/share/pack/bin\x1e/home/wball/\x2elocal/share/pack\x1e/home/wball/\x2ecache/cabal/bin\x1e/home/wball/\x2epack/bin\x1e/usr/lib/smlnj/bin\x1e/home/wball/go/bin\x1e/home/wball/\x2eelan/bin\x1e/home/wball/\x2econfig/emacs/bin\x1e/home/wball/j9\x2e5/bin\x1e/home/wball/\x2elocal/smlnj/bin\x1e/home/wball/\x2elocal/share/rustup/toolchains/stable\x2dx86_64\x2dunknown\x2dlinux\x2dgnu/bin\x1e/home/wball/code/j/j9\x2e4/bin\x1e/usr/lib/j9/bin\x1e/home/wball/\x2ecabal/bin\x1e/home/wball/\x2eghcup/bin\x1e/home/wball/\x2elocal/share/cargo/bin\x1e/home/wball/\x2elocal/bin\x1e/home/wball/\x2ecargo/bin\x1e/home/wball/\x2escripts
+SETUVAR fish_user_paths:/home/wball/\x2ezvm/bin\x1e/home/wball/\x2elocal/share/pack/bin\x1e/home/wball/\x2elocal/share/pack\x1e/home/wball/\x2ecache/cabal/bin\x1e/home/wball/\x2epack/bin\x1e/usr/lib/smlnj/bin\x1e/home/wball/go/bin\x1e/home/wball/\x2eelan/bin\x1e/home/wball/\x2econfig/emacs/bin\x1e/home/wball/j9\x2e5/bin\x1e/home/wball/\x2elocal/smlnj/bin\x1e/home/wball/\x2elocal/share/rustup/toolchains/stable\x2dx86_64\x2dunknown\x2dlinux\x2dgnu/bin\x1e/home/wball/code/j/j9\x2e4/bin\x1e/usr/lib/j9/bin\x1e/home/wball/\x2ecabal/bin\x1e/home/wball/\x2eghcup/bin\x1e/home/wball/\x2elocal/share/cargo/bin\x1e/home/wball/\x2elocal/bin\x1e/home/wball/\x2ecargo/bin\x1e/home/wball/\x2escripts
 SETUVAR grc_plugin_execs:cat\x1ecvs\x1edf\x1ediff\x1edig\x1egcc\x1eg\x2b\x2b\x1els\x1eifconfig\x1emake\x1emount\x1emtr\x1enetstat\x1eping\x1eps\x1etail\x1etraceroute\x1ewdiff\x1eblkid\x1edu\x1ednf\x1edocker\x1edocker\x2dcompose\x1edocker\x2dmachine\x1eenv\x1eid\x1eip\x1eiostat\x1ejournalctl\x1ekubectl\x1elast\x1elsattr\x1elsblk\x1elspci\x1elsmod\x1elsof\x1egetfacl\x1egetsebool\x1eulimit\x1euptime\x1enmap\x1efdisk\x1efindmnt\x1efree\x1esemanage\x1esar\x1ess\x1esysctl\x1esystemctl\x1estat\x1eshowmount\x1etcpdump\x1etune2fs\x1evmstat\x1ew\x1ewho\x1esockstat

git/.config/git/config

@@ -10,13 +10,13 @@
 [user]
 	email = williampi103@gmail.com
 	name = William Ball
-	signingkey = ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIN1+L+FGfBwH/ufLzj9V6+39K+Vad7s5zUZooqGvrAAi
+    signingkey = ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIN1+L+FGfBwH/ufLzj9V6+39K+Vad7s5zUZooqGvrAAi
 
 [gpg]
     format = ssh
 
-# [gpg "ssh"]
+[gpg "ssh"]
-#     program = "/opt/1Password/op-ssh-sign"
+    program = "/opt/1Password/op-ssh-sign"
 
 [commit]
 	gpgSign = true