From 8958787606be8c18d607cbc840157dc57b42ab80 Mon Sep 17 00:00:00 2001 From: Thomas von Dein Date: Wed, 1 Nov 2023 13:14:09 +0100 Subject: [PATCH] added lua support, disabled vertico jump root using /, was a mess --- customize.el | 2 +- init.el | 2 ++ lisp/init-avy.el | 5 ++++- lisp/init-lua.el | 11 +++++++++++ lisp/init-smarter-than-emacs.el | 3 ++- 5 files changed, 20 insertions(+), 3 deletions(-) create mode 100644 lisp/init-lua.el diff --git a/customize.el b/customize.el index 621cacb..134a08b 100644 --- a/customize.el +++ b/customize.el @@ -11,7 +11,7 @@ '("7f1d414afda803f3244c6fb4c2c64bea44dac040ed3731ec9d75275b9e831fe5" default)) '(magit-todos-insert-after '(bottom) nil nil "Changed by setter of obsolete option `magit-todos-insert-at'") '(package-selected-packages - '(sqlite3 dmacro emms package-lint blamer howm tiny tramp dictcc beacon which-key goto-last-change browse-kill-ring fringe-current-line swiper smex undo-tree fic-mode cmake-mode yaml-mode windresize web-mode use-package tablist solarized-theme smartparens rust-mode projectile persistent-scratch org-bullets markdown-mode magit iedit ibuffer-vc ibuffer-tramp hydra htmlize highlight-indentation go-mode eyebrowse elmacro dumb-jump dired-ranger dired-k dired-filter default-text-scale change-inner buffer-move)) + '(avy sqlite3 dmacro emms package-lint blamer howm tiny tramp dictcc beacon which-key goto-last-change browse-kill-ring fringe-current-line swiper smex undo-tree fic-mode cmake-mode yaml-mode windresize web-mode use-package tablist solarized-theme smartparens rust-mode projectile persistent-scratch org-bullets markdown-mode magit iedit ibuffer-vc ibuffer-tramp hydra htmlize highlight-indentation go-mode eyebrowse elmacro dumb-jump dired-ranger dired-k dired-filter default-text-scale change-inner buffer-move)) '(safe-local-variable-values '((ruby-indent-level 4))) '(warning-suppress-types '((comp)))) (custom-set-faces diff --git a/init.el b/init.el index 0b2139c..5df382c 100644 --- a/init.el +++ b/init.el @@ -111,6 +111,7 @@ (require 'init-shellscript) (require 'init-perl) (require 'init-go) +(require 'init-lua) (require 'init-sgml) (require 'init-webmode) (require 'init-cisco) @@ -158,6 +159,7 @@ (require 'init-printing) (require 'init-smarter-than-emacs) (require 'init-marginalia) +(require 'init-avy) (require 'init-ui) diff --git a/lisp/init-avy.el b/lisp/init-avy.el index ae1cc4d..79277cb 100644 --- a/lisp/init-avy.el +++ b/lisp/init-avy.el @@ -17,7 +17,10 @@ ;; Home row only (the default). (setq avy-keys '(?a ?s ?d ?f ?j ?k ?l)) - (setq avy-background t)) + (setq avy-background t) + + ;; (global-set-key (kbd "C-j") 'avy-goto-word-1) + ) (provide 'init-avy) diff --git a/lisp/init-lua.el b/lisp/init-lua.el new file mode 100644 index 0000000..14a6dc0 --- /dev/null +++ b/lisp/init-lua.el @@ -0,0 +1,11 @@ + +(use-package lua-mode + :mode "\\.lua\\'" + + :config + (setq tab-width 4 + lua-indent-level 4 + lua-indent-string-contents t)) + +(provide 'init-lua) +;;; init-lua.el ends here diff --git a/lisp/init-smarter-than-emacs.el b/lisp/init-smarter-than-emacs.el index 8f2f4f4..8a45452 100644 --- a/lisp/init-smarter-than-emacs.el +++ b/lisp/init-smarter-than-emacs.el @@ -90,7 +90,8 @@ a remote file anytime and from everywhere I am by just entering :" :bind (:map vertico-map ("~" . tvd-vertico-jump-home) (":" . tvd-vertico-jump-ssh) - ("/" . tvd-vertico-jump-root) ;; experimental, not sure wether to keep this + ;;; ("/" . tvd-vertico-jump-root) + ;; experimental, not sure wether to keep this ("" . tvd-vertico-del-dir) ("RET" . #'vertico-directory-enter) ;; experimental, pressing tab on a match doesn't