diff options
| author | benj <benj@rse8.com> | 2021-09-07 18:18:45 -0700 |
|---|---|---|
| committer | benj <benj@rse8.com> | 2021-09-07 18:20:21 -0700 |
| commit | 518baa4296035df24d4271a4d188af5db3bd52f7 (patch) | |
| tree | 8eee389062d7da73a6ea7da85a3b802212ddc314 | |
| parent | e9b16c36ee6f3c77d6b1c303826804f2e047d21c (diff) | |
| download | emacs-518baa4296035df24d4271a4d188af5db3bd52f7.tar emacs-518baa4296035df24d4271a4d188af5db3bd52f7.tar.gz emacs-518baa4296035df24d4271a4d188af5db3bd52f7.tar.bz2 emacs-518baa4296035df24d4271a4d188af5db3bd52f7.tar.lz emacs-518baa4296035df24d4271a4d188af5db3bd52f7.tar.xz emacs-518baa4296035df24d4271a4d188af5db3bd52f7.tar.zst emacs-518baa4296035df24d4271a4d188af5db3bd52f7.zip | |
rustic lldb && web-mode lsp changes
| -rw-r--r-- | .gitignore | 4 | ||||
| -rw-r--r-- | init.el | 2 | ||||
| -rw-r--r-- | settings/setup-lsp-mode.el | 1 | ||||
| -rw-r--r-- | settings/setup-rustic-mode.el | 13 | ||||
| -rw-r--r-- | settings/setup-web-mode.el | 3 | ||||
| -rw-r--r-- | transient/history.el | 22 |
6 files changed, 20 insertions, 25 deletions
@@ -18,4 +18,6 @@ rust-playground/ emojis .lsp-session* .dap-breakpoints -network-security.data
\ No newline at end of file +network-security.data +transient/ +pcache @@ -167,7 +167,7 @@ (require 'setup-lsp-mode) (require 'setup-magit) (require 'setup-markdown-mode) -(require 'setup-mu4e) +;;(require 'setup-mu4e) (require 'setup-multiple-cursors) (require 'setup-org-mode) (require 'setup-plz-mode) diff --git a/settings/setup-lsp-mode.el b/settings/setup-lsp-mode.el index e02c6b9..9ebdcaf 100644 --- a/settings/setup-lsp-mode.el +++ b/settings/setup-lsp-mode.el @@ -17,6 +17,7 @@ (add-hook 'lisp-mode-hook #'lsp) (add-hook 'python-mode-hook #'lsp) (add-hook 'rustic-mode #'lsp) +(add-hook 'web-mode-hook #'lsp) (add-hook 'lsp-after-open-hook 'lsp-ui-mode) diff --git a/settings/setup-rustic-mode.el b/settings/setup-rustic-mode.el index 98e1ed6..74ceb29 100644 --- a/settings/setup-rustic-mode.el +++ b/settings/setup-rustic-mode.el @@ -1,3 +1,16 @@ +(require 'dap-lldb) +(require 'dap-gdb-lldb) + +(dap-gdb-lldb-setup) +(dap-register-debug-template + "Rust::LLDB Run Configuration" + (list :type "lldb" + :request "launch" + :name "GDB::Run" + :gdbpath "rust-lldb" + :target nil + :cwd nil)) + (defun rk/rustic-mode-hook () ;; so that run C-c C-c C-r works without having to confirm (setq-local buffer-save-without-query t)) diff --git a/settings/setup-web-mode.el b/settings/setup-web-mode.el index 443c713..e476dc2 100644 --- a/settings/setup-web-mode.el +++ b/settings/setup-web-mode.el @@ -12,6 +12,7 @@ (add-to-list 'auto-mode-alist '("\\.mustache\\'" . web-mode)) (add-to-list 'auto-mode-alist '("\\.tpl\\'" . web-mode)) (add-to-list 'auto-mode-alist '("\\.eex\\'" . web-mode)) +(add-to-list 'auto-mode-alist '("\\.svelte\\'" . web-mode)) (set-face-attribute 'web-mode-doctype-face nil :foreground "misty rose") @@ -22,7 +23,7 @@ (set-face-attribute 'web-mode-block-delimiter-face nil :foreground "medium aquamarine") (setq web-mode-engines-alist - '(("jinja" . "\\.html\\'"))) + '(("django" . "\\.html\\'"))) (defun indent-offset () "Hooks for web mode." diff --git a/transient/history.el b/transient/history.el deleted file mode 100644 index 23b9476..0000000 --- a/transient/history.el +++ /dev/null @@ -1,22 +0,0 @@ -((magit-branch nil) - (magit-commit nil) - (magit-diff - ("--no-ext-diff" "--stat")) - (magit-dispatch nil) - (magit-file-dispatch nil) - (magit-gitignore nil) - (magit-log - ("-n256" "--graph" "--decorate") - ("-n256" "--graph" "--color" "--decorate")) - (magit-merge nil) - (magit-pull nil) - (magit-push nil) - (magit-rebase nil) - (magit-reset nil) - (magit-revert - ("--edit")) - (magit-revision-history "ORIG_HEAD") - (magit-run nil) - (magit-show-refs nil) - (magit-stash nil) - (magit-tag nil)) |