X-Git-Url: http://git.vanrenterghem.biz/Dotty.git/blobdiff_plain/ec666ac03e943e13e443024ac05703daa652e3af..f3c54e5eee9aff018f5006e5801a89248fb173d3:/emacs/.emacs.d/init.el diff --git a/emacs/.emacs.d/init.el b/emacs/.emacs.d/init.el index a953097..ec85953 100644 --- a/emacs/.emacs.d/init.el +++ b/emacs/.emacs.d/init.el @@ -54,23 +54,54 @@ vc-follow-symlinks t (setq inferior-julia-program-name "/usr/bin/julia") ;; enable autocomplete -(use-package company +(use-package corfu :ensure t - :bind(:map company-active-map - ("" . nil) - ("RET" . nil) - ("C-" . company-complete-selection) - ([tab] . company-complete-common) - ("TAB" . company-complete-common)) - :config - (setq ispell-complete-word-dict - (expand-file-name (concat user-emacs-directory "aspell_words.txt"))) - ;(defun my/text-mode-hook () - ; (setq-local company-backends -; '((company-dabbrev company-ispell :separate) - ; company-files))) - ; (add-hook 'text-mode-hook #'my/text-mode-hook) - (global-company-mode 1)) + ;; Optional customizations + :custom + (corfu-cycle t) ;; Enable cycling for `corfu-next/previous' + (corfu-auto t) ;; Enable auto completion + ;; (corfu-separator ?\s) ;; Orderless field separator + ;; (corfu-quit-at-boundary nil) ;; Never quit at completion boundary + ;; (corfu-quit-no-match nil) ;; Never quit, even if there is no match + ;; (corfu-preview-current nil) ;; Disable current candidate preview + ;; (corfu-preselect 'prompt) ;; Preselect the prompt + ;; (corfu-on-exact-match nil) ;; Configure handling of exact matches + ;; (corfu-scroll-margin 5) ;; Use scroll margin + + ;; Enable Corfu only for certain modes. See also `global-corfu-modes'. + ;; :hook ((prog-mode . corfu-mode) + ;; (shell-mode . corfu-mode) + ;; (eshell-mode . corfu-mode)) + + ;; Recommended: Enable Corfu globally. This is recommended since Dabbrev can + ;; be used globally (M-/). See also the customization variable + ;; `global-corfu-modes' to exclude certain modes. + :init + (global-corfu-mode) + (corfu-history-mode)) + +(use-package cape + :ensure t + ;; Bind prefix keymap providing all Cape commands under a mnemonic key. + ;; Press C-c p ? to for help. + :bind ("C-c p" . cape-prefix-map) ;; Alternative keys: M-p, M-+, ... + ;; Alternatively bind Cape commands individually. + ;; :bind (("C-c p d" . cape-dabbrev) + ;; ("C-c p h" . cape-history) + ;; ("C-c p f" . cape-file) + ;; ...) + :init + ;; Add to the global default value of `completion-at-point-functions' which is + ;; used by `completion-at-point'. The order of the functions matters, the + ;; first function returning a result wins. Note that the list of buffer-local + ;; completion functions takes precedence over the global list. + (add-hook 'completion-at-point-functions #'cape-dict) ;; requires words package to be installed on Arch to provide /usr/share/dict/words + (add-hook 'completion-at-point-functions #'cape-dabbrev) + (add-hook 'completion-at-point-functions #'cape-file) + (add-hook 'completion-at-point-functions #'cape-elisp-block) + ;; (add-hook 'completion-at-point-functions #'cape-history) + ;; ... + ) (use-package org :ensure t @@ -84,12 +115,18 @@ vc-follow-symlinks t (org-capture-bookmark nil) ;; Capture templates (org-capture-templates - '(("f" "Fleeting note" item + '(("f" "Fleeting note" entry (file+headline org-default-notes-file "Notes") "* %?\nEntered on %U\n %i\n %a") ("b" "Tax receipt" item (file "~/Documents/belastingen/FY24-25.org") - "* %t %a\n") + "* %t %a\n") + ("a" "Appointment" entry + (file+olp+datetree "~/Nextcloud/notes/calendar.org") + "* %?\n :PROPERTIES:\n :location: %^{Location}\n :END:\n%^T--%^T\n\n" + :jump-to-captured t + :tree-type month + :time-prompt t) ("p" "Permanent note" plain (file denote-last-path) #'denote-org-capture @@ -107,9 +144,22 @@ vc-follow-symlinks t '(("P" "Expired calendar events" ((tags "TIMESTAMP<=\"\""))) ("n" "Agenda and all TODOs" ((agenda "") (alltodo ""))))) :config + ;; Configure refile + (defun my/opened-buffer-files () + "Return the list of org files currently opened in emacs" + (delq nil + (mapcar (lambda (x) + (if (and (buffer-file-name x) + (string-match "\\.org$" + (buffer-file-name x))) + (buffer-file-name x))) + (buffer-list)))) + (setq org-refile-targets `((my/opened-buffer-files :maxlevel . 9) + (,(file-expand-wildcards "~/Nextcloud/notes/*.org") :maxlevel . 1))) (setq org-agenda-skip-scheduled-if-done t) (setq org-agenda-skip-deadline-if-done t) (setq org-agenda-start-on-weekday nil) + (setq org-log-done 'time) ;; Automatically flow lines based on window width and use ;; variable width fonts in org-mode. (add-hook 'org-mode-hook 'visual-line-mode) @@ -153,6 +203,7 @@ vc-follow-symlinks t '(("\\.mdwn\\'" . markdown-mode) ("\\.md\\'" . markdown-mode) ("\\.yarn\\'" . markdown-mode) + ("\\.cpp\\'" . c++-mode) ("\\.js\\'" . js-mode) ("\\.json\\'" . js-mode) ("Makefile" . makefile-mode) @@ -183,7 +234,8 @@ vc-follow-symlinks t '("8d146df8bd640320d5ca94d2913392bc6f763d5bc2bb47bed8e14975017eea91" "9a977ddae55e0e91c09952e96d614ae0be69727ea78ca145beea1aae01ac78d2" "0cf95236abcf59e05b1ea69b4edd53d293a5baec4fe4c3484543fee99bfd2204" "80b00f3bf7cdbdca6c80aadfbbb03145f3d0aacf6bf2a559301e61109954e30a" default)) '(org-export-backends '(ascii html icalendar latex md odt)) '(package-selected-packages - '(nov eat mu4e ellama emms mpdel-embark libmpdel pass password-store fontaine osm orderless embark-consult embark consult jinx dired-preview ftable flx nerd-icons-dired nerd-icons all-the-icons-dired marginalia vertico denote ox-rss org-ql org-contrib mustache org-static-blog haskell-mode julia-mode elfeed-protocol ack company magit auctex lsp-mode elpy ## org htmlize leuven-theme lua-mode ess-smart-underscore ess-R-data-view ess))) + '(devdocs straight calfw calfw-org engrave-faces org-caldav nov eat mu4e ellama emms mpdel-embark libmpdel pass password-store fontaine osm orderless embark-consult embark consult jinx dired-preview ftable flx nerd-icons-dired nerd-icons all-the-icons-dired marginalia vertico denote ox-rss org-ql org-contrib mustache org-static-blog haskell-mode julia-mode elfeed-protocol ack company magit auctex lsp-mode elpy ## org htmlize leuven-theme lua-mode ess-smart-underscore ess-R-data-view ess)) + '(use-package-compute-statistics t)) (custom-set-faces ;; custom-set-faces was added by Custom. ;; If you edit it by hand, you could mess it up, so be careful. @@ -364,6 +416,11 @@ vc-follow-symlinks t (setq vertico-resize nil) (vertico-mode 1)) +;; Persist history over Emacs restarts. Vertico sorts by history position. +(use-package savehist + :init + (savehist-mode)) + ;; Use `marginalia' package. This will display useful ;; annotations next to entries in the minibuffer. For example, when ;; using M-x it will show a brief description of the command as well @@ -510,6 +567,11 @@ vc-follow-symlinks t :variable-pitch-height 1.0 :line-spacing 1)))) +(use-package devdocs + :ensure t + :bind + ("C-h D" . devdocs-lookup)) + ;; Custom functions ;; Might want to run this automatically