From d506d713ca3b02ac5e6e10c4bb273fdc97df9640 Mon Sep 17 00:00:00 2001 From: caem Date: Tue, 18 Mar 2025 23:00:40 +0100 Subject: [PATCH] emacs: Clean up modes --- .../caem/development/emacs/emacs.d/modes/c-mode.el | 4 ++++ .../caem/development/emacs/emacs.d/modes/guile-mode.el | 2 -- .../home/caem/development/emacs/emacs.d/modes/init.el | 7 ++----- .../development/emacs/emacs.d/modes/lisp/elisp-mode.el | 4 ++++ .../emacs.d/modes/{scheme-mode.el => lisp/init.el} | 10 ++++------ .../emacs/emacs.d/modes/lisp/scheme-mode.el | 4 ++++ 6 files changed, 18 insertions(+), 13 deletions(-) create mode 100644 modules/home/caem/development/emacs/emacs.d/modes/c-mode.el delete mode 100644 modules/home/caem/development/emacs/emacs.d/modes/guile-mode.el create mode 100644 modules/home/caem/development/emacs/emacs.d/modes/lisp/elisp-mode.el rename modules/home/caem/development/emacs/emacs.d/modes/{scheme-mode.el => lisp/init.el} (52%) create mode 100644 modules/home/caem/development/emacs/emacs.d/modes/lisp/scheme-mode.el diff --git a/modules/home/caem/development/emacs/emacs.d/modes/c-mode.el b/modules/home/caem/development/emacs/emacs.d/modes/c-mode.el new file mode 100644 index 0000000..8a0cb2e --- /dev/null +++ b/modules/home/caem/development/emacs/emacs.d/modes/c-mode.el @@ -0,0 +1,4 @@ +(add-hook 'c-mode-hook + (lambda () + (setq indent-tabs-mode nil) + (setq tab-width 4))) diff --git a/modules/home/caem/development/emacs/emacs.d/modes/guile-mode.el b/modules/home/caem/development/emacs/emacs.d/modes/guile-mode.el deleted file mode 100644 index fca61ae..0000000 --- a/modules/home/caem/development/emacs/emacs.d/modes/guile-mode.el +++ /dev/null @@ -1,2 +0,0 @@ -;;(use-package geiser-guile -;; :ensure t) diff --git a/modules/home/caem/development/emacs/emacs.d/modes/init.el b/modules/home/caem/development/emacs/emacs.d/modes/init.el index 65d36c7..57407f7 100644 --- a/modules/home/caem/development/emacs/emacs.d/modes/init.el +++ b/modules/home/caem/development/emacs/emacs.d/modes/init.el @@ -1,6 +1,3 @@ -;; Global configuration for all modes -(setq-default indent-tabs-mode nil) - -;; Load each enabled mode (rei/load "nix-mode.el") -(rei/load "scheme-mode.el") +(rei/load "c-mode.el") +(rei/load "lisp") diff --git a/modules/home/caem/development/emacs/emacs.d/modes/lisp/elisp-mode.el b/modules/home/caem/development/emacs/emacs.d/modes/lisp/elisp-mode.el new file mode 100644 index 0000000..0585081 --- /dev/null +++ b/modules/home/caem/development/emacs/emacs.d/modes/lisp/elisp-mode.el @@ -0,0 +1,4 @@ +(add-hook 'emacs-lisp-mode-hook + (lambda () + (setq indent-tabs-mode nil) + (setq tab-width 2))) diff --git a/modules/home/caem/development/emacs/emacs.d/modes/scheme-mode.el b/modules/home/caem/development/emacs/emacs.d/modes/lisp/init.el similarity index 52% rename from modules/home/caem/development/emacs/emacs.d/modes/scheme-mode.el rename to modules/home/caem/development/emacs/emacs.d/modes/lisp/init.el index 7b5f929..24a09c2 100644 --- a/modules/home/caem/development/emacs/emacs.d/modes/scheme-mode.el +++ b/modules/home/caem/development/emacs/emacs.d/modes/lisp/init.el @@ -1,13 +1,11 @@ -(add-hook 'scheme-mode-hook - (lambda () - (setq indent-tabs-mode nil) - (setq tab-wdith 2))) - (use-package paredit :ensure t :hook ((scheme-mode . enable-paredit-mode) - (geiser-mode . enable-paredit-mode)) + (emacs-lisp-mode . enable-paredit-mode)) :config (show-paren-mode 1) (setq show-paren-style 'parenthesis)) + +(rei/load "scheme-mode.el") +(rei/load "elisp-mode.el") diff --git a/modules/home/caem/development/emacs/emacs.d/modes/lisp/scheme-mode.el b/modules/home/caem/development/emacs/emacs.d/modes/lisp/scheme-mode.el new file mode 100644 index 0000000..9d12381 --- /dev/null +++ b/modules/home/caem/development/emacs/emacs.d/modes/lisp/scheme-mode.el @@ -0,0 +1,4 @@ +(add-hook 'scheme-mode-hook + (lambda () + (setq indent-tabs-mode nil) + (setq tab-wdith 2)))