diff options
| -rw-r--r-- | config.el | 59 | ||||
| -rw-r--r-- | config.org | 82 | ||||
| -rw-r--r-- | custom-vars.el | 4 |
3 files changed, 130 insertions, 15 deletions
@@ -577,6 +577,11 @@ (setq flycheck-rust-check-tests nil) (add-hook 'flycheck-mode-hook #'flycheck-rust-setup)) +(use-package flycheck-python-ruff + :straight (:host github :repo "v4n6/flycheck-python-ruff") + :ensure t + :hook ((python-mode python-ts-mode) . flycheck-python-ruff-setup)) + ;; (use-package flyover ;; :ensure t ;; :hook (flycheck-mode-hook . flyover-mode)) @@ -1305,23 +1310,49 @@ completion-category-overrides '((file (styles partial-completion))))) ;; Customi :config (envrc-global-mode)) +;; (use-package python-mode +;; :ensure t +;; :mode "\\.py\\'" +;; :hook (python-mode . eglot-ensure) +;; :config +;; (with-eval-after-load 'eglot +;; (add-to-list 'eglot-server-programs +;; '(python-mode . ("pyright-langserver" "--stdio"))))) + +;; (use-package python-black +;; :ensure t +;; :demand t +;; :after python) + (use-package python-mode :ensure t :mode "\\.py\\'" :hook (python-mode . eglot-ensure) :config (with-eval-after-load 'eglot + (setq eglot-server-programs + (assoc-delete-all 'python-mode eglot-server-programs)) + (setq eglot-server-programs + (assoc-delete-all 'python-ts-mode eglot-server-programs)) (add-to-list 'eglot-server-programs - '(python-mode . ("pyright-langserver" "--stdio"))))) + '(python-mode . ("ty" "lsp"))))) -(use-package python-black +(use-package pyvenv :ensure t - :demand t - :after python) + :config + (setq pyvenv-mode-line-indicator '(pyvenv-virtual-env-name + (" [venv:" pyvenv-virtual-env-name "] "))) + (add-hook 'python-mode-hook + (lambda () + (pyvenv-mode 1)))) + +(use-package ruff-format + :ensure t + :hook (python-mode . ruff-format-on-save-mode)) (use-package elm-mode :ensure t - :mode "\\.py\\'" + :mode "\\.elm\\'" :hook (elm-mode . eglot-ensure) :config (with-eval-after-load 'eglot-server-programs @@ -1412,6 +1443,10 @@ completion-category-overrides '((file (styles partial-completion))))) ;; Customi (add-hook 'sh-mode-hook #'sh-mode-setup) (add-hook 'bash-ts-mode-hook #'sh-mode-setup)) +(use-package jinja2-mode + :ensure t + :defer t) + (use-package vterm :ensure t :config @@ -1667,9 +1702,8 @@ completion-category-overrides '((file (styles partial-completion))))) ;; Customi (use-package evil-org :ensure t - :straight t :after org - :hook (org-mode . (lambda () evil-org-mode)) + :hook (org-mode . evil-org-mode) :config (require 'evil-org-agenda) (evil-org-agenda-set-keys)) @@ -2355,6 +2389,17 @@ completion-category-overrides '((file (styles partial-completion))))) ;; Customi "ll" '(org-insert-link :wk "Link various things") "t" '(org-todo :wk "TODO")) +(evil-define-key 'normal org-mode-map (kbd "RET") 'org-open-at-point) + +;; jinja2-mode-map +(my-leader + :keymaps 'jinja2-mode-map + "m" '(:wk "insert" :ignore) + "mv" '(jinja2-insert-var :wk "var") + "mt" '(jinja2-insert-tag :wk "tag") + "mc" '(jinja2-insert-comment :wk "comment") + + "mf" '(fill-paragraph :wk "fill paragraph")) (with-eval-after-load 'denote-menu (general-def 'normal denote-menu-mode-map @@ -689,6 +689,15 @@ Not necessary but an eyecandy to look at! (add-hook 'flycheck-mode-hook #'flycheck-rust-setup)) #+end_src +** flycheck-ruff + +#+begin_src emacs-lisp +(use-package flycheck-python-ruff + :straight (:host github :repo "v4n6/flycheck-python-ruff") + :ensure t + :hook ((python-mode python-ts-mode) . flycheck-python-ruff-setup)) +#+end_src + ** flyover #+begin_src emacs-lisp @@ -1548,7 +1557,6 @@ completion-category-overrides '((file (styles partial-completion))))) ;; Customi * programming - ** eglot #+begin_src emacs-lisp @@ -1673,19 +1681,54 @@ for automatic flake devshells. Because I have to and not want to. #+begin_src emacs-lisp +;; (use-package python-mode +;; :ensure t +;; :mode "\\.py\\'" +;; :hook (python-mode . eglot-ensure) +;; :config +;; (with-eval-after-load 'eglot +;; (add-to-list 'eglot-server-programs +;; '(python-mode . ("pyright-langserver" "--stdio"))))) + +;; (use-package python-black +;; :ensure t +;; :demand t +;; :after python) + (use-package python-mode :ensure t :mode "\\.py\\'" :hook (python-mode . eglot-ensure) :config (with-eval-after-load 'eglot + (setq eglot-server-programs + (assoc-delete-all 'python-mode eglot-server-programs)) + (setq eglot-server-programs + (assoc-delete-all 'python-ts-mode eglot-server-programs)) (add-to-list 'eglot-server-programs - '(python-mode . ("pyright-langserver" "--stdio"))))) + '(python-mode . ("ty" "lsp"))))) + +#+end_src -(use-package python-black +*** pet + +#+begin_src emacs-lisp +(use-package pyvenv :ensure t - :demand t - :after python) + :config + (setq pyvenv-mode-line-indicator '(pyvenv-virtual-env-name + (" [venv:" pyvenv-virtual-env-name "] "))) + (add-hook 'python-mode-hook + (lambda () + (pyvenv-mode 1)))) +#+end_src + +*** ruff-formatter + +#+begin_src emacs-lisp +(use-package ruff-format + :ensure t + :hook (python-mode . ruff-format-on-save-mode)) #+end_src ** elm-mode @@ -1693,7 +1736,7 @@ Because I have to and not want to. #+begin_src emacs-lisp (use-package elm-mode :ensure t - :mode "\\.py\\'" + :mode "\\.elm\\'" :hook (elm-mode . eglot-ensure) :config (with-eval-after-load 'eglot-server-programs @@ -1819,6 +1862,14 @@ ily <3. (add-hook 'bash-ts-mode-hook #'sh-mode-setup)) #+end_src +** jinja-mode + +#+begin_src emacs-lisp +(use-package jinja2-mode + :ensure t + :defer t) +#+end_src + * vterm #+begin_src emacs-lisp @@ -2165,9 +2216,8 @@ ily <3. #+begin_src emacs-lisp (use-package evil-org :ensure t - :straight t :after org - :hook (org-mode . (lambda () evil-org-mode)) + :hook (org-mode . evil-org-mode) :config (require 'evil-org-agenda) (evil-org-agenda-set-keys)) @@ -3273,6 +3323,22 @@ ily <3. "ll" '(org-insert-link :wk "Link various things") "t" '(org-todo :wk "TODO")) +(evil-define-key 'normal org-mode-map (kbd "RET") 'org-open-at-point) +#+end_src + + +** jinja2-mode keymaps + +#+begin_src emacs-lisp +;; jinja2-mode-map +(my-leader + :keymaps 'jinja2-mode-map + "m" '(:wk "insert" :ignore) + "mv" '(jinja2-insert-var :wk "var") + "mt" '(jinja2-insert-tag :wk "tag") + "mc" '(jinja2-insert-comment :wk "comment") + + "mf" '(fill-paragraph :wk "fill paragraph")) #+end_src ** denote-menu keymaps diff --git a/custom-vars.el b/custom-vars.el index 27ba452..aa2ddb9 100644 --- a/custom-vars.el +++ b/custom-vars.el @@ -11,6 +11,10 @@ "0f220ea77c6355c411508e71225680ecb3e308b4858ef6c8326089d9ea94b86f" default)) '(lambda-themes-set-vibrant t) + '(safe-local-variable-values + '((eval progn + (add-to-list 'auto-mode-alist '("\\.html\\'" . jinja2-mode)) + (add-to-list 'auto-mode-alist '("\\.j2\\'" . jinja2-mode))))) '(zoom-size '(0.382 . 0.618))) (custom-set-faces ;; custom-set-faces was added by Custom. |