This commit is contained in:
Grisha Shipunov 2025-06-10 10:39:13 +02:00
parent b2e3e7505c
commit 4d98d0f412
2 changed files with 75 additions and 69 deletions

View file

@ -1,3 +1,6 @@
;;; -*- lexical-binding: t -*-
(add-to-list 'load-path (expand-file-name "~/.emacs.d/lisp"))
;; supress nativecomp warnings ;; supress nativecomp warnings
(setq native-comp-async-report-warnings-errors 'silent) (setq native-comp-async-report-warnings-errors 'silent)

View file

@ -1,3 +1,4 @@
;;; -*- lexical-binding: t -*-
(use-package savehist (use-package savehist
:config (savehist-mode)) :config (savehist-mode))
@ -8,15 +9,6 @@
completion-category-defaults nil completion-category-defaults nil
completion-category-overrides '((file (styles partial-completion))))) completion-category-overrides '((file (styles partial-completion)))))
(use-package vertico
:straight t
:bind (:map vertico-map
("?" . minibuffer-completion-help)
("M-TAB" . minibuffer-complete))
:init
(setq enable-recursive-minibuffers t)
:config
(vertico-mode))
(use-package marginalia (use-package marginalia
:straight t :straight t
@ -27,7 +19,6 @@
(use-package consult (use-package consult
:straight t :straight t
:after (savehist orderless vertico marginalia)
:bind (;; global binds :bind (;; global binds
("C-c M-x" . consult-mode-command) ("C-c M-x" . consult-mode-command)
("C-c h" . consult-history) ("C-c h" . consult-history)
@ -67,63 +58,76 @@
:config :config
(setq consult-narrow-key "<")) (setq consult-narrow-key "<"))
(use-package org (use-package vertico
:straight t :straight t
:bind (("C-c a" . org-agenda) :bind (:map vertico-map
("C-c c" . org-capture) ("?" . minibuffer-completion-help)
("C-c l" . org-store-link) ("M-TAB" . minibuffer-complete))
:map org-mode-map :init
("C-c 1" . org-time-stamp-inactive)) (vertico-mode))
:config
;; autosave advises for agenda and org-capture
(advice-add 'org-agenda-quit :before 'org-save-all-org-buffers)
(advice-add 'org-capture-finalize :after 'org-save-all-org-buffers)
(advice-add 'org-capture-refile :after 'org-save-all-org-buffers)
;; latex preview settings (use-package emacs
(setq org-preview-latex-image-directory "~/.emacs.d/org-latex-preview/") ; Hide all previews in one place :custom
(context-menu-mode 1)
(enable-recursive-minibuffers t))
;; habits support ;; (use-package org
(require 'org-habit) ;; :straight t
(add-to-list 'org-modules 'org-habit) ;; :bind (("C-c a" . org-agenda)
;; ("C-c c" . org-capture)
;; babel ;; ("C-c l" . org-store-link)
(org-babel-do-load-languages ;; :map org-mode-map
'org-babel-load-languages ;; ("C-c 1" . org-time-stamp-inactive))
'((R . t))) ;; :config
;; ;; autosave advises for agenda and org-capture
;; org-id - link by UUID ;; (advice-add 'org-agenda-quit :before 'org-save-all-org-buffers)
(require 'org-id) ;; (advice-add 'org-capture-finalize :after 'org-save-all-org-buffers)
(setq org-id-method 'uuid ;; (advice-add 'org-capture-refile :after 'org-save-all-org-buffers)
org-id-link-to-org-use-id t) ;;
;; abbrev expansion in org-mode ;; ;; latex preview settings
(require 'org-tempo) ;; (setq org-preview-latex-image-directory "~/.emacs.d/org-latex-preview/") ; Hide all previews in one place
;;
;; we need indentation ;; ;; habits support
(setq org-startup-indented nil ;; (require 'org-habit)
org-indent-mode-turns-on-hiding-stars nil ;; (add-to-list 'org-modules 'org-habit)
org-hide-leading-stars nil ;;
org-startup-folded 'content) ;; ;; babel
;; default agenda files ;; (org-babel-do-load-languages
(setq org-agenda-files '("~/org/")) ;; 'org-babel-load-languages
;; '((R . t)))
;; default agenda view ;;
(setq org-agenda-start-day "-3d" ;; ;; org-id - link by UUID
org-agenda-span 13) ;; (require 'org-id)
;; templates ;; (setq org-id-method 'uuid
(setq org-capture-templates ;; org-id-link-to-org-use-id t)
'(("n" "note" entry ;; ;; abbrev expansion in org-mode
(file+headline "~/org/inbox.org" "Notes") ;; (require 'org-tempo)
"** %?\n:PROPERTIES:\n:CREATED: %U\n:END:\n\n") ;;
("t" "TODO" entry ;; ;; we need indentation
(file+headline "~/org/inbox.org" "Tasks") ;; (setq org-startup-indented nil
"** TODO %?\n:PROPERTIES:\n:CREATED: %U\n:END:\n\n") ;; org-indent-mode-turns-on-hiding-stars nil
("j" "Journal" entry ;; org-hide-leading-stars nil
(file+olp+datetree "~/org/log.org.gpg") ;; org-startup-folded 'content)
"**** %U %?\n") ;; ;; default agenda files
("b" "Bookmark" entry ;; (setq org-agenda-files '("~/org/"))
(file+headline "~/org/bookmarks.org" "bookmarks-inbox") ;;
"** TODO %?\n:PROPERTIES:\n:CREATED: %U\n:END:\n[[%x]]\n")))) ;; ;; default agenda view
;; (setq org-agenda-start-day "-3d"
;; org-agenda-span 13)
;; ;; templates
;; (setq org-capture-templates
;; '(("n" "note" entry
;; (file+headline "~/org/inbox.org" "Notes")
;; "** %?\n:PROPERTIES:\n:CREATED: %U\n:END:\n\n")
;; ("t" "TODO" entry
;; (file+headline "~/org/inbox.org" "Tasks")
;; "** TODO %?\n:PROPERTIES:\n:CREATED: %U\n:END:\n\n")
;; ("j" "Journal" entry
;; (file+olp+datetree "~/org/log.org.gpg")
;; "**** %U %?\n")
;; ("b" "Bookmark" entry
;; (file+headline "~/org/bookmarks.org" "bookmarks-inbox")
;; "** TODO %?\n:PROPERTIES:\n:CREATED: %U\n:END:\n[[%x]]\n"))))
(use-package tex-site (use-package tex-site
:straight auctex :straight auctex
@ -136,7 +140,6 @@
(setq reftex-plug-into-AUCTeX t)) (setq reftex-plug-into-AUCTeX t))
(use-package mu4e (use-package mu4e
:straight t
:commands mu4e :commands mu4e
:config :config
(setq mu4e-change-filenames-when-moving t) (setq mu4e-change-filenames-when-moving t)
@ -243,7 +246,7 @@
(use-package dired-sidebar (use-package dired-sidebar
:straight t :straight t
:bind (:oxamap :bind (:map oxamap
("t" . dired-sidebar-toggle-sidebar)) ("t" . dired-sidebar-toggle-sidebar))
:config :config
(setq dired-sidebar-theme 'ascii)) (setq dired-sidebar-theme 'ascii))
@ -255,7 +258,7 @@
nyan-wavy-trail t) nyan-wavy-trail t)
(nyan-mode 1)) (nyan-mode 1))
(use-package company-mode (use-package company
:straight t :straight t
:config :config
(global-company-mode)) (global-company-mode))
@ -281,7 +284,7 @@
(use-package cc-mode (use-package cc-mode
:config :config
;;; Copypasta of llvm/utils/emacs/emacs.el ;;; Copypasta of llvm/utils/emacs/emacs.el
;; LLVM coding style guidelines in emacs ;; LLVM codi style guidelines in emacs
;; Maintainer: LLVM Team, http://llvm.org/ ;; Maintainer: LLVM Team, http://llvm.org/
(defun llvm-lineup-statement (langelem) (defun llvm-lineup-statement (langelem)
(let ((in-assign (c-lineup-assignments langelem))) (let ((in-assign (c-lineup-assignments langelem)))
@ -319,4 +322,4 @@
(c++-mode . "llvm.org") (c++-mode . "llvm.org")
(other . "stroustrup")))) (other . "stroustrup"))))
(provide 'packages) (load "~/.emacs.d/packages")