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

Fix tangling

Browse Source
This commit is contained in:
James Dixon 2025-05-24 12:58:19 -04:00
parent 47c3ccca63
commit 52089c3306
2 changed files with 24 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -133,6 +133,8 @@
;;; Minor Mode Hooks ;;; Minor Mode Hooks
(add-hook 'prog-mode #'clean-all-whitespace-mode) (add-hook 'prog-mode #'clean-all-whitespace-mode)
(add-hook 'org-mode #'clean-all-whitespace-mode)
(add-hook 'emacs-lisp-mode #'check-parens-save-mode) (add-hook 'emacs-lisp-mode #'check-parens-save-mode)
(add-hook 'emacs-lisp-mode #'outline-minor-mode) (add-hook 'emacs-lisp-mode #'outline-minor-mode)
@ -415,6 +417,7 @@
;;; Regular Keybinds ;;; Regular Keybinds
(global-set-key (kbd "C-c i") (lambda () (interactive) (find-file user-init-file))) (global-set-key (kbd "C-c i") (lambda () (interactive) (find-file user-init-file)))
(global-set-key (kbd "C-c o") (lambda () (interactive) (find-file (concat user-emacs-directory "/init.org"))))
(global-set-key (kbd "C-c d") (lambda () (interactive) (find-file (getenv "DOTFILES")))) (global-set-key (kbd "C-c d") (lambda () (interactive) (find-file (getenv "DOTFILES"))))
(global-set-key (kbd "C-c g") (lambda () (interactive) (find-file (concat (getenv "DOTFILES") "/config/emacs/.config/emacs/init.el")))) (global-set-key (kbd "C-c g") (lambda () (interactive) (find-file (concat (getenv "DOTFILES") "/config/emacs/.config/emacs/init.el"))))

27
config/emacs/.config/emacs/init.org
View File

@ -193,6 +193,8 @@ Cleaning up whitespace and checking balanced parens are something that should be
;;; Minor Mode Hooks ;;; Minor Mode Hooks
(add-hook 'prog-mode #'clean-all-whitespace-mode) (add-hook 'prog-mode #'clean-all-whitespace-mode)
(add-hook 'org-mode #'clean-all-whitespace-mode)
(add-hook 'emacs-lisp-mode #'check-parens-save-mode) (add-hook 'emacs-lisp-mode #'check-parens-save-mode)
(add-hook 'emacs-lisp-mode #'outline-minor-mode) (add-hook 'emacs-lisp-mode #'outline-minor-mode)
#+end_src #+end_src
@ -512,6 +514,7 @@ Set settings as well as load EVIL and complementary packages.
;;; Regular Keybinds ;;; Regular Keybinds
(global-set-key (kbd "C-c i") (lambda () (interactive) (find-file user-init-file))) (global-set-key (kbd "C-c i") (lambda () (interactive) (find-file user-init-file)))
(global-set-key (kbd "C-c o") (lambda () (interactive) (find-file (concat user-emacs-directory "/init.org"))))
(global-set-key (kbd "C-c d") (lambda () (interactive) (find-file (getenv "DOTFILES")))) (global-set-key (kbd "C-c d") (lambda () (interactive) (find-file (getenv "DOTFILES"))))
(global-set-key (kbd "C-c g") (lambda () (interactive) (find-file (concat (getenv "DOTFILES") "/config/emacs/.config/emacs/init.el")))) (global-set-key (kbd "C-c g") (lambda () (interactive) (find-file (concat (getenv "DOTFILES") "/config/emacs/.config/emacs/init.el"))))
#+end_src #+end_src
@ -555,7 +558,7 @@ Emacs directory editor
*** Markdown Mode *** Markdown Mode
#+begin_src emacs-lisp :tangle yes #+begin_src emacs-lisp :tangle "init.el"
;;; Markdown support for emacs ;;; Markdown support for emacs
;; https://github.com/jrblevin/markdown-mode ;; https://github.com/jrblevin/markdown-mode
(use-package markdown-mode (use-package markdown-mode
@ -569,7 +572,7 @@ Emacs directory editor
*** Magit *** Magit
#+begin_src emacs-lisp :tangle yes #+begin_src emacs-lisp :tangle "init.el"
;; Magit (intuitive git interface) ;; Magit (intuitive git interface)
;; https://magit.vc/ ;; https://magit.vc/
(use-package magit (use-package magit
@ -578,7 +581,7 @@ Emacs directory editor
*** Theme and Highlight *** Theme and Highlight
#+begin_src emacs-lisp :tangle yes #+begin_src emacs-lisp :tangle "init.el"
;; https://github.com/doomemacs/themes ;; https://github.com/doomemacs/themes
(use-package doom-themes (use-package doom-themes
:straight t :straight t
@ -630,7 +633,7 @@ Emacs directory editor
*** Completion, Menu and Minibuffer *** Completion, Menu and Minibuffer
#+begin_src emacs-lisp :tangle yes #+begin_src emacs-lisp :tangle "init.el"
;;; Mini-buffer improvements (fido, orderless, marginalia) ;;; Mini-buffer improvements (fido, orderless, marginalia)
;; Let's try [icomplete / fido / ido] mode for a while. ;; Let's try [icomplete / fido / ido] mode for a while.
(icomplete-vertical-mode) (icomplete-vertical-mode)
@ -673,7 +676,7 @@ Emacs directory editor
*** Syntax Checking and Formatting *** Syntax Checking and Formatting
#+begin_src emacs-lisp :tangle yes #+begin_src emacs-lisp :tangle "init.el"
;; Syntax checking ;; Syntax checking
;; https://www.flycheck.org/en/latest/languages.html ;; https://www.flycheck.org/en/latest/languages.html
;; https://github.com/flycheck/flycheck ;; https://github.com/flycheck/flycheck
@ -695,7 +698,7 @@ Emacs directory editor
*** Abbrevs and Snippets *** Abbrevs and Snippets
#+begin_src emacs-lisp :tangle yes #+begin_src emacs-lisp :tangle "init.el"
;; Abbrevs and Snippets ;; Abbrevs and Snippets
;; URLs ;; URLs
(define-abbrev global-abbrev-table "mygh" "https://github.com/lemonase") (define-abbrev global-abbrev-table "mygh" "https://github.com/lemonase")
@ -729,7 +732,7 @@ Emacs directory editor
*** Extra Language Modes *** Extra Language Modes
#+begin_src emacs-lisp :tangle yes #+begin_src emacs-lisp :tangle "init.el"
;; TODO: install/configure eglot lsp ;; TODO: install/configure eglot lsp
;;; Extra Language Modes ;;; Extra Language Modes
@ -753,7 +756,7 @@ Emacs directory editor
*** Additional Language Settings *** Additional Language Settings
#+begin_src emacs-lisp :tangle yes #+begin_src emacs-lisp :tangle "init.el"
;; JavaScript ;; JavaScript
(use-package js (use-package js
:defer t :defer t
@ -799,7 +802,7 @@ Emacs directory editor
*** Local Environment Variables *** Local Environment Variables
#+begin_src emacs-lisp :tangle yes #+begin_src emacs-lisp :tangle "init.el"
;; Local Environment File ;; Local Environment File
(use-package load-env-vars (use-package load-env-vars
:straight t) :straight t)
@ -812,7 +815,7 @@ Emacs directory editor
*** LLM Support *** LLM Support
#+begin_src emacs-lisp :tangle yes #+begin_src emacs-lisp :tangle "init.el"
;; LLM support (must configure with api keys) ;; LLM support (must configure with api keys)
;; (use-package gptel ;; (use-package gptel
;; :straight t) ;; :straight t)
@ -825,7 +828,7 @@ Emacs directory editor
*** Windows / Win32 *** Windows / Win32
#+begin_src emacs-lisp :tangle yes #+begin_src emacs-lisp :tangle "init.el"
;; for Win32 ;; for Win32
(when (eq system-type 'windows-nt) (when (eq system-type 'windows-nt)
;; Powershell ;; Powershell
@ -891,12 +894,12 @@ Emacs directory editor
(let ((process-connection-type nil)) (start-process "" nil "x-terminal-emulator" (concat "--working-directory=" default-directory)))) (let ((process-connection-type nil)) (start-process "" nil "x-terminal-emulator" (concat "--working-directory=" default-directory))))
((eq system-type 'berkeley-unix) ((eq system-type 'berkeley-unix)
(let ((process-connection-type nil)) (start-process "" nil "x-terminal-emulator" (concat "--working-directory=" default-directory)))))) (let ((process-connection-type nil)) (start-process "" nil "x-terminal-emulator" (concat "--working-directory=" default-directory))))))
#+end_src #+end_src
*** Auto Reload + Save / Tangle for Org *** Auto Reload + Save / Tangle for Org
#+begin_src emacs-lisp :tangle "init.el" #+begin_src emacs-lisp :tangle "init.el"
;;; Buffer local variables - ask to save/tangle. ;;; Buffer local variables - ask to save/tangle.
;; Local Variables: ;; Local Variables:
;; eval: (add-hook 'after-save-hook (lambda ()(if (y-or-n-p "Reload?")(load-file user-init-file))) nil t) ;; eval: (add-hook 'after-save-hook (lambda ()(if (y-or-n-p "Reload?")(load-file user-init-file))) nil t)