aboutsummaryrefslogtreecommitdiff
path: root/config/emacs
diff options
context:
space:
mode:
authorJacob Janzen <jjanzenn@proton.me>2024-08-08 16:03:05 -0500
committerJacob Janzen <jjanzenn@proton.me>2024-08-08 16:03:05 -0500
commit545dfbb53f2bb6d7669ca7bfd1f4775a9150b530 (patch)
tree226c23c41398b5bc1ba070ed38925b7d718382d6 /config/emacs
parent1116e6b76eb5921698f11df04631df515b74cfb3 (diff)
update configs, remove index files
Diffstat (limited to 'config/emacs')
-rw-r--r--config/emacs/index.org14
-rw-r--r--config/emacs/languages.org17
-rw-r--r--config/emacs/package-setup.org34
-rw-r--r--config/emacs/tools.org20
-rw-r--r--config/emacs/user-interface.org9
5 files changed, 43 insertions, 51 deletions
diff --git a/config/emacs/index.org b/config/emacs/index.org
deleted file mode 100644
index 6665f16..0000000
--- a/config/emacs/index.org
+++ /dev/null
@@ -1,14 +0,0 @@
-#+title: Dotfiles =/.config/emacs=
-This is my Emacs configuration. I recommend starting in [[./init.org][init.el]] as that is the entry-point for the program.
-
-* Directories
-- [[../index.org][../]]
-
-* Files
-- [[./feed.org][feed.org]]
-- [[./force-custom-file.org][force-custom-file.el]]
-- [[./init.org][init.el]]
-- [[./languages.org][languages.el]]
-- [[./package-setup.org][package-setup.el]]
-- [[./tools.org][tools.el]]
-- [[./user-interface.org][user-interface.el]]
diff --git a/config/emacs/languages.org b/config/emacs/languages.org
index 765659b..a0a19e4 100644
--- a/config/emacs/languages.org
+++ b/config/emacs/languages.org
@@ -71,6 +71,23 @@ Install Lua support and run =eglot= on Lua files.
(add-hook 'lua-mode-hook 'jj/eglot-setup))
#+end_src
+Better Lisp editing with =lispy=.
+#+begin_src emacs-lisp :tangle ~/.config/emacs/languages.el :mkdirp yes
+ (use-package lispy
+ :hook (emacs-lisp-mode . lispy-mode))
+ (use-package lispyville
+ :after lispy
+ :hook (lispy-mode . lispyville-mode))
+#+end_src
+
+Better parentheses handling in lisp with =parinfer-rust-mode=.
+#+begin_src emacs-lisp :tangle ~/.config/emacs/tools.el :mkdirp yes
+ (use-package parinfer-rust-mode
+ :hook (emacs-lisp-mode . parinfer-rust-mode)
+ :init
+ (setq parinfer-rust-auto-download t))
+#+end_src
+
* Markdown
Install Markdown support and run =eglot= on Markdown files.
#+begin_src emacs-lisp :tangle ~/.config/emacs/languages.el :mkdirp yes
diff --git a/config/emacs/package-setup.org b/config/emacs/package-setup.org
index 00d87dc..6ed238c 100644
--- a/config/emacs/package-setup.org
+++ b/config/emacs/package-setup.org
@@ -1,23 +1,25 @@
#+title: Emacs Package Setup
-
-Set up =melpa=, =org=, and =elpa= as package archives.
+Install =straight= for better package management.
#+begin_src emacs-lisp :tangle ~/.config/emacs/package-setup.el :mkdirp yes
- (require 'package)
-
- (setq package-archives '(("melpa" . "https://melpa.org/packages/")
- ("org" . "https://orgmode.org/elpa/")
- ("elpa" . "https://elpa.gnu.org/packages/")))
-
- (package-initialize)
- (unless package-archive-contents
- (package-refresh-contents))
+ (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
Install =use-package= for declarative package installation. Make =use-package= default to =ensure t= so that packages are enabled if they are declared.
#+begin_src emacs-lisp :tangle ~/.config/emacs/package-setup.el :mkdirp yes
- (unless (package-installed-p 'use-package)
- (package-install 'use-package))
-
- (require 'use-package)
- (setq use-package-always-ensure t)
+ (straight-use-package 'use-package)
+ (setq straight-use-package-by-default t)
#+end_src
diff --git a/config/emacs/tools.org b/config/emacs/tools.org
index fd31c90..b9a5008 100644
--- a/config/emacs/tools.org
+++ b/config/emacs/tools.org
@@ -23,24 +23,6 @@ Use =evil-collection= to include =vi= keybindings in extra modes.
(evil-collection-init))
#+end_src
-* Lisp Editing
-Better Lisp editing with =lispy= and =lispyville=.
-#+begin_src emacs-lisp :tangle ~/.config/emacs/tools.el :mkdirp yes
- (use-package lispy
- :hook emacs-lisp-mode)
- (use-package lispyville
- :after lispy
- :hook lispy-mode)
-#+end_src
-
-Better parentheses handling in lisp with =parinfer-rust-mode=.
-#+begin_src emacs-lisp :tangle ~/.config/emacs/tools.el :mkdirp yes
- (use-package parinfer-rust-mode
- :hook emacs-lisp-mode
- :init
- (setq parinfer-rust-auto-download t))
-#+end_src
-
* Undo
Better undo with =undo-fu=.
#+begin_src emacs-lisp :tangle ~/.config/emacs/tools.el :mkdirp yes
@@ -91,7 +73,7 @@ Save place in PDFs with =saveplace-pdf-view=.
* Org-Mode
Ensure that =org= is set up before any of this.
#+begin_src emacs-lisp :tangle ~/.config/emacs/tools.el :mkdirp yes
- (require 'org)
+ (use-package org)
#+end_src
Set my =org-mode= directory.
#+begin_src emacs-lisp :tangle ~/.config/emacs/tools.el :mkdirp yes
diff --git a/config/emacs/user-interface.org b/config/emacs/user-interface.org
index c0dc399..5a88df5 100644
--- a/config/emacs/user-interface.org
+++ b/config/emacs/user-interface.org
@@ -9,11 +9,16 @@ Set the default font to the Source Code Pro nerd font variant. I use size 14 fon
Use the Doom Nord light theme.
#+begin_src emacs-lisp :tangle ~/.config/emacs/user-interface.el :mkdirp yes
(use-package doom-themes
+ :straight (doom-themes :type git :host github :repo "doomemacs/themes"
+ :fork (:host github
+ :repo "JacobJanzen/emacs-doom-themes"))
:config
(setq doom-themes-enable-bold t
doom-themes-enable-italic t)
- (load-theme 'doom-nord-light t)
+ (load-theme 'doom-disco t)
(doom-themes-org-config))
+
+(add-to-list 'default-frame-alist '(alpha-background . 90))
#+end_src
Use =doom-modeline= for a nicer modeline.
@@ -99,7 +104,7 @@ Don't create backup files.
Use nerd font icons in =dired=.
#+begin_src emacs-lisp :tangle ~/.config/emacs/user-interface.el :mkdirp yes
(use-package nerd-icons-dired
- :hook dired-mode)
+ :hook (dired-mode . nerd-icons-dired-mode))
#+end_src
Use colours in =dired= with =diredfl=.