diff --git a/config/init.org b/config/init.org index 8b4ce66..0a65d1c 100644 --- a/config/init.org +++ b/config/init.org @@ -22,6 +22,16 @@ (setq make-backup-files nil) #+end_src +** Enable Real Auto Save + +#+begin_src emacs-lisp + (use-package real-auto-save + :ensure t + :config + (setq real-auto-save-interval 1) + (add-hook 'prog-mode-hook 'real-auto-save-mode)) +#+end_src + ** No Scratch On Open #+begin_src emacs-lisp @@ -58,12 +68,25 @@ (tool-bar-mode -1) #+end_src +** Line Numbers + +#+begin_src emacs-lisp + (global-display-line-numbers-mode t) + (setq display-line-numbers-type 'relative) + (dolist (mode '(term-mode-hook + vterm-mode-hook + shell-mode-hook + eshell-mode-hook + treemacs-mode-hook)) + (add-hook mode (lambda () (display-line-numbers-mode 0)))) +#+end_src + ** Vim-Style Scrolling #+begin_src emacs-lisp (setq scroll-step 3 - scroll-margin 3 - scroll-conservatively 9999) + scroll-margin 3 + scroll-conservatively 9999) #+end_src ** System-Specific Settings @@ -74,7 +97,7 @@ (cond ((eq system-type 'darwin) - (setq default-frame-alist '((font . "Maple Mono NF-16")))) + (setq default-frame-alist '((font . "Maple Mono NF-14")))) ((eq system-type 'gnu/linux) (setq default-frame-alist '((font . "Maple Mono NF-12"))))) #+end_src @@ -184,6 +207,7 @@ scala toml typescript + vue yaml )) (setq treesit-font-lock-level 4)) @@ -218,6 +242,23 @@ (eglot-format-buffer))) (add-hook 'before-save-hook #'my/eglot-format-buffer-on-save) + + (use-package web-mode + :ensure t + :mode + (("\\.phtml\\'" . web-mode) + ("\\.php\\'" . web-mode) + ("\\.tpl\\'" . web-mode) + ("\\.[agj]sp\\'" . web-mode) + ("\\.as[cp]x\\'" . web-mode) + ("\\.erb\\'" . web-mode) + ("\\.mustache\\'" . web-mode) + ("\\.djhtml\\'" . web-mode) + ("\\.vue\\'" . web-mode))) + + (use-package vue-mode + :config + (setq mmm-submode-decoration-level 2)) #+end_src ** Corfu Completions @@ -352,22 +393,22 @@ :config (global-tab-line-mode 1) (recentf-mode 1) - (setq tab-line-separator "")) + (setq tab-line-separator "") + (setq tab-line-new-button-show nil) + (setq tab-line-close-button-show nil) - (setq tab-line-new-button-show nil) - (setq tab-line-close-button-show nil) - (defvar my/tab-height 24) - (defvar my/tab-left (powerline-wave-right 'tab-line nil my/tab-height)) - (defvar my/tab-right (powerline-wave-left nil 'tab-line my/tab-height)) + (defvar my/tab-height 24) + (defvar my/tab-left (powerline-wave-right 'tab-line nil my/tab-height)) + (defvar my/tab-right (powerline-wave-left nil 'tab-line my/tab-height)) - (defun my/tab-line-tab-name-buffer (buffer &optional _buffers) - (powerline-render (list my/tab-left - (format "%s" (buffer-name buffer)) - my/tab-right))) + (defun my/tab-line-tab-name-buffer (buffer &optional _buffers) + (powerline-render (list my/tab-left + (format "%s" (buffer-name buffer)) + my/tab-right))) - (setq tab-line-tab-name-function #'my/tab-line-tab-name-buffer) + (setq tab-line-tab-name-function #'my/tab-line-tab-name-buffer) - (global-set-key (kbd "C-S-") 'tab-line-switch-to-prev-tab) - (global-set-key (kbd "C-") 'tab-line-switch-to-next-tab) - (global-set-key (kbd "C-S-t") 'recentf-open-most-recent-file) + (global-set-key (kbd "C-S-") 'tab-line-switch-to-prev-tab) + (global-set-key (kbd "C-") 'tab-line-switch-to-next-tab) + (global-set-key (kbd "C-S-t") 'recentf-open-most-recent-file)) #+end_src