aboutsummaryrefslogtreecommitdiff
path: root/bard-emacs-modules
diff options
context:
space:
mode:
Diffstat (limited to 'bard-emacs-modules')
-rw-r--r--bard-emacs-modules/bard-emacs-completion.el17
-rw-r--r--bard-emacs-modules/bard-emacs-essentials.el2
-rw-r--r--bard-emacs-modules/bard-emacs-org.el13
-rw-r--r--bard-emacs-modules/bard-emacs-prog.el4
-rw-r--r--bard-emacs-modules/bard-emacs-theme.el5
-rw-r--r--bard-emacs-modules/bard-emacs-writing.el7
6 files changed, 27 insertions, 21 deletions
diff --git a/bard-emacs-modules/bard-emacs-completion.el b/bard-emacs-modules/bard-emacs-completion.el
index adf6795..8d98096 100644
--- a/bard-emacs-modules/bard-emacs-completion.el
+++ b/bard-emacs-modules/bard-emacs-completion.el
@@ -49,9 +49,7 @@
(marginalia-mode 1))
(use-package orderless
- :ensure t
- :config
- (setq completion-styles '(orderless basic)))
+ :ensure t)
(use-package corfu
:ensure t
@@ -91,19 +89,19 @@
(use-package minibuffer
:config
;;;; Completion styles
- (setq completion-styles '(basic substring initials flex orderless))
+ (setq completion-styles '(orderless basic substring initials flex))
(setq completion-category-defaults nil)
(setq completion-category-overrides
- '((file (styles . (basic partial-completion orderless)))
+ '((file (styles . (orderless basic partial-completion)))
(bookmark (styles . (basic substring)))
(library (styles . (basic substring)))
(embark-keybinding (styles . (basic substring)))
- (imenu (styles . (basic substring orderless)))
- (consult-location (styles . (basic substring orderless)))
+ (imenu (styles . (orderless basic substring)))
+ (consult-location (styles . (orderless basic substring)))
(kill-ring (styles . (emacs22 orderless)))
- (eglot (styles . (emacs22 substring orderless))))))
+ (eglot (styles . (orderless emacs22 substring))))))
(use-package consult
:ensure t
@@ -225,9 +223,6 @@
"da" "↓"
"ra" "→"
"la" "←"
- "iff" "⇔"
- "imp" "⇒"
- "tf" "∴"
"xmonad" "XMonad"
"xmobar" "XMobar")
diff --git a/bard-emacs-modules/bard-emacs-essentials.el b/bard-emacs-modules/bard-emacs-essentials.el
index a229ac2..77d74d9 100644
--- a/bard-emacs-modules/bard-emacs-essentials.el
+++ b/bard-emacs-modules/bard-emacs-essentials.el
@@ -139,7 +139,7 @@
(setq tmr-descriptions-list 'tmr-description-history)
(define-key global-map (kbd "C-c t l") 'tmr-tabulated-view)
(define-key global-map (kbd "C-c t t") #'tmr)
- (define-key global-map (kbd "C-c t T") #'tmr-with-description)
+ (define-key global-map (kbd "C-c t T") #'tmr-with-details)
(define-key global-map (kbd "C-c t l") #'tmr-tabulated-view)
(define-key global-map (kbd "C-c t c") #'tmr-clone)
(define-key global-map (kbd "C-c t k") #'tmr-cancel)
diff --git a/bard-emacs-modules/bard-emacs-org.el b/bard-emacs-modules/bard-emacs-org.el
index a8bc665..52742a2 100644
--- a/bard-emacs-modules/bard-emacs-org.el
+++ b/bard-emacs-modules/bard-emacs-org.el
@@ -21,6 +21,7 @@
org-goto-max-level '2)
(setq org-id-track-globally nil)
(setq org-special-ctrl-a/e t)
+ (setq org-id-track-globally nil)
(setq safe-local-variable-values '((org-refile-targets (nil :maxlevel . 3)))))
(setq org-archive-location "~/Notes/denote/20240328T215840--archive__self.org::* Archive")
@@ -35,9 +36,11 @@
(setq org-structure-template-alist
'(("c" . "center")
- ("x" . "example")
+ ("x" . "eg")
+ ("X" . "example")
("d" . "definition")
("t" . "theorem")
+ ("n" . "NB")
("q" . "quote")
("v" . "verse")
("s" . "src")
@@ -143,9 +146,15 @@
(setq org-capture-templates
'(("t" "task" entry
(file+olp
- "~/Notes/denote/20240328T215727--todo.org"
+ "~/Notes/denote/todo.org"
"Inbox" "General tasks")
"* TODO %?")
+ ("a" "appointment" entry
+ (file+olp
+ "~/Notes/denote/todo.org"
+ "Appointments" "General")
+ "* %?\n%^t"
+ :time-prompt t)
;; ("s" "Basic Statistics" entry
;; (file+headline
;; "~/Notes/denote/20240830T215644--statistics-flashcards__anki_stats.org" "Unsorted")
diff --git a/bard-emacs-modules/bard-emacs-prog.el b/bard-emacs-modules/bard-emacs-prog.el
index 99523b3..20e8951 100644
--- a/bard-emacs-modules/bard-emacs-prog.el
+++ b/bard-emacs-modules/bard-emacs-prog.el
@@ -62,9 +62,13 @@
(use-package flycheck
:ensure t
:config
+ (setq flycheck-disabled-checkers '(org-lint))
(global-flycheck-mode t))
;; Version control
+
+(setq vc-follow-symlinks t)
+
(use-package magit
:ensure t
:config
diff --git a/bard-emacs-modules/bard-emacs-theme.el b/bard-emacs-modules/bard-emacs-theme.el
index 965baad..c9bf0f7 100644
--- a/bard-emacs-modules/bard-emacs-theme.el
+++ b/bard-emacs-modules/bard-emacs-theme.el
@@ -3,11 +3,10 @@
;; declare all themes as safe (i trust developers)
(setq custom-safe-themes t)
-(use-package doom-themes
+(use-package doric-themes
:ensure t
:config
- (setq doom-gruvbox-dark-variant "hard")
- (bard/select-theme 'doom-gruvbox))
+ (bard/select-theme 'doric-obsidian))
(use-package fontaine
:ensure t
diff --git a/bard-emacs-modules/bard-emacs-writing.el b/bard-emacs-modules/bard-emacs-writing.el
index ae4a35f..ac4ca14 100644
--- a/bard-emacs-modules/bard-emacs-writing.el
+++ b/bard-emacs-modules/bard-emacs-writing.el
@@ -142,8 +142,8 @@
("C-c n I" . denote-add-links)
("C-c n b" . bard/consult-buffer-notes) ; notes buffer
("C-c n B" . bard/ibuffer-notes) ; notes buffer but more
- ("C-c n f" . bard/find-notes-file) ; notes-find
- ("C-c n g" . bard/search-notes-directory))) ; notes-grep
+ (:map dired-mode-map ; rename files in dired with denote structure
+ ("r" . denote-rename-file))))
(use-package denote-org
:ensure t
@@ -161,8 +161,7 @@
(require 'bard-writing)
:bind
("C-c n N" . denote-sequence)
- ("C-c n D" . denote-sequence-dired)
- ("C-c n <SPC>" . denote-sequence-region))
+ ("C-c n D" . denote-sequence-dired))
(use-package denote-journal
:ensure t