jam/dotfiles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix font loading, use evil keybinds with leader and other tweaks

Browse Source
This commit is contained in:
James Dixon 2025-05-13 05:52:32 -04:00
parent d9da140621
commit 2d486f3377
1 changed files with 34 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
config/emacs/.config/emacs/init.el
View File

@ -62,8 +62,10 @@
(setq read-extended-command-predicate #'command-completion-default-include-p) (setq read-extended-command-predicate #'command-completion-default-include-p)
;;; Theme (Default) ;;; Theme (Default)
;; TODO: make this check if font exists (cond
; (set-frame-font "Maple Mono 12" nil t) ((find-font (font-spec :name "Maple Mono"))
(set-frame-font "Maple Mono 12" nil t)))
(load-theme 'modus-vivendi t) (load-theme 'modus-vivendi t)
;;; File History, Saving and Reverting ;;; File History, Saving and Reverting
@ -226,7 +228,6 @@
(if mark-active (list (region-beginning) (region-end)) (if mark-active (list (region-beginning) (region-end))
(list (save-excursion (backward-word 1) (point)) (point))))) (list (save-excursion (backward-word 1) (point)) (point)))))
;;; * "Sensible Defaults" ends here * ;;; * "Sensible Defaults" ends here *
;;; ** Start Package Manager (straight.el) ** ;;; ** Start Package Manager (straight.el) **
;; bootstrap straight.el package manager ;; bootstrap straight.el package manager
@ -261,12 +262,16 @@
(setq evil-undo-system 'undo-fu) (setq evil-undo-system 'undo-fu)
(setq evil-want-C-u-scroll t) (setq evil-want-C-u-scroll t)
(setq evil-want-C-i-jump nil) (setq evil-want-C-i-jump nil)
(setq evil-symbol-word-search t)
(setq evil-ex-search-vim-style-regexp t)
(setq evil-ex-visual-char-range t)
(setq evil-disable-insert-state-bindings t) (setq evil-disable-insert-state-bindings t)
(setq evil-insert-state-cursor '(box "violet") (setq evil-insert-state-cursor '(box "violet")
evil-normal-state-cursor '(box "yellow") evil-normal-state-cursor '(box "yellow")
evil-visual-state-cursor '(box "#1aa5db")) evil-visual-state-cursor '(box "#1aa5db"))
(setq evil-want-keybinding nil) (setq evil-want-keybinding nil)
:config (setq evil-want-integration t)
:config
(evil-mode 1)) (evil-mode 1))
(use-package undo-fu (use-package undo-fu
@ -312,30 +317,32 @@
(evil-define-key '(normal visual) 'global (kbd "C-a C-+") 'evil-numbers/inc-at-pt-incremental) (evil-define-key '(normal visual) 'global (kbd "C-a C-+") 'evil-numbers/inc-at-pt-incremental)
(evil-define-key '(normal visual) 'global (kbd "C-a C--") 'evil-numbers/dec-at-pt-incremental) (evil-define-key '(normal visual) 'global (kbd "C-a C--") 'evil-numbers/dec-at-pt-incremental)
;;; general keybinds ;;; general keybinds
(define-key evil-normal-state-map (kbd "SPC :") 'execute-extended-command) (evil-set-leader nil (kbd "SPC"))
(define-key evil-normal-state-map (kbd "SPC e") 'eval-last-sexp) (evil-define-key 'normal 'global (kbd "<leader> :") 'execute-extended-command)
(define-key evil-visual-state-map (kbd "SPC e") 'eval-region) (evil-define-key 'normal 'global (kbd "<leader> e") 'eval-last-sexp)
(define-key evil-normal-state-map (kbd "SPC p") 'eval-print-last-sexp) (evil-define-key 'visual 'global (kbd "<leader> e") 'eval-region)
(define-key evil-normal-state-map (kbd "SPC E") 'eval-expression) (evil-define-key 'normal 'global (kbd "<leader> p") 'eval-print-last-sexp)
(define-key evil-normal-state-map (kbd "SPC b") 'eval-buffer) (evil-define-key 'normal 'global (kbd "<leader> E") 'eval-expression)
(define-key evil-normal-state-map (kbd "SPC w") 'save-buffer) (evil-define-key 'normal 'global (kbd "<leader> b") 'eval-buffer)
(define-key evil-normal-state-map (kbd "SPC W") 'whitespace-mode) (evil-define-key 'normal 'global (kbd "<leader> w") 'save-buffer)
(define-key evil-normal-state-map (kbd "SPC k") 'kill-buffer) (evil-define-key 'normal 'global (kbd "<leader> W") 'whitespace-mode)
(define-key evil-normal-state-map (kbd "SPC f") 'ffap) (evil-define-key 'normal 'global (kbd "<leader> k") 'kill-buffer)
(define-key evil-normal-state-map (kbd "SPC F") 'find-file) (evil-define-key 'normal 'global (kbd "<leader> f") 'ffap)
(define-key evil-normal-state-map (kbd "SPC d") 'dired) (evil-define-key 'normal 'global (kbd "<leader> F") 'find-file)
(define-key evil-normal-state-map (kbd "SPC K") 'dired-jump) (evil-define-key 'normal 'global (kbd "<leader> d") 'dired)
(define-key evil-normal-state-map (kbd "SPC o") 'occur) (evil-define-key 'normal 'global (kbd "<leader> K") 'dired-jump)
(define-key evil-normal-state-map (kbd "SPC B") 'bookmark-jump) (evil-define-key 'normal 'global (kbd "<leader> o") 'occur)
(define-key evil-normal-state-map (kbd "SPC g") 'magit-status) (evil-define-key 'normal 'global (kbd "<leader> B") 'bookmark-jump)
(define-key evil-normal-state-map (kbd "SPC r") 'regexp-replace) (evil-define-key 'normal 'global (kbd "<leader> g") 'magit-status)
(define-key evil-normal-state-map (kbd "SPC R") 'recentf) (evil-define-key 'normal 'global (kbd "<leader> r") 'replace-regexp)
(define-key evil-normal-state-map (kbd "SPC x") ctl-x-map) (evil-define-key 'normal 'global (kbd "<leader> R") 'recentf)
(define-key evil-normal-state-map (kbd "C-c i") (lambda () (interactive) (find-file user-init-file))) (evil-define-key 'normal 'global (kbd "<leader> x") ctl-x-map)
(define-key evil-normal-state-map (kbd "SPC O") 'ext-file-browser-in-workdir) (evil-define-key 'normal 'global (kbd "<leader> O") 'ext-file-browser-in-workdir)
(define-key evil-normal-state-map (kbd "SPC T") 'ext-terminal-in-workdir) (evil-define-key 'normal 'global (kbd "<leader> T") 'ext-terminal-in-workdir)
(define-key evil-normal-state-map (kbd "SPC A") 'abbrev-mode) (evil-define-key 'normal 'global (kbd "<leader> A") 'abbrev-mode)
(evil-define-key 'normal 'global (kbd "C-c i") (lambda () (interactive) (find-file user-init-file)))
;; end evil ;; end evil
;; Easy find init file ;; Easy find init file