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

Merge previous changes

Browse Source
This commit is contained in:
James Dixon 2025-05-17 20:39:42 -04:00
parent 542a7f44a5
commit ee1098a843
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -377,6 +377,7 @@
;; Running external stuff ;; Running external stuff
(evil-define-key 'normal 'global (kbd "<leader> c") 'compile) (evil-define-key 'normal 'global (kbd "<leader> c") 'compile)
(evil-define-key 'normal 'global (kbd "<leader> r") 'recompile)
(evil-define-key 'normal 'global (kbd "<leader> !") 'shell-command) (evil-define-key 'normal 'global (kbd "<leader> !") 'shell-command)
(evil-define-key 'normal 'global (kbd "<leader> &") 'async-shell-command) (evil-define-key 'normal 'global (kbd "<leader> &") 'async-shell-command)
(evil-define-key 'normal 'global (kbd "<leader> g") 'magit-status) (evil-define-key 'normal 'global (kbd "<leader> g") 'magit-status)
@ -389,15 +390,14 @@
(evil-define-key 'normal 'global (kbd "C-c i") (lambda () (interactive) (find-file user-init-file))) (evil-define-key 'normal 'global (kbd "C-c i") (lambda () (interactive) (find-file user-init-file)))
(evil-define-key 'normal 'global (kbd "<leader> O") 'ext-file-browser-in-workdir) (evil-define-key 'normal 'global (kbd "<leader> O") 'ext-file-browser-in-workdir)
(evil-define-key 'normal 'global (kbd "<leader> T") 'x-open-in-terminal) (evil-define-key 'normal 'global (kbd "<leader> T") 'ext-terminal-in-workdir)
(evil-define-key 'normal 'global (kbd "<leader> x") ctl-x-map) (evil-define-key 'normal 'global (kbd "<leader> x") ctl-x-map)
;; Extra packages ;; Extra packages
(evil-define-key 'normal 'global (kbd "<leader> s") 'yas-insert-snippet) (evil-define-key 'normal 'global (kbd "<leader> s") 'yas-insert-snippet)
(evil-define-key 'normal 'global (kbd "<leader> F") 'format-all-region-or-buffer) (evil-define-key 'normal 'global (kbd "<leader> F") 'format-all-region-or-buffer)
;; Custom Ex commands ;; Custom Ex commands
(evil-ex-define-cmd "Fo[rmat]" 'format-all-region-or-buffer) (evil-ex-define-cmd "Format" 'format-all-region-or-buffer)
;; end evil ;; end evil
(global-set-key (kbd "C-c C-y") 'yank-from-kill-ring) (global-set-key (kbd "C-c C-y") 'yank-from-kill-ring)
@ -451,6 +451,12 @@
;; (load-theme 'doom-badger t)) ;; (load-theme 'doom-badger t))
;; (load-theme 'doom-ir-black t)) ;; (load-theme 'doom-ir-black t))
;; Doom Modeline - much easier on the eyes
;; https://github.com/seagle0128/doom-modeline
(use-package doom-modeline
:straight t
:hook (after-init . doom-modeline-mode))
;; Highlights TODOs and other configured keywords in buffer ;; Highlights TODOs and other configured keywords in buffer
;; https://github.com/tarsius/hl-todo ;; https://github.com/tarsius/hl-todo
(use-package hl-todo (use-package hl-todo
@ -609,8 +615,7 @@
;; Mode for working with emojis ;; Mode for working with emojis
;; https://github.com/iqbalansari/emacs-emojify ;; https://github.com/iqbalansari/emacs-emojify
(use-package emojify (use-package emojify
:straight t :straight t)
:hook (after-init . global-emojify-mode))
;; Abbrevs and Snippets ;; Abbrevs and Snippets
@ -851,7 +856,7 @@
(interactive) (interactive)
(cond (cond
((eq system-type 'windows-nt) ((eq system-type 'windows-nt)
((string-equal xah-fly-mswin-terminal "wt") (shell-command (format "wt -d \"%s\"" default-directory)))) (shell-command (concat "wt -d " (shell-quote-argument (expand-file-name default-directory)))))
((eq system-type 'darwin) ((eq system-type 'darwin)
(shell-command (concat "open -a iTerm " (shell-quote-argument (expand-file-name default-directory))))) (shell-command (concat "open -a iTerm " (shell-quote-argument (expand-file-name default-directory)))))
((eq system-type 'gnu/linux) ((eq system-type 'gnu/linux)