a/dotfiles
1
0
Fork 0
mirror of https://codeberg.org/andyscott/dotfiles.git synced 2024-12-22 09:53:10 -05:00
Code Issues Projects Releases Packages Wiki Activity

Compare commits

base: a:b10d23a892641850044634ef03b3b3d32cc26c2a
Branches Tags
a:main
a:xorg-archive
..
compare: a:37261c156cdbf1808deb6492d78f3141bd922a3e
Branches Tags
a:main
a:xorg-archive

No commits in common. "b10d23a892641850044634ef03b3b3d32cc26c2a" and "37261c156cdbf1808deb6492d78f3141bd922a3e" have entirely different histories.
b10d23a892 ... 37261c156c

2 changed files with 27 additions and 171 deletions
Show stats Expand all files Collapse all files

49
dot_config/emacs/init.el
View file

@ -139,9 +139,6 @@
(use-feature cus-edit
:init (setopt custom-file null-device))
(use-feature custom
:config (setopt custom-safe-themes t))
;; Customize fill column indicator
(use-feature display-fill-column-indicator
:hook ((conf-mode
@ -232,8 +229,7 @@
(unless (file-directory-p auto_save_directory)
(make-directory auto_save_directory))
(setopt backup-directory-alist `((".*" . ,auto_save_directory))
auto-save-list-file-prefix (concat auto_save_directory "saves-"))
auto-save-file-name-transforms `((".*" ,auto_save_directory t)))
auto-save-file-name-transforms `((".*" ,auto_save_directory t))))
(setopt backup-by-copying t
confirm-kill-processes nil
delete-old-versions t
@ -350,7 +346,8 @@
:config
(add-hook 'before-save-hook #'whitespace-cleanup)
(setopt whitespace-line-column nil
whitespace-style '(lines-char
whitespace-style '(face
lines-char
missing-newline-at-eof
space-after-tab
space-before-tab
@ -378,12 +375,11 @@
;; Catppuccin theme
(use-package catppuccin-theme
:disabled
:config
(setopt catppuccin-flavor 'macchiato)
;; (catppuccin-reload)
;; (load-theme 'catppuccin t)
)
(setopt custom-safe-themes t
catppuccin-flavor 'macchiato)
(catppuccin-reload)
(load-theme 'catppuccin t))
;; C/C++ formatting
;; Ad hoc format file: clang-format -style=webkit -dump-config > .clang-format
@ -477,7 +473,6 @@
;; In-buffer completion
(use-package company
:disabled
:bind
(:map company-active-map
("RET" . nil)
@ -493,7 +488,7 @@
;; FIXME - I crash emacs
(use-package corfu
;; :disabled
:disabled
:bind
(:map corfu-map
("M-SPC" . corfu-insert-separator)
@ -506,30 +501,6 @@
:defer 3
:ensure (corfu :files (:defaults "extensions/*")))
(use-package doom-themes
:disabled
:config
(setopt doom-themes-enable-bold t
doom-themes-enable-italic t))
(use-package nimbus-theme
:config (load-theme 'nimbus))
(use-package ef-themes
:disabled
:config
(setopt ef-themes-headings '((0 variable-pitch light 1.9)
(1 variable-pitch light 1.8)
(2 variable-pitch regular 1.7)
(3 variable-pitch regular 1.6)
(4 variable-pitch regular 1.5)
(5 variable-pitch 1.4) ; absence of weight means `bold'
(6 variable-pitch 1.3)
(7 variable-pitch 1.2)
(t variable-pitch 1.1))
ef-themes-mixed-fonts t
ef-themes-variable-pitch-ui t))
;; Use `emacs-lsp-booster' with `Eglot'
(use-package eglot-booster
:after eglot
@ -571,7 +542,7 @@
'(("Org"
("Agenda" (org-agenda nil "a") "a")
("Time blocking" org-timeblock "b")
("Super agenda" (org-agenda nil "u") "u")
("List all TODOs" (org-agenda nil "t") "t")
("Match Tags" (org-agenda nil "m") "m"))))
" "
,(enlight-menu
@ -619,7 +590,7 @@
("FIXME" error bold)
("NOTE" highlight italic)
("REVIEW" highlight italic)
("TODO" highlight bold)))
("TODO" bookmark-face bold)))
:ensure (hl-todo :depth nil)
:hook (prog-mode . hl-todo-mode))

149
dot_config/emacs/lisp/init-org.el
View file

@ -36,46 +36,30 @@
("C-c c" . org-capture)
("C-c l" . org-store-link))
:config
;; General options TODO: Comment various options more descriptively
(setopt org-agenda-block-separator nil
org-agenda-files (directory-files-recursively org-directory "org$")
(setopt org-agenda-files (directory-files-recursively org-directory "org$")
org-agenda-skip-deadline-if-done t
org-agenda-skip-scheduled-if-deadline-is-shown t
org-agenda-skip-scheduled-if-done t
org-agenda-start-on-weekday nil
org-agenda-tags-column 0
org-archive-location (concat org-directory "/archive/archive.org::* From %s")
org-archive-location (concat org-directory "/archive.org::* From %s")
org-blank-before-new-entry '((heading . auto)
(plain-list-item . auto))
org-enforce-todo-dependencies t
org-fold-catch-invisible-edits 'show-and-error
org-fontify-done-headline nil
org-fontify-quote-and-verse-blocks t
org-fontify-todo-headline t
org-goto-interface 'outline-path-completion
org-hide-emphasis-markers t
org-insert-heading-respect-content t
org-log-done 'time
org-outline-path-complete-in-steps nil
org-pretty-entities t
org-refile-allow-creating-parent-nodes 'confirm
org-refile-targets '((nil :maxlevel . 3)
org-refile-targets '((nil :maxlevel . 2)
(org-agenda-files :maxlevel . 2))
org-refile-use-outline-path nil
org-refile-use-outline-path 'file
org-return-follows-link t
org-reverse-note-order t ; Add/refile notes at the beginning of an entry
org-src-preserve-indentation t
org-startup-folded 'fold
org-tags-column 0
org-startup-folded 'content
org-todo-keywords '((sequence "BLOCKED(b@/!)" "IN-PROGRESS(i@/!)"
"TODO(t)" "WAITING(w@/!)" "|" "DONE(d!)"
"WONT-DO(n@/!)"))
;; org-todo-keyword-faces '(("TODO" . (icon-button))
;; ("IN-PROGRESS" . (tool-bar))
;; ("BLOCKED" . (match))
;; ("WONT-DO" . (org-done)))
org-todo-repeat-to-state "TODO")
"TODO(t)" "WAITING(i@/!)" "|" "DONE(d!)"
"WONT-DO(w@/!)"))
org-todo-keyword-faces '(("TODO" . (icon-button))
("IN-PROGRESS" . (tool-bar))
("BLOCKED" . (match))
("WONT-DO" . (org-done))))
(setq org-capture-templates
`(
("m" "Personal")
@ -91,7 +75,7 @@
("mt" "Todo"
entry (file+headline ,(concat org-directory "/inbox.org") "You can do it!")
"** TODO [#B] %?\n:Created: %U\n "
"** TODO [#B] %?\n:Created: %U\nSCHEDULED: %^{SCHEDULED: }T\n "
:empty-lines 1)
("p" "Projects")
@ -102,7 +86,7 @@
("pt" "Todo"
entry (file+headline ,(concat org-directory "/inbox.org") "Project Tasks")
"** TODO [#B] %?\n:Created: %U\n%i\n%a\nNotes: "
"** TODO [#B] %?\n:Created: %U\nSCHEDULED: %^{SCHEDULED: }T\n%i\n%a\nNotes: "
:empty-lines 1)
("w" "Work")
@ -113,115 +97,17 @@
("wt" "Todo"
entry (file+headline ,(concat org-directory "/inbox.org") "Work Tasks")
"** TODO [#B] %?\n:Created: %U\n%i\n%a\nNotes: "
"** TODO [#B] %?\n:Created: %U\nSCHEDULED: %^{SCHEDULED: }T\n%i\n%a\nNotes: "
:empty-lines 1)))
;; Headline appearance
(custom-set-faces
'(org-level-1 ((t (:inherit outline-1 :height 1.5))))
'(org-level-2 ((t (:inherit outline-2 :height 1.4))))
'(org-level-3 ((t (:inherit outline-3 :height 1.3))))
'(org-level-4 ((t (:inherit outline-4 :height 1.2))))
'(org-level-5 ((t (:inherit outline-5 :height 1.1)))))
:hook (org-mode . org-indent-mode)
:init
(setopt org-directory "~/Nextcloud/Documents/org")
(bind-keys :prefix-map as/org-prefix-map
:prefix "C-c o"
("n" . org-metadown)
("p" . org-metaup)
("n" . org-priority-down)
("p" . org-priority-up)
("f" . org-shiftmetaright)
("b" . org-shiftmetaleft)
("v" . org-tags-view)
("C-n" . org-priority-down)
("C-p" . org-priority-up)))
(use-package org-appear
:config
(setopt org-appear-autoentities t
org-appear-autolinks t
org-appear-autosubmarkers t
org-appear-trigger 'on-change)
:hook (org-mode . org-appear-mode))
(use-package org-modern
:disabled
:config
(setopt org-modern-symbol "Hack")
:hook
(org-mode . org-modern-mode)
(org-agenda-finalize . org-modern-agenda))
(use-package org-super-agenda
:hook (org-agenda-mode . org-super-agenda-mode)
:init
(setq org-agenda-custom-commands
'(("u" "Super agenda"
((agenda "" ((org-agenda-prefix-format " %?-12t %s")
;; (org-agenda-prefix-format " %-20:c%?-12t %s")
(org-agenda-remove-tags t)
(org-agenda-skip-function '(org-agenda-skip-entry-if
'todo '("WONT-DO")))
(org-agenda-span 5)))
(alltodo "" ((org-agenda-overriding-header "")
(org-agenda-prefix-format " %?-12t %s")
(org-agenda-remove-tags t)
(org-super-agenda-groups
'((:name "Important"
:priority "A"
:order 0)
(:name "In-Progress"
:todo "IN-PROGRESS"
:order 2)
(:name "Blocked"
:todo "BLOCKED"
:order 3)
(:name "Overdue"
:deadline past
:scheduled past
:order 1)
;; TODO: Figure out how to organize chores/personal
(:name "Chores"
:tag "chores"
:order 19)
(:name "Personal"
:habit t
:order 17)
(:name "Research"
:tag "research"
:order 7)
(:name "Upcoming"
:deadline future
:scheduled future
:order 18)
(:name "Project Backlog"
:and (:todo "TODO" :tag "project")
:order 5)
(:name "General Backlog"
:and (:todo "TODO" :priority "B")
:order 6)
(:name "Less Important"
:priority<= "C"
:order 20))))))))))
(use-package org-superstar
:config
(setopt org-indent-mode-turns-on-hiding-stars nil
org-superstar-leading-bullet ?\s
org-superstar-special-todo-items t)
:hook (org-mode . org-superstar-mode))
("b" . org-shiftmetaleft)))
(use-package org-timeblock
:bind
@ -230,7 +116,6 @@
:config
(setopt org-timeblock-new-task-time 'pick
org-timeblock-show-future-repeats 'next
org-timeblock-scale-options (cons 7 20)
org-timeblock-span 3))
(provide 'init-org)