Changed shell preferences, org capture templates, fixed vali.scm

3 files changed, 32 insertions, 25 deletions

diff --git a/.config/emacs/modules/bd--exwm-windowing.el b/.config/emacs/modules/bd--exwm-windowing.el
index a275f5a..cc1a906 100644
--- a/.config/emacs/modules/bd--exwm-windowing.el
+++ b/.config/emacs/modules/bd--exwm-windowing.el
@@ -80,10 +80,10 @@ select a line from a file."
   ;; order is important
   (require 'exwm-randr)
   (exwm-randr-enable)
-  ;; because my nvidia driver is currently unsupported with nouveau,
+  ;; because my nvidia card is currently unsupported with nouveau,
   ;; xrandr seems to be entirely broken. This line is only here for
   ;; future reference
-  ;;(start-process-shell-command "xrandr" nil (expand-file-name "exwm_xrandr.sh" user-emacs-directory))
+  ;; (start-process-shell-command "xrandr" nil (expand-file-name "exwm_xrandr.sh" user-emacs-directory))
   (start-process-shell-command "picom" nil "picom")
   (start-process-shell-command "bg" nil "set-bg")
   (start-process-shell-command "xrate" nil "xset r rate 250 70")
diff --git a/.config/emacs/modules/bd--org.el b/.config/emacs/modules/bd--org.el
index c4ade63..c6e6d04 100644
--- a/.config/emacs/modules/bd--org.el
+++ b/.config/emacs/modules/bd--org.el
@@ -43,25 +43,31 @@ each org file open."
         org-log-into-drawer "history"
 
         org-todo-keywords
-        '((sequence "TODO(t)" "NEXT(n!)" "|" "DONE(d)" "CANC(c)"))
+        '((sequence "TODO(t)" "NEXT(n!)" "HOLD(h!)" "|" "DONE(d)" "CANC(c)"))
 
         org-refile-targets ; refile into the headings of these files, not tags
         '(("archived_tasks.org" :maxlevel . 1)
           ("agenda_tasks.org" :maxlevel . 1))
 
         org-capture-templates
-        `(("t" " Tasks")
-          ("ts" "Software Testing" entry (file+olp ,agenda-file "CS415")
+        `(("c" " College")
+          ("cs" "Software Testing" entry (file+olp ,agenda-file "CS415")
            "* TODO %?\n DEADLINE: %^t")
-          ("tm" "Machine Learning" entry (file+olp ,agenda-file "CS445")
+          ("cm" "Machine Learning" entry (file+olp ,agenda-file "CS445")
            "* TODO %?\n DEADLINE: %^t")
-          ("tp" "Programming Languages" entry (file+olp ,agenda-file "CS454")
+          ("cp" "Programming Languages" entry (file+olp ,agenda-file "CS454")
            "* TODO %?\n DEADLINE: %^t")
-          ("tc" "Creative Writing" entry (file+olp ,agenda-file "E210")
+          ("cc" "Creative Writing" entry (file+olp ,agenda-file "E210")
            "* TODO %?\n DEADLINE: %^t")
           ("s" " Self")
-          ("s" "Unsorted Task" entry (file+olp ,agenda-file "Self")
-           "* TODO %?\n %^t\n %a"))
+          ("si" "Idea" entry (file+olp ,agenda-file "Idea / Return")
+           "* TODO %?\n %t")
+          ("sc" "Context" entry (file+olp ,agenda-file "Idea / Return")
+           "* TODO %?\n %a")
+          ("st" "Deadline" entry (file+olp ,agenda-file "Deadline")
+           "* TODO %?\n DEADLINE: %^t")
+          ("sb" "Book" entry (file+olp ,agenda-file "Book List")
+           "* TODO %?\n %t"))
 
         org-agenda-custom-commands
         '(("S" "Standard Block Agenda"
@@ -81,7 +87,8 @@ each org file open."
                         (org-agenda-block-separator nil)
                         (org-agenda-entry-types '(:deadline))
                         (org-agenda-skip-function '(org-agenda-skip-entry-if 'todo 'done))
-                        (org-agenda-overriding-header "\nFuture Deadlines (+21d)\n")))))))
+                        (org-agenda-overriding-header "\nFuture Deadlines (+21d)\n"))))))
+        org-agenda-restore-windows-after-quit t)
 
 
 (provide 'bd--org)
diff --git a/.config/emacs/modules/bd--shells.el b/.config/emacs/modules/bd--shells.el
index 8bcd9c4..1ca8bb0 100644
--- a/.config/emacs/modules/bd--shells.el
+++ b/.config/emacs/modules/bd--shells.el
@@ -9,17 +9,6 @@
 
 
 ;;;; eshell
-(defun eshell-open-buffer ()
-  "Opens eshell in the bottom
-side window."
-  (interactive)
-  (let ((curr-buffer (current-buffer))
-        (eshell (eshell)))
-    (switch-to-buffer curr-buffer)
-    (display-buffer-in-side-window (get-buffer eshell)  '((side . top)))
-    (switch-to-buffer-other-window eshell)))
-
-
 (defun bd/get-prompt-path ()
   (abbreviate-file-name (eshell/pwd)))
 
@@ -36,9 +25,7 @@ status, and path."
 
 
 (require 'esh-mode)
-(keymap-global-set "C-z C-e" 'eshell-open-buffer)
-(keymap-set eshell-mode-map "C-q" 'delete-window) ; mostly for side window
-(keymap-set eshell-mode-map "<tab>" 'completion-at-point) ; mostly for side window
+(keymap-set eshell-mode-map "<tab>" 'completion-at-point)
 (setopt eshell-prompt-function 'bd/eshell-prompt
         eshell-prompt-regexp "^> "
         eshell-scroll-to-bottom-on-input 'this
@@ -46,7 +33,20 @@ status, and path."
 
 
 ;;;; shell
+(defun shell-open-buffer ()
+  "Opens eshell in the bottom
+side window."
+  (interactive)
+  (let ((curr-buffer (current-buffer))
+        (shell (shell)))
+    (switch-to-buffer curr-buffer)
+    (display-buffer-in-side-window (get-buffer shell)  '((side . top)))
+    (switch-to-buffer-other-window shell)))
+
+
 (require 'shell)
+(keymap-global-set "C-z C-e" 'shell-open-buffer)
+(keymap-set eshell-mode-map "C-q" 'delete-window) ; mostly for side window
 (keymap-set shell-mode-map "C-c C-k" #'comint-clear-buffer)
 (setopt shell-command-prompt-show-cwd t
         shell-highlight-undef-enable t