From a46b4ee2218927096003a6861441cd10fb59bf66 Mon Sep 17 00:00:00 2001 From: bd Date: Thu, 11 Jan 2024 21:23:34 -0700 Subject: Changed shell preferences, org capture templates, fixed vali.scm --- .config/emacs/modules/bd--exwm-windowing.el | 4 +- .config/emacs/modules/bd--org.el | 25 +++++---- .config/emacs/modules/bd--shells.el | 28 +++++----- .config/guix/vali.scm | 84 ++++++++++++++++------------- 4 files changed, 78 insertions(+), 63 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 "" 'completion-at-point) ; mostly for side window +(keymap-set eshell-mode-map "" '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 diff --git a/.config/guix/vali.scm b/.config/guix/vali.scm index 2ace3b9..edcb62f 100644 --- a/.config/guix/vali.scm +++ b/.config/guix/vali.scm @@ -16,47 +16,55 @@ #:use-module (shell) #:use-module (ssh) #:use-module (gpg) + #:use-module (bat) + #:use-module (xmodmap) #:use-module (base)) -(operating-system - (inherit ymir) - (host-name "vali") - - (file-systems (cons* (file-system - (mount-point "/boot/efi") - (device (uuid - "8A13-7018" - 'fat32)) - (type "vfat")) - (file-system - (mount-point "/home/bdunahu/Personal") - (device (uuid - "020b73df-3991-4271-9d3f-dba00ad260ec" - 'ext4)) - (type "ext4")) - (file-system - (mount-point "/") - (device (uuid - "69a3593b-12bd-40ad-a932-007674a8cfe8" - 'ext4)) - (type "ext4")) %base-file-systems))) - - -(home-environment - (packages - `(,@desktop-packages - ,@program-packages - ,@emacs-packages)) - - (services - `(,@xdg-service - ,@shell-service - ,@ssh-service - ,@gpg-service - ,@base-services - ,@bat-service - ,@xmodmap-service))) +(define system + (operating-system + (inherit ymir) + (host-name "vali") + + (mapped-devices (list (mapped-device + (source (uuid "8d3ccf19-035a-4956-8ba7-7c00dfa3a02c")) + (target "hidden") + (type luks-device-mapping)))) + + (file-systems (cons* (file-system + (mount-point "/boot/efi") + (device (uuid + "8A13-7018" + 'fat32)) + (type "vfat")) + (file-system + (mount-point "/home/bdunahu/Personal") + (device "/dev/mapper/hidden") + (type "ext4") + (dependencies mapped-devices)) + (file-system + (mount-point "/") + (device (uuid + "69a3593b-12bd-40ad-a932-007674a8cfe8" + 'ext4)) + (type "ext4")) %base-file-systems)))) + + +(define home + (home-environment + (packages + `(,@desktop-packages + ,@program-packages + ,@emacs-packages)) + + (services + `(,@xdg-service + ,@shell-service + ,@ssh-service + ,@gpg-service + ,@base-services + ,@bat-service + ,@xmodmap-service)))) (if (getenv "RUNNING_GUIX_HOME") home system) -- cgit v1.2.3