Compare commits
No commits in common. "6b8a279dedba397b4e9a2ac32bcbf5284b59ee3a" and "53acc291e13466e9d5e6c8bd38c89f9188a4fd86" have entirely different histories.
6b8a279ded
...
53acc291e1
5 changed files with 104 additions and 64 deletions
|
|
@ -30,15 +30,34 @@
|
|||
auto-save-default t)
|
||||
#+end_src
|
||||
* Packages
|
||||
** Straight.el
|
||||
#+begin_src emacs-lisp
|
||||
(defvar bootstrap-version)
|
||||
(let ((bootstrap-file
|
||||
(expand-file-name
|
||||
"straight/repos/straight.el/bootstrap.el"
|
||||
(or (bound-and-true-p straight-base-dir)
|
||||
user-emacs-directory)))
|
||||
(bootstrap-version 7))
|
||||
(unless (file-exists-p bootstrap-file)
|
||||
(with-current-buffer
|
||||
(url-retrieve-synchronously
|
||||
"https://raw.githubusercontent.com/radian-software/straight.el/develop/install.el"
|
||||
'silent 'inhibit-cookies)
|
||||
(goto-char (point-max))
|
||||
(eval-print-last-sexp)))
|
||||
(load bootstrap-file nil 'nomessage))
|
||||
#+end_src
|
||||
** use-package
|
||||
#+begin_src emacs-lisp
|
||||
(straight-use-package 'use-package)
|
||||
|
||||
(use-package straight
|
||||
:custom (straight-use-package-by-default t))
|
||||
|
||||
(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
|
||||
|
|
@ -87,7 +106,7 @@
|
|||
(t
|
||||
:default-family "Iosevka Nerd Font"
|
||||
:default-weight normal
|
||||
:variable-pitch-family "Inter")))
|
||||
:variable-pitch-family "Adwaita Sans")))
|
||||
(fontaine-set-preset 'regular))
|
||||
#+end_src
|
||||
** Which key
|
||||
|
|
@ -149,6 +168,13 @@
|
|||
(use-package ace-window
|
||||
:bind (("M-o" . ace-window)))
|
||||
#+end_src
|
||||
*** Avy
|
||||
#+begin_src emacs-lisp
|
||||
(use-package avy
|
||||
:bind (("C-o" . avy-goto-char))
|
||||
:custom
|
||||
(avy-keys . (?a ?r ?s ?t ?d ?h ?n ?e ?i ?o)))
|
||||
#+end_src
|
||||
* Completion
|
||||
** Vertico
|
||||
#+begin_src emacs-lisp
|
||||
|
|
@ -158,7 +184,8 @@
|
|||
#+end_src
|
||||
** Savehist
|
||||
#+begin_src emacs-lisp
|
||||
(use-package emacs
|
||||
(use-package savehist
|
||||
:straight (:type built-in)
|
||||
:init (savehist-mode))
|
||||
#+end_src
|
||||
** Orderless
|
||||
|
|
@ -270,36 +297,6 @@
|
|||
|
||||
(setq consult-narrow-key "<"))
|
||||
#+end_src
|
||||
* Lsp
|
||||
** eglot
|
||||
#+begin_src emacs-lisp
|
||||
(use-package eglot
|
||||
:bind (:map eglot-mode-map
|
||||
("C-c l r" . eglot-rename)
|
||||
("C-c l f" . eglot-format-buffer)
|
||||
("C-c l a" . eglot-code-actions)
|
||||
("C-c l q" . eglot-code-action-quickfix)
|
||||
("C-c l d" . xref-find-definitions)
|
||||
("C-c l i" . eglot-find-implementation)
|
||||
("C-c l t" . eglot-find-type-definition)
|
||||
("C-c l s" . xref-find-references)
|
||||
("C-c l h" . eldoc)
|
||||
("C-c l R" . eglot-restart-process)
|
||||
("C-c l e" . eglot-errors-at-point))
|
||||
(:map flymake-mode-map
|
||||
("M-n" . flymake-goto-next-error)
|
||||
("M-p" . flymake-goto-prev-error)))
|
||||
#+end_src
|
||||
** eldoc-box
|
||||
#+begin_src emacs-lisp
|
||||
(use-package eldoc-box
|
||||
:hook (eglot-managed-mode . eldoc-box-hover-at-point-mode))
|
||||
#+end_src
|
||||
** Markdown
|
||||
I don't really use markdown ([[Org Mode]] is a strict improvement imo), but it's handy for rendering documentation.
|
||||
#+begin_src emacs-lisp
|
||||
(use-package markdown-mode)
|
||||
#+end_src
|
||||
* Languages
|
||||
** Agda
|
||||
#+begin_src emacs-lisp
|
||||
|
|
@ -328,21 +325,46 @@ I don't really use markdown ([[Org Mode]] is a strict improvement imo), but it's
|
|||
(use-package haskell-mode)
|
||||
#+end_src
|
||||
|
||||
** OCaml
|
||||
#+begin_src emacs-lisp
|
||||
(use-package tuareg
|
||||
:mode (("\\.ocamlinit\\'" . tuareg-mode)))
|
||||
#+end_src
|
||||
|
||||
** Rust
|
||||
#+begin_src emacs-lisp
|
||||
(use-package rust-mode
|
||||
:hook
|
||||
(rust-mode-hook . eglot-ensure))
|
||||
|
||||
(use-package eglot
|
||||
:straight (:type built-in)
|
||||
:bind (:map eglot-mode-map
|
||||
("C-c l r" . eglot-rename)
|
||||
("C-c l f" . eglot-format-buffer)
|
||||
("C-c l a" . eglot-code-actions)
|
||||
("C-c l q" . eglot-code-action-quickfix)
|
||||
("C-c l d" . xref-find-definitions)
|
||||
("C-c l i" . eglot-find-implementation)
|
||||
("C-c l t" . eglot-find-type-definition)
|
||||
("C-c l s" . xref-find-references)
|
||||
("C-c l h" . eldoc)
|
||||
("C-c l R" . eglot-restart-process)
|
||||
("C-c l e" . eglot-errors-at-point))
|
||||
(:map flymake-mode-map
|
||||
("M-n" . flymake-goto-next-error)
|
||||
("M-p" . flymake-goto-prev-error)))
|
||||
#+end_src
|
||||
** Zig
|
||||
** KDL
|
||||
(For niri)
|
||||
#+begin_src emacs-lisp
|
||||
(use-package zig-mode)
|
||||
(use-package kdl-mode)
|
||||
#+end_src
|
||||
* Latex
|
||||
** Auctex
|
||||
#+begin_src emacs-lisp
|
||||
(use-package tex
|
||||
:ensure auctex
|
||||
(use-package tex-site
|
||||
:straight auctex
|
||||
:hook
|
||||
(LaTeX-mode . visual-line-mode)
|
||||
(LaTeX-mode . flyspell-mode)
|
||||
|
|
@ -431,9 +453,34 @@ I don't really use markdown ([[Org Mode]] is a strict improvement imo), but it's
|
|||
#+end_src
|
||||
* Org Mode
|
||||
** Org itself
|
||||
I'm using the fork as described [[https://abode.karthinks.com/org-latex-preview/][here]] in order to have much better LaTeX previews. This is eventually supposed to be merged into emacs proper, which would be nice.
|
||||
#+begin_src emacs-lisp
|
||||
(use-package org
|
||||
:defer
|
||||
:straight `(org
|
||||
:fork (:host nil
|
||||
:repo "https://git.tecosaur.net/tec/org-mode.git"
|
||||
:branch "dev"
|
||||
:remote "tecosaur")
|
||||
:files (:defaults "etc")
|
||||
:build t
|
||||
:pre-build
|
||||
(with-temp-file "org-version.el"
|
||||
(require 'lisp-mnt)
|
||||
(let ((version
|
||||
(with-temp-buffer
|
||||
(insert-file-contents "lisp/org.el")
|
||||
(lm-header "version")))
|
||||
(git-version
|
||||
(string-trim
|
||||
(with-temp-buffer
|
||||
(call-process "git" nil t nil "rev-parse" "--short" "HEAD")
|
||||
(buffer-string)))))
|
||||
(insert
|
||||
(format "(defun org-release () \"The release version of Org.\" %S)\n" version)
|
||||
(format "(defun org-git-version () \"The truncate git commit hash of Org mode.\" %S)\n" git-version)
|
||||
"(provide 'org-version)\n")))
|
||||
:pin nil)
|
||||
:init
|
||||
(setq org-list-allow-alphabetical t)
|
||||
:custom
|
||||
|
|
@ -442,6 +489,7 @@ I don't really use markdown ([[Org Mode]] is a strict improvement imo), but it's
|
|||
(org-startup-with-inline-images t)
|
||||
(org-image-actual-width '(300))
|
||||
(org-export-with-smart-quotes t)
|
||||
(org-latex-preview-live t)
|
||||
(org-directory "~/Nextcloud/org")
|
||||
(org-cite-global-bibliography '("~/Nextcloud/library.bib"))
|
||||
(org-agenda-files `(,org-directory))
|
||||
|
|
@ -455,9 +503,9 @@ I don't really use markdown ([[Org Mode]] is a strict improvement imo), but it's
|
|||
("\\section{%s}" . "\\section*{%s}")
|
||||
("\\subsection{%s}" . "\\subsection*{%s}")
|
||||
("\\subsubsection{%s}" . "\\subsubsection*{%s}")))
|
||||
:hook
|
||||
(org-mode . visual-line-mode)
|
||||
(org-mode . flyspell-mode))
|
||||
:hook (org-mode . visual-line-mode)
|
||||
(org-mode . flyspell-mode)
|
||||
(org-mode . org-latex-preview-auto-mode))
|
||||
#+end_src
|
||||
** toki pona support
|
||||
#+begin_src emacs-lisp
|
||||
|
|
@ -511,6 +559,7 @@ I don't really use markdown ([[Org Mode]] is a strict improvement imo), but it's
|
|||
("org-static"
|
||||
:base-directory "~/repos/blog/static/"
|
||||
:publishing-directory "/ssh:wball@ballcloud.cc:~/blog/static/"
|
||||
:publishing-directory "~/repos/blog/public_html/static/"
|
||||
:base-extension "ico\\|ttf\\|css"
|
||||
:publishing-function org-publish-attachment
|
||||
:recursive t
|
||||
|
|
@ -522,7 +571,7 @@ I don't really use markdown ([[Org Mode]] is a strict improvement imo), but it's
|
|||
:publishing-function org-publish-attachment
|
||||
:recursive t
|
||||
)
|
||||
("org" :components ("org-posts" "org-static" "org-media" "org-pages"))
|
||||
("org" :components ("org-posts" "org-static" "org-media"))
|
||||
))
|
||||
|
||||
(use-package htmlize)
|
||||
|
|
@ -557,21 +606,22 @@ I don't really use markdown ([[Org Mode]] is a strict improvement imo), but it's
|
|||
(with-eval-after-load 'esh-opt
|
||||
(setq eshell-destroy-buffer-when-process-dies t)))
|
||||
|
||||
(defalias 'eshell/ff 'find-file)
|
||||
(defalias 'eshell/fo 'find-file-other-window)
|
||||
#+end_src
|
||||
** eat
|
||||
#+begin_src emacs-lisp
|
||||
(use-package eat)
|
||||
(defalias 'ff 'find-file)
|
||||
(defalias 'fo 'find-file-other-window)
|
||||
(defalias 'clear 'clear-scrollback)
|
||||
#+end_src
|
||||
** Dired
|
||||
#+begin_src emacs-lisp
|
||||
(use-package emacs
|
||||
(use-package dired
|
||||
:straight (:type built-in)
|
||||
:commands (dired dired-jump)
|
||||
:custom ((dired-listing-switches "-agho --group-directories-first"))
|
||||
:config
|
||||
(require 'dired-x))
|
||||
|
||||
(use-package dired-single
|
||||
:after dired)
|
||||
|
||||
(use-package dired-hide-dotfiles
|
||||
:hook (dired-mode . dired-hide-dotfiles-mode))
|
||||
#+end_src
|
||||
|
|
|
|||
|
|
@ -32,7 +32,6 @@ fish_add_path /usr/lib/smlnj/bin
|
|||
fish_add_path $HOME/.config/emacs/bin
|
||||
fish_add_path $HOME/.elan/bin
|
||||
fish_add_path $HOME/.local/share/pack/bin
|
||||
fish_add_path $HOME/.zvm/bin
|
||||
|
||||
set -x XDG_CACHE_HOME $HOME/.cache
|
||||
set -x XDG_CONFIG_HOME $HOME/.config
|
||||
|
|
|
|||
|
|
@ -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:not\x20a\x20tty
|
||||
SETUVAR --export GPG_TTY:/dev/pts/0
|
||||
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:/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/\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
|
||||
|
|
|
|||
|
|
@ -10,13 +10,7 @@
|
|||
[user]
|
||||
email = williampi103@gmail.com
|
||||
name = William Ball
|
||||
signingkey = ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIN1+L+FGfBwH/ufLzj9V6+39K+Vad7s5zUZooqGvrAAi
|
||||
|
||||
[gpg]
|
||||
format = ssh
|
||||
|
||||
[gpg "ssh"]
|
||||
program = "/opt/1Password/op-ssh-sign"
|
||||
signingKey = williampi103@gmail.com
|
||||
|
||||
[commit]
|
||||
gpgSign = true
|
||||
|
|
|
|||
|
|
@ -13,6 +13,3 @@ Host server
|
|||
User wball
|
||||
Hostname ballcloud.cc
|
||||
IdentityFile ~/.ssh/id_ed25519
|
||||
|
||||
Host *
|
||||
IdentityAgent ~/.1password/agent.sock
|
||||
|
|
|
|||
Loading…
Reference in a new issue