diff options
| -rw-r--r-- | examples/test.css | 7 | ||||
| -rw-r--r-- | examples/test.html | 9 | ||||
| -rw-r--r-- | examples/test.js | 1 | ||||
| -rw-r--r-- | init.el | 4 | ||||
| -rw-r--r-- | lisp/general.el | 22 | ||||
| -rw-r--r-- | lisp/lisp.el | 2 | ||||
| -rw-r--r-- | lisp/web.el | 8 |
7 files changed, 40 insertions, 13 deletions
diff --git a/examples/test.css b/examples/test.css index ab7e74b..a5dcb82 100644 --- a/examples/test.css +++ b/examples/test.css @@ -1,9 +1,10 @@ .f123 { - font-family: "Helvetica"; + font-family: "Helvetica"; + font-size: 12rem; } .f123 { - display: flex; - flex-basis: row; + display: flex; + flex-basis: row; } diff --git a/examples/test.html b/examples/test.html new file mode 100644 index 0000000..1e4685e --- /dev/null +++ b/examples/test.html @@ -0,0 +1,9 @@ +<div> + <h1>Hello world</h1> + <p> + Meow + </p> + <h2> + Meow Mix + </h2> +</div> diff --git a/examples/test.js b/examples/test.js index 3253fd3..e011d4e 100644 --- a/examples/test.js +++ b/examples/test.js @@ -32,3 +32,4 @@ c.setValue(11); for (let index = 0; index < 30; index++) { console.log("Here"); } + @@ -39,7 +39,7 @@ (use-package material-theme :ensure t :config - (load-theme 'material t)) + (load-theme 'material-light t)) (set-frame-parameter (selected-frame) 'alpha '(99 99)) @@ -68,7 +68,7 @@ ;; Your init file should contain only one such instance. ;; If there is more than one, they won't work right. '(custom-safe-themes - '("3c83b3676d796422704082049fc38b6966bcad960f896669dfc21a7a37a748fa" "a27c00821ccfd5a78b01e4f35dc056706dd9ede09a8b90c6955ae6a390eb1c1e" default)) + '("f149d9986497e8877e0bd1981d1bef8c8a6d35be7d82cba193ad7e46f0989f6a" "3c83b3676d796422704082049fc38b6966bcad960f896669dfc21a7a37a748fa" "a27c00821ccfd5a78b01e4f35dc056706dd9ede09a8b90c6955ae6a390eb1c1e" default)) '(package-selected-packages '(helm-rg htmlize mood-line org-super-agenda material-theme esup glsl-mode fast-scroll yasnippet-snippets jsdoc helm-slack slack smart-mode-line magit rust-mode xref-js2 web-mode vterm-toggle vscode-dark-plus-theme treemacs-projectile tree-sitter-langs tide tern smartparens rtags req-package rainbow-mode pythonic python-mode perfect-margin org-roam org-notify org-modern org-bullets org-alert minimap markdown-mode json-mode js2-refactor js2-highlight-vars js-doc ido-vertical-mode hl-todo highlight-thing highlight-indent-guides helm-projectile helm-posframe helm-ag good-scroll go-mode git-gutter-fringe git-commit flycheck-irony evil eslint-fix emojify eldoc-box eglot drag-stuff doom-themes dashboard css-eldoc counsel company-quickhelp company-irony cmake-mode cmake-ide auctex all-the-icons ac-js2)) '(safe-local-variable-values '((js-indent-level . 4))) diff --git a/lisp/general.el b/lisp/general.el index f33d415..a639b0d 100644 --- a/lisp/general.el +++ b/lisp/general.el @@ -124,6 +124,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) @@ -251,9 +268,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 @@ -262,7 +278,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/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 |