diff --git a/.bashrc b/.bashrc index 1cb9a956..3810b638 100755 --- a/.bashrc +++ b/.bashrc @@ -2,7 +2,7 @@ # ~/.bashrc # -export PATH=$PATH:~/.local/bin +#export PATH=$PATH:~/.local/bin alias lol="sudo sh -c 'sysctl -w abi.vsyscall32=0'" alias dired="emacsclient -c -nw -a '' --eval '(dired nil)'" alias update-grub="sudo grub-mkconfig -o /boot/grub/grub.cfg" diff --git a/.config/nvim/.netrwhist b/.config/nvim/.netrwhist index 26e16c92..906821b6 100644 --- a/.config/nvim/.netrwhist +++ b/.config/nvim/.netrwhist @@ -1,5 +1,7 @@ let g:netrw_dirhistmax =10 -let g:netrw_dirhistcnt =3 +let g:netrw_dirhistcnt =5 +let g:netrw_dirhist_5='/home/tstarr/.doom.d' +let g:netrw_dirhist_4='/home/tstarr/devel/python/.git' let g:netrw_dirhist_3='/home/tstarr/.ncmpcpp' let g:netrw_dirhist_2='/home/tstarr/.config' let g:netrw_dirhist_1='/home/tstarr/.config/ncmpcpp' diff --git a/.doom.d/+gtd.el b/.doom.d/+gtd.el index 8367178f..305cb858 100644 --- a/.doom.d/+gtd.el +++ b/.doom.d/+gtd.el @@ -12,10 +12,10 @@ (setq org-agenda-files (append org-capture org-agenda org-todo)) (setq org-default-notes-file org-note) - (setq org-todo-keywords - (quote ((sequence "TODO(t)" "NEXT(n)" "|" "DONE(d)") - (sequence "WAITING(w@/!)" "HOLD(h@/!)" "|" - "CANCELLED(c@/!)")))) +(setq org-todo-keywords + (quote ((sequence "TODO(t)" "NEXT(n)" "|" "DONE(d)") + (sequence "WAITING(w@/!)" "HOLD(h@/!)" "|" + "CANCELLED(c@/!)")))) (setq org-tag-alist '((:startgroup) @@ -28,66 +28,66 @@ ("habit" . ?h) ("recurring" . ?r))) - (setq org-capture-todo (concat org-directory "gtd/capture/inbox.org")) - (setq org-capture-note (concat org-directory "gtd/capture/note.org")) +(setq org-capture-todo (concat org-directory "gtd/capture/inbox.org")) +(setq org-capture-note (concat org-directory "gtd/capture/note.org")) - (setq org-capture-templates - (doct '(("personal" :keys "p" - :children (("todo" :keys "t" - :file org-capture-todo - :template ("* TODO %? :@home:" "%U")) - ("question" :keys "q" - :file org-capture-todo - :template ("* TODO Find out %? :question:@home:" - "%U")) - ("habit" :keys "h" - :file org-capture-todo - :template ("* NEXT %? :habit:@home:" "%U" - "SCHEDULED: %(format-time-string - \"%<<%Y-%m-%d %a .+1d/3d>>\")" - ":PROPERTIES:" ":STYLE: habit" - ":REPEAT_TO_STATE: NEXT" ":END:")) - ("meeting" :keys "m" - :children (("reoccuring" :keys "r" - :file org-capture-todo - :template ("* NEXT %? :meeting:@home:" - "%U" "SCHEDULED: - %(format-time-string +(setq org-capture-templates + (doct '(("personal" :keys "p" + :children (("todo" :keys "t" + :file org-capture-todo + :template ("* TODO %? :@home:" "%U")) + ("question" :keys "q" + :file org-capture-todo + :template ("* TODO Find out %? :question:@home:" + "%U")) + ("habit" :keys "h" + :file org-capture-todo + :template ("* NEXT %? :habit:@home:" "%U" + "SCHEDULED: %(format-time-string + \"%<<%Y-%m-%d %a .+1d/3d>>\")" + ":PROPERTIES:" ":STYLE: habit" + ":REPEAT_TO_STATE: NEXT" ":END:")) + ("meeting" :keys "m" + :children (("reoccuring" :keys "r" + :file org-capture-todo + :template ("* NEXT %? :meeting:@home:" + "%U" "SCHEDULED: + %(format-time-string \"%<<%Y-%m-%d %a +7d>>\")" - ":PROPERTIES:" - ":REPEAT_TO_STATE: NEXT" - ":END:")))) - ("note" :keys "n" - :file org-capture-note - :template ("* %? :note:@home:" "%U")))) - ("work" :keys "w" - :children (("todo" :keys "t" - :file org-capture-todo - :template ("* TODO %? :@work:" "%U")) - ("question" :keys "q" - :file org-capture-todo - :template ("* TODO Find out %? :question:@work:" - "%U")) - ("habit" :keys "h" - :file org-capture-todo - :template ("* NEXT %? :habit:@work:" "%U" - "SCHEDULED: %(format-time-string - \"%<<%Y-%m-%d %a .+1d/3d>>\")" - ":PROPERTIES:" ":STYLE: habit" - ":REPEAT_TO_STATE: NEXT" ":END:")) - ("meeting" :keys "m" - :children (("reoccuring" :keys "r" - :file org-capture-todo - :template ("* NEXT %? :meeting:@work:" - "%U" "SCHEDULED: - %(format-time-string - \"%<<%Y-%m-%d %a +7d>>\")" - ":PROPERTIES:" - ":REPEAT_TO_STATE: NEXT" - ":END:")))) - ("note" :keys "n" - :file org-capture-note - :template ("* %? :note:@work:" "%U"))))))) + ":PROPERTIES:" + ":REPEAT_TO_STATE: NEXT" + ":END:")))) + ("note" :keys "n" + :file org-capture-note + :template ("* %? :note:@home:" "%U")))) + ("work" :keys "w" + :children (("todo" :keys "t" + :file org-capture-todo + :template ("* TODO %? :@work:" "%U")) + ("question" :keys "q" + :file org-capture-todo + :template ("* TODO Find out %? :question:@work:" + "%U")) + ("habit" :keys "h" + :file org-capture-todo + :template ("* NEXT %? :habit:@work:" "%U" + "SCHEDULED: %(format-time-string + \"%<<%Y-%m-%d %a .+1d/3d>>\")" + ":PROPERTIES:" ":STYLE: habit" + ":REPEAT_TO_STATE: NEXT" ":END:")) + ("meeting" :keys "m" + :children (("reoccuring" :keys "r" + :file org-capture-todo + :template ("* NEXT %? :meeting:@work:" + "%U" "SCHEDULED: + %(format-time-string + \"%<<%Y-%m-%d %a +7d>>\")" + ":PROPERTIES:" + ":REPEAT_TO_STATE: NEXT" + ":END:")))) + ("note" :keys "n" + :file org-capture-note + :template ("* %? :note:@work:" "%U"))))))) (setq org-refile-targets (quote ((nil :maxlevel . 3) (org-agenda-files :maxlevel . 3)))) @@ -96,25 +96,19 @@ (setq org-super-agenda-header-map (make-sparse-keymap)) -(setq org-agenda-custom-commands - '(("d" "Daily Agenda" - ((agenda "" ((org-agenda-span 'day) - (org-super-agenda-groups - '((:name "LATE" - :face (:underline t) - :deadline past) - (:name "TODAY" - :time-grid t - :scheduled today - :deadline today) - (:name "SOON" - :time-grid t - :scheduled "+7" - :deadline "+7"))))) - (todo "" ((org-agenda-overriding-header "") - (org-super-agenda-groups - '((:name "OPEN PROJECTS" - :children t))))))))) +(defun ts/org-daily-agenda () + "launch an agenda-like view at the specified date." + (interactive) + (org-ql-search (org-agenda-files) + '(and (or (ts-active :on today) + (deadline auto) + (scheduled :to today)) + (not (done))) + :title "Daily Agenda" + :super-groups '((:name "Home" + :tag "@home") + (:name "Work" + :tag "@work")))) (after! org-agenda (org-super-agenda-mode))) ; Close the after! org expression from diff --git a/.doom.d/custom.el b/.doom.d/custom.el deleted file mode 100644 index 4e4e3f6a..00000000 --- a/.doom.d/custom.el +++ /dev/null @@ -1,13 +0,0 @@ -(custom-set-variables - ;; custom-set-variables was added by Custom. - ;; If you edit it by hand, you could mess it up, so be careful. - ;; Your init file should contain only one such instance. - ;; If there is more than one, they won't work right. - '(custom-safe-themes - '("d6603a129c32b716b3d3541fc0b6bfe83d0e07f1954ee64517aa62c9405a3441" "e6ff132edb1bfa0645e2ba032c44ce94a3bd3c15e3929cdf6c049802cf059a2a" default))) -(custom-set-faces - ;; custom-set-faces was added by Custom. - ;; If you edit it by hand, you could mess it up, so be careful. - ;; Your init file should contain only one such instance. - ;; If there is more than one, they won't work right. - ) diff --git a/.doom.d/doomed.org b/.doom.d/doomed.org index 79f10d8a..50569e0b 100644 --- a/.doom.d/doomed.org +++ b/.doom.d/doomed.org @@ -215,7 +215,7 @@ Load modules with external configs. ;;fstar ; (dependent) types and (monadic) effects and Z3 ;;gdscript ; the language you waited for ;;(go +lsp) ; the hipster dialect - ;;(haskell +dante) ; a language that's lazier than I am + (haskell +dante) ; a language that's lazier than I am ;;hy ; readability of scheme w/ speed of python ;;idris ; a language you can depend on ;;json ; At least it ain't XML @@ -375,7 +375,7 @@ Allowable tags: @work, @home, note, question, habit :template ("* NEXT %? :meeting:@home:" "%U" "SCHEDULED: %(format-time-string - \"%<<%Y-%m-%d %a +7d>>\")" + \"%<<%Y-%m-%d %a +7d>>\")" ":PROPERTIES:" ":REPEAT_TO_STATE: NEXT" ":END:")))) @@ -394,7 +394,7 @@ Allowable tags: @work, @home, note, question, habit :file org-capture-todo :template ("* NEXT %? :habit:@work:" "%U" "SCHEDULED: %(format-time-string - \"%<<%Y-%m-%d %a .+1d/3d>>\")" + \"%<<%Y-%m-%d %a .+1d/3d>>\")" ":PROPERTIES:" ":STYLE: habit" ":REPEAT_TO_STATE: NEXT" ":END:")) ("meeting" :keys "m" @@ -433,28 +433,95 @@ I use the awesome [[https://github.com/alphapapa/org-super-agenda][super-org-age (setq org-super-agenda-header-map (make-sparse-keymap)) -(setq org-agenda-custom-commands - '(("d" "Daily Agenda" - ((agenda "" ((org-agenda-span 'day) - (org-super-agenda-groups - '((:name "LATE" - :face (:underline t) - :deadline past) - (:name "TODAY" - :time-grid t - :scheduled today - :deadline today) - (:name "SOON" - :time-grid t - :scheduled "+7" - :deadline "+7"))))) - (todo "" ((org-agenda-overriding-header "") - (org-super-agenda-groups - '((:name "OPEN PROJECTS" - :children t))))))))) +(defun ts/org-daily-agenda () + "launch an agenda-like view at the specified date." + (interactive) + (org-ql-search (org-agenda-files) + '(and (or (ts-active :on today) + (deadline auto) + (scheduled :to today)) + (not (done))) + :title "Daily Agenda" + :super-groups '((:name "Home" + :tag "@home") + (:name "Work" + :tag "@work")))) (after! org-agenda (org-super-agenda-mode))) ; Close the after! org expression from ; Org File Paths + + + #+End_src +* [packages.el] + +#+begin_src emacs-lisp :tangle "packages.el" + +;; -*- no-byte-compile: t; -*- +;;; $DOOMDIR/packages.el + +;; To install a package with Doom you must declare them here and run 'doom sync' +;; on the command line, then restart Emacs for the changes to take effect -- or +;; use 'M-x doom/reload'. + + +;; To install SOME-PACKAGE from MELPA, ELPA or emacsmirror: +;(package! some-package) + +;; To install a package directly from a remote git repo, you must specify a +;; `:recipe'. You'll find documentation on what `:recipe' accepts here: +;; https://github.com/raxod502/straight.el#the-recipe-format +;(package! another-package +; :recipe (:host github :repo "username/repo")) + +;; If the package you are trying to install does not contain a PACKAGENAME.el +;; file, or is located in a subdirectory of the repo, you'll need to specify +;; `:files' in the `:recipe': +;(package! this-package +; :recipe (:host github :repo "username/repo" +; :files ("some-file.el" "src/lisp/*.el"))) + +;; If you'd like to disable a package included with Doom, you can do so here +;; with the `:disable' property: +;(package! builtin-package :disable t) + +;; You can override the recipe of a built in package without having to specify +;; all the properties for `:recipe'. These will inherit the rest of its recipe +;; from Doom or MELPA/ELPA/Emacsmirror: +;(package! builtin-package :recipe (:nonrecursive t)) +;(package! builtin-package-2 :recipe (:repo "myfork/package")) + +;; Specify a `:branch' to install a package from a particular branch or tag. +;; This is required for some packages whose default branch isn't 'master' (which +;; our package manager can't deal with; see raxod502/straight.el#279) +;(package! builtin-package :recipe (:branch "develop")) + +;; Use `:pin' to specify a particular commit to install. +;(package! builtin-package :pin "1a2b3c4d5e") + + +;; Doom's packages are pinned to a specific commit and updated from release to +;; release. The `unpin!' macro allows you to unpin single packages... +;(unpin! pinned-package) +;; ...or multiple packages +;(unpin! pinned-package another-pinned-package) +;; ...Or *all* packages (NOT RECOMMENDED; will likely break things) +;(unpin! t) + +(package! doct) +(package! org-ql) +(package! org-super-agenda) + +(package! org-super-agenda :recipe + (:host github + :repo "starr-dusT/org-super-agenda" + :branch "master")) + +(package! org-ql :recipe + (:host github + :repo "starr-dusT/org-ql" + :branch "master")) + +#+end_src diff --git a/.doom.d/init.el b/.doom.d/init.el index 9b840002..3bb3925c 100644 --- a/.doom.d/init.el +++ b/.doom.d/init.el @@ -129,7 +129,7 @@ ;;fstar ; (dependent) types and (monadic) effects and Z3 ;;gdscript ; the language you waited for ;;(go +lsp) ; the hipster dialect - ;;(haskell +dante) ; a language that's lazier than I am + (haskell +dante) ; a language that's lazier than I am ;;hy ; readability of scheme w/ speed of python ;;idris ; a language you can depend on ;;json ; At least it ain't XML diff --git a/.doom.d/packages.el b/.doom.d/packages.el index 1bcad5a5..7f84950d 100644 --- a/.doom.d/packages.el +++ b/.doom.d/packages.el @@ -50,4 +50,15 @@ ;(unpin! t) (package! doct) +(package! org-ql) (package! org-super-agenda) + +(package! org-super-agenda :recipe + (:host github + :repo "starr-dusT/org-super-agenda" + :branch "master")) + +(package! org-ql :recipe + (:host github + :repo "starr-dusT/org-ql" + :branch "master")) diff --git a/.imwheelrc b/.imwheelrc index 5a72b847..61722e12 100644 --- a/.imwheelrc +++ b/.imwheelrc @@ -1,5 +1,5 @@ # Speed up scrolling for the document viewer -"^firefox$" +"^brave-browser$" None, Up, Button4, 4 None, Down, Button5, 4 diff --git a/.xmonad/xmonad.hs b/.xmonad/xmonad.hs index eef4694c..6724cd76 100644 --- a/.xmonad/xmonad.hs +++ b/.xmonad/xmonad.hs @@ -200,7 +200,7 @@ myKeys home = , ("M-v", namedScratchpadAction myScratchPads "scr-mpv") -- Spawn firefox - , ("M-o f" , spawn "firefox") + , ("M-o b" , spawn "brave") -- Spawn lutris , ("M-o l" , spawn "lutris") -- Spawn steam diff --git a/.xmonad/xmonad.org b/.xmonad/xmonad.org index deb2e3eb..660ba5b1 100644 --- a/.xmonad/xmonad.org +++ b/.xmonad/xmonad.org @@ -325,7 +325,7 @@ myKeys home = #+begin_src haskell -- Spawn firefox - , ("M-o f" , spawn "firefox") + , ("M-o b" , spawn "brave") -- Spawn lutris , ("M-o l" , spawn "lutris") -- Spawn steam