diff --git a/init.el b/init.el index 126ea6a..7184fc1 100644 --- a/init.el +++ b/init.el @@ -1,3 +1,6 @@ +;;; -*- lexical-binding: t -*- +(add-to-list 'load-path (expand-file-name "~/.emacs.d/lisp")) + ;; supress nativecomp warnings (setq native-comp-async-report-warnings-errors 'silent) diff --git a/lisp/packages.el b/packages.el similarity index 79% rename from lisp/packages.el rename to packages.el index 13959ea..b49dfcd 100644 --- a/lisp/packages.el +++ b/packages.el @@ -1,3 +1,4 @@ +;;; -*- lexical-binding: t -*- (use-package savehist :config (savehist-mode)) @@ -8,15 +9,6 @@ completion-category-defaults nil 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 :straight t @@ -27,7 +19,6 @@ (use-package consult :straight t - :after (savehist orderless vertico marginalia) :bind (;; global binds ("C-c M-x" . consult-mode-command) ("C-c h" . consult-history) @@ -67,63 +58,76 @@ :config (setq consult-narrow-key "<")) -(use-package org +(use-package vertico :straight t - :bind (("C-c a" . org-agenda) - ("C-c c" . org-capture) - ("C-c l" . org-store-link) - :map org-mode-map - ("C-c 1" . org-time-stamp-inactive)) - :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) + :bind (:map vertico-map + ("?" . minibuffer-completion-help) + ("M-TAB" . minibuffer-complete)) + :init + (vertico-mode)) - ;; latex preview settings - (setq org-preview-latex-image-directory "~/.emacs.d/org-latex-preview/") ; Hide all previews in one place +(use-package emacs + :custom + (context-menu-mode 1) + (enable-recursive-minibuffers t)) - ;; habits support - (require 'org-habit) - (add-to-list 'org-modules 'org-habit) - - ;; babel - (org-babel-do-load-languages - 'org-babel-load-languages - '((R . t))) - - ;; org-id - link by UUID - (require 'org-id) - (setq org-id-method 'uuid - org-id-link-to-org-use-id t) - ;; abbrev expansion in org-mode - (require 'org-tempo) - - ;; we need indentation - (setq org-startup-indented nil - org-indent-mode-turns-on-hiding-stars nil - org-hide-leading-stars nil - org-startup-folded 'content) - ;; default agenda files - (setq org-agenda-files '("~/org/")) - - ;; 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 org +;; :straight t +;; :bind (("C-c a" . org-agenda) +;; ("C-c c" . org-capture) +;; ("C-c l" . org-store-link) +;; :map org-mode-map +;; ("C-c 1" . org-time-stamp-inactive)) +;; :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 +;; (setq org-preview-latex-image-directory "~/.emacs.d/org-latex-preview/") ; Hide all previews in one place +;; +;; ;; habits support +;; (require 'org-habit) +;; (add-to-list 'org-modules 'org-habit) +;; +;; ;; babel +;; (org-babel-do-load-languages +;; 'org-babel-load-languages +;; '((R . t))) +;; +;; ;; org-id - link by UUID +;; (require 'org-id) +;; (setq org-id-method 'uuid +;; org-id-link-to-org-use-id t) +;; ;; abbrev expansion in org-mode +;; (require 'org-tempo) +;; +;; ;; we need indentation +;; (setq org-startup-indented nil +;; org-indent-mode-turns-on-hiding-stars nil +;; org-hide-leading-stars nil +;; org-startup-folded 'content) +;; ;; default agenda files +;; (setq org-agenda-files '("~/org/")) +;; +;; ;; 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 :straight auctex @@ -136,7 +140,6 @@ (setq reftex-plug-into-AUCTeX t)) (use-package mu4e - :straight t :commands mu4e :config (setq mu4e-change-filenames-when-moving t) @@ -243,7 +246,7 @@ (use-package dired-sidebar :straight t - :bind (:oxamap + :bind (:map oxamap ("t" . dired-sidebar-toggle-sidebar)) :config (setq dired-sidebar-theme 'ascii)) @@ -255,7 +258,7 @@ nyan-wavy-trail t) (nyan-mode 1)) -(use-package company-mode +(use-package company :straight t :config (global-company-mode)) @@ -281,7 +284,7 @@ (use-package cc-mode :config ;;; 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/ (defun llvm-lineup-statement (langelem) (let ((in-assign (c-lineup-assignments langelem))) @@ -319,4 +322,4 @@ (c++-mode . "llvm.org") (other . "stroustrup")))) -(provide 'packages) +(load "~/.emacs.d/packages")