diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/general.el | 22 | ||||
| -rw-r--r-- | lisp/lisp.el | 2 | ||||
| -rw-r--r-- | lisp/org-custom.el | 16 | ||||
| -rw-r--r-- | lisp/web.el | 8 |
4 files changed, 32 insertions, 16 deletions
diff --git a/lisp/general.el b/lisp/general.el index 5173070..3bf1072 100644 --- a/lisp/general.el +++ b/lisp/general.el @@ -121,6 +121,23 @@ completion-category-defaults nil completion-category-overrides '((file (styles partial-completion))))) +;; Enable rich annotations using the Marginalia package +(use-package marginalia + :ensure t + ;; Bind `marginalia-cycle' locally in the minibuffer. To make the binding + ;; available in the *Completions* buffer, add it to the + ;; `completion-list-mode-map'. + :bind (:map minibuffer-local-map + ("M-A" . marginalia-cycle)) + + ;; The :init section is always executed. + :init + + ;; Marginalia must be actived in the :init section of use-package such that + ;; the mode gets enabled right away. Note that this forces loading the + ;; package. + (marginalia-mode)) + (use-package rg :ensure t) @@ -248,9 +265,8 @@ ;(neotree-show) ;(neotree-refresh) (other-window -1)))))) -(bind-key* (kbd "M-r") 'my-rename-file) +(bind-key* (kbd "C-c f r") 'my-rename-file) -;; Company mode for code completion (use-package company :ensure t :defer t @@ -259,7 +275,7 @@ (setq company-idle-delay 0.1 company-minimum-prefix-length 2 company-tooltip-limit 10 - company-backends '((company-capf company-gtags company-elisp company-css company-dabbrev)) + company-backends '((company-capf company-gtags company-elisp company-css company-dabbrev company-nxml)) ) ) diff --git a/lisp/lisp.el b/lisp/lisp.el index 38c8ebe..3e4f099 100644 --- a/lisp/lisp.el +++ b/lisp/lisp.el @@ -4,7 +4,7 @@ ;;(add-hook 'emacs-lisp-mode-hook 'eglot-ensure) (defun setup-lisp() "Set up the Lisp auto complete." - (company-mode t) + ;(company-mode t) ) diff --git a/lisp/org-custom.el b/lisp/org-custom.el index 8c917dc..0131f1c 100644 --- a/lisp/org-custom.el +++ b/lisp/org-custom.el @@ -53,14 +53,14 @@ (use-package org-super-agenda :ensure t) -(use-package org-alert - :ensure t - :config - (org-alert-enable) - (setq org-alert-interval 3600 ; Once per hour! - org-alert-notify-cutoff 30 - org-alert-notify-after-event-cutoff 30 - alert-default-style 'libnotify)) +;; (use-package org-alert +;; :ensure t +;; :config +;; (org-alert-enable) +;; (setq org-alert-interval 3600 ; Once per hour! +;; org-alert-notify-cutoff 30 +;; org-alert-notify-after-event-cutoff 30 +;; alert-default-style 'libnotify)) (use-package org-roam :ensure t diff --git a/lisp/web.el b/lisp/web.el index b92507b..6a3e118 100644 --- a/lisp/web.el +++ b/lisp/web.el @@ -4,9 +4,9 @@ ;; Web general (defun my-web-mode-colors () "Set colors for web mode." - (set-face-background 'web-mode-current-element-highlight-face "#FFFDD0") - (set-face-background 'web-mode-current-column-highlight-face "gray97") - (set-face-foreground 'web-mode-current-element-highlight-face "black") + ;; (set-face-background 'web-mode-current-element-highlight-face "#FFFDD0") + ;; (set-face-background 'web-mode-current-column-highlight-face "gray97") + ;; (set-face-foreground 'web-mode-current-element-highlight-face "black") ) (use-package web-mode @@ -19,7 +19,7 @@ ) (my-web-mode-colors) ) -(add-to-list 'auto-mode-alist '("\\.html?\\'" . web-mode)) +(add-to-list 'auto-mode-alist '("\\.html?\\'" . html-mode)) (setq-default js-indent-level 2) (use-package flycheck |