diff options
| author | benj <benj@rse8.com> | 2021-06-24 20:48:12 -0700 |
|---|---|---|
| committer | benj <benj@rse8.com> | 2021-06-24 20:48:12 -0700 |
| commit | d1bb7f7cc285c4446474c3efcc38943cd93462f3 (patch) | |
| tree | cb6b10cc8091a2a56e7d1081045bb99b4833f62b | |
| parent | 5adcf652cd2724f830d20eba3eafbd95c0e7a2a7 (diff) | |
| download | emacs-d1bb7f7cc285c4446474c3efcc38943cd93462f3.tar emacs-d1bb7f7cc285c4446474c3efcc38943cd93462f3.tar.gz emacs-d1bb7f7cc285c4446474c3efcc38943cd93462f3.tar.bz2 emacs-d1bb7f7cc285c4446474c3efcc38943cd93462f3.tar.lz emacs-d1bb7f7cc285c4446474c3efcc38943cd93462f3.tar.xz emacs-d1bb7f7cc285c4446474c3efcc38943cd93462f3.tar.zst emacs-d1bb7f7cc285c4446474c3efcc38943cd93462f3.zip | |
asm-mode config -> nasm-mode && web mode should use jinja
| -rw-r--r-- | init.el | 1 | ||||
| -rw-r--r-- | settings/setup-asm-mode.el | 7 | ||||
| -rw-r--r-- | settings/setup-web-mode.el | 8 | ||||
| -rw-r--r-- | transient/history.el | 3 |
4 files changed, 14 insertions, 5 deletions
@@ -147,6 +147,7 @@ (add-to-list 'exec-path "/usr/local/bin") (require 'setup-ace-window-mode) +(require 'setup-asm-mode) (require 'setup-auto-insert-mode) (require 'setup-avy-mode) (require 'setup-c++-mode) diff --git a/settings/setup-asm-mode.el b/settings/setup-asm-mode.el new file mode 100644 index 0000000..4bae5cc --- /dev/null +++ b/settings/setup-asm-mode.el @@ -0,0 +1,7 @@ +;;; Code: +(require 'nasm-mode) +(add-to-list 'auto-mode-alist '("\\.asm\\'" . nasm-mode)) + + +(provide 'setup-asm-mode) +;;; setup-asm-mode.el ends here diff --git a/settings/setup-web-mode.el b/settings/setup-web-mode.el index b55e93b..9eae84d 100644 --- a/settings/setup-web-mode.el +++ b/settings/setup-web-mode.el @@ -23,7 +23,7 @@ (set-face-attribute 'web-mode-block-delimiter-face nil :foreground "medium aquamarine") (setq web-mode-engines-alist - '(("handlebars" . "\\.hbs'"))) + '(("jinja" . "\\.html\\'"))) (defun indent-offset () "Hooks for web mode." @@ -33,10 +33,10 @@ (setq web-mode-style-padding 2) (setq web-mode-script-padding 2)) -(eval-after-load 'web-mode - '(add-hook 'web-mode-hook #'add-node-modules-path)) +;; (eval-after-load 'web-mode +;; '(add-hook 'web-mode-hook #'add-node-modules-path)) (add-hook 'web-mode-hook 'indent-offset) -(add-hook 'web-mode-hook 'prettier-js-mode) +;(add-hook 'web-mode-hook 'prettier-js-mode) (provide 'setup-web-mode) diff --git a/transient/history.el b/transient/history.el index e911e11..23b9476 100644 --- a/transient/history.el +++ b/transient/history.el @@ -6,7 +6,8 @@ (magit-file-dispatch nil) (magit-gitignore nil) (magit-log - ("-n256" "--graph" "--decorate")) + ("-n256" "--graph" "--decorate") + ("-n256" "--graph" "--color" "--decorate")) (magit-merge nil) (magit-pull nil) (magit-push nil) |