aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.emacs.d/lisp/et-completion.el26
-rw-r--r--.emacs.d/lisp/et-format.el3
-rw-r--r--.emacs.d/lisp/et-keys.el1
-rw-r--r--.emacs.d/lisp/et-lang.el14
-rw-r--r--.emacs.d/lisp/et-lsp.el1
-rw-r--r--.emacs.d/lisp/et-md.el1
-rw-r--r--.emacs.d/lisp/et-package.el2
-rw-r--r--.emacs.d/lisp/et-tidy.el1
-rw-r--r--.emacs.d/lisp/et-utils.el2
-rw-r--r--.emacs.d/lisp/et-vc.el6
-rw-r--r--.emacs.d/lisp/et-vi.el4
11 files changed, 38 insertions, 23 deletions
diff --git a/.emacs.d/lisp/et-completion.el b/.emacs.d/lisp/et-completion.el
index db47398..1939f81 100644
--- a/.emacs.d/lisp/et-completion.el
+++ b/.emacs.d/lisp/et-completion.el
@@ -1,11 +1,10 @@
;;; et-completion.el --- Enhance the Emacs completion behavior -*- lexical-binding: t; -*-
-;;
;;; Commentary:
-;;
;;; Code:
;; Add a vertical completion UI
(use-package vertico
+ :ensure t
:custom
(vertico-cycle t)
:init
@@ -13,6 +12,7 @@
;; Adjust completion search behavior
(use-package orderless
+ :ensure t
:custom
(completion-styles '(orderless basic))
(completion-category-overrides '((file (styles partial-completion))))
@@ -26,11 +26,13 @@
;; Add documentation alongside the completion items
(use-package marginalia
+ :ensure t
:init
(marginalia-mode))
;; Add completion at point
(use-package corfu
+ :ensure t
:custom
(corfu-cycle t) ;; Enable cycling for `corfu-next/previous'
;; (corfu-quit-at-boundary nil) ;; Never quit at completion boundary
@@ -78,7 +80,18 @@
;; useful beyond Corfu.
(read-extended-command-predicate #'command-completion-default-include-p))
+(use-package consult
+ :ensure t
+ :bind (("C-x b" . consult-buffer)
+ ("M-y" . consult-yank-pop)
+ ("M-g i" . consult-imenu)
+ ("M-s l" . consult-line)
+ ("M-s r" . consult-ripgrep)
+ ("M-s f" . consult-fd))
+ :hook (completion-list-mode . consult-preview-at-point-mode))
+
(use-package embark
+ :ensure t
:bind (("C-." . embark-act)
("C-;" . embark-dwim)
("C-h B" . embark-bindings))
@@ -88,14 +101,5 @@
(use-package embark-consult
:hook (embark-collect-mode . consult-preview-at-point-mode))
-(use-package consult
- :bind (("C-x b" . consult-buffer)
- ("M-y" . consult-yank-pop)
- ("M-g i" . consult-imenu)
- ("M-s l" . consult-line)
- ("M-s r" . consult-ripgrep)
- ("M-s f" . consult-fd))
- :hook (completion-list-mode . consult-preview-at-point-mode))
-
(provide 'et-completion)
;;; et-completion.el ends here
diff --git a/.emacs.d/lisp/et-format.el b/.emacs.d/lisp/et-format.el
index 70d2cbd..4805b8a 100644
--- a/.emacs.d/lisp/et-format.el
+++ b/.emacs.d/lisp/et-format.el
@@ -1,14 +1,15 @@
;;; et-format.el --- Code formatting configuration ;; -*- lexical-binding: t; -*-
;;; Commentary:
-;;
;;; Code:
(use-package flycheck
+ :ensure t
:init (global-flycheck-mode))
(setq-default flycheck-emacs-lisp-load-path 'inherit)
(use-package apheleia
+ :ensure t
:config
(apheleia-global-mode +1))
diff --git a/.emacs.d/lisp/et-keys.el b/.emacs.d/lisp/et-keys.el
index 2071cb2..fb7c57a 100644
--- a/.emacs.d/lisp/et-keys.el
+++ b/.emacs.d/lisp/et-keys.el
@@ -3,6 +3,7 @@
;;; Code:
(use-package which-key
+ :ensure t
:config
(which-key-mode 1))
diff --git a/.emacs.d/lisp/et-lang.el b/.emacs.d/lisp/et-lang.el
index 409e1e3..a3b1fbb 100644
--- a/.emacs.d/lisp/et-lang.el
+++ b/.emacs.d/lisp/et-lang.el
@@ -3,6 +3,7 @@
;;; Code:
(use-package treesit-auto
+ :ensure t
:custom
(treesit-auto-install 'prompt)
:config
@@ -10,16 +11,17 @@
(global-treesit-auto-mode))
(use-package sly
+ :ensure t
:init
(setq inferior-lisp-program "sbcl"))
-(use-package geiser)
-(use-package geiser-guile)
+(use-package geiser
+ :pin "melpa"
+ :ensure t)
-(defun geiser-save ()
- "Save the geiser REPL session."
- (interactive)
- (geiser-repl--write-input-ring))
+(use-package geiser-guile
+ :pin "melpa"
+ :ensure t)
(provide 'et-lang)
;;; et-lang.el ends here
diff --git a/.emacs.d/lisp/et-lsp.el b/.emacs.d/lisp/et-lsp.el
index bdf8c21..dc0718a 100644
--- a/.emacs.d/lisp/et-lsp.el
+++ b/.emacs.d/lisp/et-lsp.el
@@ -3,6 +3,7 @@
;;; Code:
(use-package eglot
+ :ensure t
:hook ((python-mode . eglot-ensure)
(go-mode . eglot-ensure))
:init
diff --git a/.emacs.d/lisp/et-md.el b/.emacs.d/lisp/et-md.el
index 1cf5804..c48d5f2 100644
--- a/.emacs.d/lisp/et-md.el
+++ b/.emacs.d/lisp/et-md.el
@@ -3,6 +3,7 @@
;;; Code:
(use-package markdown-mode
+ :ensure t
:mode ("README\\.md\\'" . gfm-mode)
:init (setq markdown-command "multimarkdown")
:bind (:map markdown-mode-map
diff --git a/.emacs.d/lisp/et-package.el b/.emacs.d/lisp/et-package.el
index 3d11154..0e8730b 100644
--- a/.emacs.d/lisp/et-package.el
+++ b/.emacs.d/lisp/et-package.el
@@ -29,8 +29,6 @@
(package-install 'use-package))
(require 'use-package)
-;; Always ensure anything used via use-package is installed.
-(setq use-package-always-ensure t)
(provide 'et-package)
;;; et-package.el ends here
diff --git a/.emacs.d/lisp/et-tidy.el b/.emacs.d/lisp/et-tidy.el
index 9396e5a..f50cf8f 100644
--- a/.emacs.d/lisp/et-tidy.el
+++ b/.emacs.d/lisp/et-tidy.el
@@ -3,6 +3,7 @@
;;; Code:
(use-package no-littering
+ :ensure t
:config
(setq auto-save-file-name-transforms
`((".*" ,(no-littering-expand-var-file-name "auto-save/") t)))
diff --git a/.emacs.d/lisp/et-utils.el b/.emacs.d/lisp/et-utils.el
index af5bdbd..17a0e77 100644
--- a/.emacs.d/lisp/et-utils.el
+++ b/.emacs.d/lisp/et-utils.el
@@ -1,7 +1,5 @@
;;; et-utils.el --- Utilities for my Emacs configuration -*- lexical-binding: t; -*-
-;;
;;; Commentary:
-;;
;;; Code:
(defun et-is-desktop-p ()
diff --git a/.emacs.d/lisp/et-vc.el b/.emacs.d/lisp/et-vc.el
index b71a6dd..058f81c 100644
--- a/.emacs.d/lisp/et-vc.el
+++ b/.emacs.d/lisp/et-vc.el
@@ -4,7 +4,11 @@
(require 'vc-git)
(use-package project)
-(use-package magit)
+
+(use-package magit
+ :ensure t)
+
+(setq vc-follow-symlinks t)
(global-set-key (kbd "C-c gu")
'et-generate-remote-git-url)
diff --git a/.emacs.d/lisp/et-vi.el b/.emacs.d/lisp/et-vi.el
index fe9011c..15c7638 100644
--- a/.emacs.d/lisp/et-vi.el
+++ b/.emacs.d/lisp/et-vi.el
@@ -3,6 +3,7 @@
;;; Code:
(use-package evil
+ :ensure t
:init
(setq evil-want-integration t)
(setq evil-want-keybinding nil)
@@ -11,14 +12,17 @@
(evil-mode 1))
(use-package evil-collection
+ :ensure t
:config
(evil-collection-init))
(use-package evil-commentary
+ :ensure t
:config
(evil-commentary-mode))
(use-package evil-surround
+ :ensure t
:config
(global-evil-surround-mode 1))