aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.emacs.d/custom-vars.el3
-rw-r--r--.emacs.d/init.el31
-rw-r--r--.emacs.d/modules/et-appearance.el4
-rw-r--r--.emacs.d/modules/et-completion.el29
-rw-r--r--.emacs.d/modules/et-lsp.el8
5 files changed, 46 insertions, 29 deletions
diff --git a/.emacs.d/custom-vars.el b/.emacs.d/custom-vars.el
index bf04d9f..fe6fa91 100644
--- a/.emacs.d/custom-vars.el
+++ b/.emacs.d/custom-vars.el
@@ -4,8 +4,7 @@
;; If you edit it by hand, you could mess it up, so be careful.
;; Your init file should contain only one such instance.
;; If there is more than one, they won't work right.
- '(package-selected-packages
- '(doom-modeline ivy marginalia nord-theme surround vertico xclip))
+ '(package-selected-packages nil)
'(safe-local-variable-values '((Lexical-binding . t))))
(custom-set-faces
;; custom-set-faces was added by Custom.
diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index b082145..7914ad5 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -1,46 +1,27 @@
+;; -*- lexical-binding: t; -*-
+
;; Add configuration modules to load path
(add-to-list 'load-path '"~/.dotfiles/.emacs.d/modules")
;; --------- Core Variables ---------------------
-(defvar et/monospace-font "Hack Nerd Font Mono"
+(defvar et-monospace-font "Hack Nerd Font Mono"
"The font used by default and for any monospaced font usage.")
-(defvar et/monospace-font-size 128)
+(defvar et-monospace-font-size 160)
;; --------- Modules ----------------------------
(require 'et-package)
(require 'et-appearance)
(require 'et-vc)
+(require 'et-completion)
+(require 'et-lsp)
(use-package which-key
:config
(which-key-mode 1))
-
-(use-package eglot
- :hook (python-mode . eglot-ensure)
- :config
- (add-to-list 'eglot-server-programs '(python-mode . ("ty" "server"))))
-
(use-package surround
:bind-keymap ("M-'" . surround-keymap))
-(use-package vertico
- :custom
- (vertico-cycle t)
- :init
- (vertico-mode))
-
-(use-package savehist
- :init
- (savehist-mode))
-
-(use-package marginalia
- :after vertico
- :custom
- (marginalia-annotators '(marginalia-annotators-heavy marginalia-annotators-light nil))
- :init
- (marginalia-mode))
-
(setq custom-file (expand-file-name "custom-vars.el" user-emacs-directory))
(when (file-exists-p custom-file)
(load custom-file))
diff --git a/.emacs.d/modules/et-appearance.el b/.emacs.d/modules/et-appearance.el
index 06fa44d..3e9c035 100644
--- a/.emacs.d/modules/et-appearance.el
+++ b/.emacs.d/modules/et-appearance.el
@@ -20,8 +20,8 @@
;; Setup our monospace font
(set-face-attribute 'default nil
- :font (symbol-value 'et/monospace-font)
- :height (symbol-value 'et/monospace-font-size))
+ :font (symbol-value 'et-monospace-font)
+ :height (symbol-value 'et-monospace-font-size))
;; Use line numbers globally
;; (setq display-line-numbers-type 'relative)
diff --git a/.emacs.d/modules/et-completion.el b/.emacs.d/modules/et-completion.el
new file mode 100644
index 0000000..8dfc800
--- /dev/null
+++ b/.emacs.d/modules/et-completion.el
@@ -0,0 +1,29 @@
+;; -*- lexical-binding: t; -*-
+
+;; Add a vertical completion UI
+(use-package vertico
+ :custom
+ (vertico-cycle t)
+ :init
+ (vertico-mode))
+
+;; Adjust completion search behavior
+(use-package orderless
+ :ensure t
+ :custom
+ (completion-styles '(orderless basic))
+ (completion-category-overrides '((file (styles partial-completion))))
+ (completion-pcm-leading-wildcard t))
+
+;; Persist history over emacs restarts.
+;; This allows vertico to sort by history position.
+(use-package savehist
+ :init
+ (savehist-mode))
+
+;; Add documentation alongside the completion items
+(use-package marginalia
+ :init
+ (marginalia-mode))
+
+(provide 'et-completion)
diff --git a/.emacs.d/modules/et-lsp.el b/.emacs.d/modules/et-lsp.el
new file mode 100644
index 0000000..c4154cf
--- /dev/null
+++ b/.emacs.d/modules/et-lsp.el
@@ -0,0 +1,8 @@
+;; -*- lexical-binding: t; -*-
+
+(use-package eglot
+ :hook (python-mode . eglot-ensure)
+ :config
+ (add-to-list 'eglot-server-programs '(python-mode . ("ty" "server"))))
+
+(provide 'et-lsp)