Compare commits
3 commits
ad82b6fc2c
...
84c722f55a
| Author | SHA1 | Date | |
|---|---|---|---|
| 84c722f55a | |||
| 2f0b4895e2 | |||
| c5ddcf876f |
3 changed files with 99 additions and 21 deletions
|
|
@ -30,15 +30,61 @@
|
||||||
auto-save-default t)
|
auto-save-default t)
|
||||||
#+end_src
|
#+end_src
|
||||||
* Packages
|
* 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
|
** use-package
|
||||||
#+begin_src emacs-lisp
|
#+begin_src emacs-lisp
|
||||||
(require 'use-package)
|
|
||||||
(setq use-package-always-ensure t)
|
(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
|
#+end_src
|
||||||
** Set up path correctly
|
** Set up path correctly
|
||||||
#+begin_src emacs-lisp
|
#+begin_src emacs-lisp
|
||||||
|
|
@ -103,6 +149,7 @@
|
||||||
*** Modus Themes
|
*** Modus Themes
|
||||||
#+begin_src emacs-lisp
|
#+begin_src emacs-lisp
|
||||||
(use-package emacs
|
(use-package emacs
|
||||||
|
:ensure nil
|
||||||
:config
|
:config
|
||||||
(require-theme 'modus-themes)
|
(require-theme 'modus-themes)
|
||||||
(setq modus-themes-italic-constructs t
|
(setq modus-themes-italic-constructs t
|
||||||
|
|
@ -111,18 +158,18 @@
|
||||||
modus-themes-prompts '(bold intense)
|
modus-themes-prompts '(bold intense)
|
||||||
modus-themes-mode-line '(borderless accented moody)
|
modus-themes-mode-line '(borderless accented moody)
|
||||||
modus-themes-org-blocks 'gray-background
|
modus-themes-org-blocks 'gray-background
|
||||||
modus-themes-region '(bg-only no-extend)))
|
modus-themes-region '(bg-only no-extend))
|
||||||
;; (load-theme 'modus-vivendi :no-confirm))
|
(load-theme 'modus-operandi :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
|
#+end_src
|
||||||
*** Catpuccin
|
*** Catpuccin
|
||||||
#+begin_src emacs-lisp
|
#+begin_src emacs-lisp
|
||||||
(use-package catppuccin-theme
|
(use-package catppuccin-theme
|
||||||
:init (setq catppuccin-flavor 'mocha)
|
:init (setq catppuccin-flavor 'mocha)
|
||||||
:hook (after-init . (lambda () (load-theme 'catppuccin :no-confirm))))
|
: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
|
#+end_src
|
||||||
** Line Numbers
|
** Line Numbers
|
||||||
#+begin_src emacs-lisp
|
#+begin_src emacs-lisp
|
||||||
|
|
@ -133,6 +180,9 @@
|
||||||
(use-package doom-modeline
|
(use-package doom-modeline
|
||||||
:init (doom-modeline-mode 1))
|
:init (doom-modeline-mode 1))
|
||||||
#+end_src
|
#+end_src
|
||||||
|
#+begin_src emacs-lisp
|
||||||
|
(use-package hide-mode-line)
|
||||||
|
#+end_src
|
||||||
** Smooth Scroll
|
** Smooth Scroll
|
||||||
#+begin_src emacs-lisp
|
#+begin_src emacs-lisp
|
||||||
(use-package ultra-scroll
|
(use-package ultra-scroll
|
||||||
|
|
@ -159,6 +209,7 @@
|
||||||
** Savehist
|
** Savehist
|
||||||
#+begin_src emacs-lisp
|
#+begin_src emacs-lisp
|
||||||
(use-package emacs
|
(use-package emacs
|
||||||
|
:ensure nil
|
||||||
:init (savehist-mode))
|
:init (savehist-mode))
|
||||||
#+end_src
|
#+end_src
|
||||||
** Orderless
|
** Orderless
|
||||||
|
|
@ -274,6 +325,7 @@
|
||||||
** eglot
|
** eglot
|
||||||
#+begin_src emacs-lisp
|
#+begin_src emacs-lisp
|
||||||
(use-package eglot
|
(use-package eglot
|
||||||
|
:ensure nil
|
||||||
:bind (:map eglot-mode-map
|
:bind (:map eglot-mode-map
|
||||||
("C-c l r" . eglot-rename)
|
("C-c l r" . eglot-rename)
|
||||||
("C-c l f" . eglot-format-buffer)
|
("C-c l f" . eglot-format-buffer)
|
||||||
|
|
@ -338,6 +390,22 @@ I don't really use markdown ([[Org Mode]] is a strict improvement imo), but it's
|
||||||
#+begin_src emacs-lisp
|
#+begin_src emacs-lisp
|
||||||
(use-package zig-mode)
|
(use-package zig-mode)
|
||||||
#+end_src
|
#+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
|
* Latex
|
||||||
** Auctex
|
** Auctex
|
||||||
#+begin_src emacs-lisp
|
#+begin_src emacs-lisp
|
||||||
|
|
@ -360,7 +428,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 has-no-display-manager) "dvi2tty")
|
||||||
((output-dvi style-pstricks) "dvips and gv")
|
((output-dvi style-pstricks) "dvips and gv")
|
||||||
(output-dvi "xdvi")
|
(output-dvi "xdvi")
|
||||||
(output-pdf "Zathura")
|
(output-pdf "zathura")
|
||||||
(output-html "xdg-open"))))
|
(output-html "xdg-open"))))
|
||||||
#+end_src
|
#+end_src
|
||||||
** CDLatex
|
** CDLatex
|
||||||
|
|
@ -433,6 +501,8 @@ I don't really use markdown ([[Org Mode]] is a strict improvement imo), but it's
|
||||||
** Org itself
|
** Org itself
|
||||||
#+begin_src emacs-lisp
|
#+begin_src emacs-lisp
|
||||||
(use-package org
|
(use-package org
|
||||||
|
:ensure `(org :repo "https://code.tecosaur.net/tec/org-mode.git/"
|
||||||
|
:branch "dev")
|
||||||
:defer
|
:defer
|
||||||
:init
|
:init
|
||||||
(setq org-list-allow-alphabetical t)
|
(setq org-list-allow-alphabetical t)
|
||||||
|
|
@ -447,9 +517,11 @@ I don't really use markdown ([[Org Mode]] is a strict improvement imo), but it's
|
||||||
(org-agenda-files `(,org-directory))
|
(org-agenda-files `(,org-directory))
|
||||||
(org-default-notes-file (mapcar (lambda (x) (concat org-directory x))
|
(org-default-notes-file (mapcar (lambda (x) (concat org-directory x))
|
||||||
'("/todo.org" "/done.org")))
|
'("/todo.org" "/done.org")))
|
||||||
|
(org-latex-preview-mode-display-live t)
|
||||||
:config
|
:config
|
||||||
(setq org-format-latex-options (plist-put org-format-latex-options :scale 0.6))
|
(setq org-format-latex-options (plist-put org-format-latex-options :scale 0.6))
|
||||||
(require 'ox-latex)
|
(require 'ox-latex)
|
||||||
|
(require 'ox-beamer)
|
||||||
(add-to-list 'org-latex-classes '("myreport" "\\documentclass[11pt]{report}"
|
(add-to-list 'org-latex-classes '("myreport" "\\documentclass[11pt]{report}"
|
||||||
("\\chapter{%s}" . "\\chapter*{%s}")
|
("\\chapter{%s}" . "\\chapter*{%s}")
|
||||||
("\\section{%s}" . "\\section*{%s}")
|
("\\section{%s}" . "\\section*{%s}")
|
||||||
|
|
@ -457,7 +529,8 @@ I don't really use markdown ([[Org Mode]] is a strict improvement imo), but it's
|
||||||
("\\subsubsection{%s}" . "\\subsubsection*{%s}")))
|
("\\subsubsection{%s}" . "\\subsubsection*{%s}")))
|
||||||
:hook
|
:hook
|
||||||
(org-mode . visual-line-mode)
|
(org-mode . visual-line-mode)
|
||||||
(org-mode . flyspell-mode))
|
(org-mode . flyspell-mode)
|
||||||
|
(org-mode . org-latex-preview-mode))
|
||||||
#+end_src
|
#+end_src
|
||||||
** toki pona support
|
** toki pona support
|
||||||
#+begin_src emacs-lisp
|
#+begin_src emacs-lisp
|
||||||
|
|
@ -477,6 +550,10 @@ I don't really use markdown ([[Org Mode]] is a strict improvement imo), but it's
|
||||||
:hook ((org-mode . org-modern-mode)
|
:hook ((org-mode . org-modern-mode)
|
||||||
(org-agenda-finalize . org-modern-agenda)))
|
(org-agenda-finalize . org-modern-agenda)))
|
||||||
#+end_src
|
#+end_src
|
||||||
|
** Simple Presentations
|
||||||
|
#+begin_src emacs-lisp
|
||||||
|
(use-package org-present)
|
||||||
|
#+end_src
|
||||||
** Org Bloggy stuff
|
** Org Bloggy stuff
|
||||||
#+begin_src emacs-lisp
|
#+begin_src emacs-lisp
|
||||||
(setq org-publish-project-alist
|
(setq org-publish-project-alist
|
||||||
|
|
@ -567,6 +644,7 @@ I don't really use markdown ([[Org Mode]] is a strict improvement imo), but it's
|
||||||
** Dired
|
** Dired
|
||||||
#+begin_src emacs-lisp
|
#+begin_src emacs-lisp
|
||||||
(use-package emacs
|
(use-package emacs
|
||||||
|
:ensure nil
|
||||||
:commands (dired dired-jump)
|
:commands (dired dired-jump)
|
||||||
:custom ((dired-listing-switches "-agho --group-directories-first"))
|
:custom ((dired-listing-switches "-agho --group-directories-first"))
|
||||||
:config
|
:config
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
# This file contains fish universal variable definitions.
|
# This file contains fish universal variable definitions.
|
||||||
# VERSION: 3.0
|
# 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 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:not\x20a\x20tty
|
SETUVAR --export GPG_TTY:/dev/pts/0
|
||||||
SETUVAR --export SSH_AGENT_PID:786479
|
SETUVAR --export SSH_AGENT_PID:786479
|
||||||
SETUVAR --export SSH_AUTH_SOCK:/tmp/ssh\x2dXXXXXXkRTHwG/agent\x2e786475
|
SETUVAR --export SSH_AUTH_SOCK:/tmp/ssh\x2dXXXXXXkRTHwG/agent\x2e786475
|
||||||
SETUVAR ZO_CMD:zo
|
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_completion:\x1d
|
||||||
SETUVAR fish_pager_color_selected_description:\x1d
|
SETUVAR fish_pager_color_selected_description:\x1d
|
||||||
SETUVAR fish_pager_color_selected_prefix:\x1d
|
SETUVAR fish_pager_color_selected_prefix:\x1d
|
||||||
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 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 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
|
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
|
||||||
|
|
|
||||||
|
|
@ -15,8 +15,8 @@
|
||||||
[gpg]
|
[gpg]
|
||||||
format = ssh
|
format = ssh
|
||||||
|
|
||||||
[gpg "ssh"]
|
# [gpg "ssh"]
|
||||||
program = "/opt/1Password/op-ssh-sign"
|
# program = "/opt/1Password/op-ssh-sign"
|
||||||
|
|
||||||
[commit]
|
[commit]
|
||||||
gpgSign = true
|
gpgSign = true
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue