Compare commits

...

4 Commits

1 changed files with 31 additions and 1 deletions

32
init.el
View File

@ -78,7 +78,7 @@
;; Package management setup ;; Package management setup
; Elpaca ; Elpaca
;(unload-feature 'tramp t) (unload-feature 'tramp t)
(defvar elpaca-installer-version 0.11) (defvar elpaca-installer-version 0.11)
(defvar elpaca-directory (expand-file-name "elpaca/" user-emacs-directory)) (defvar elpaca-directory (expand-file-name "elpaca/" user-emacs-directory))
(defvar elpaca-builds-directory (expand-file-name "builds/" elpaca-directory)) (defvar elpaca-builds-directory (expand-file-name "builds/" elpaca-directory))
@ -201,6 +201,8 @@
(setq org-agenda-include-diary t) (setq org-agenda-include-diary t)
;Ensure done date/closed timestamps are logged ;Ensure done date/closed timestamps are logged
(setq org-log-done 'time) (setq org-log-done 'time)
;Ensure state changes are logged into logbook
(setq org-log-into-drawer "LOGBOOK")
;Ensure agenda still shows DONE items ;Ensure agenda still shows DONE items
(setq org-agenda-skip-scheduled-if-done nil) (setq org-agenda-skip-scheduled-if-done nil)
@ -241,6 +243,10 @@
:ensure t :ensure t
:after org :after org
:config :config
(setq org-alert-headline-regexp "TODO\\|WAITING")
(setq org-agenda-skip-scheduled-if-done t)
(setq org-agenda-skip-deadline-if-done t)
(alert-define-style 'custom-org-alert-notification (alert-define-style 'custom-org-alert-notification
:title "Custom Notification" :title "Custom Notification"
:notifier :notifier
@ -416,6 +422,25 @@
(add-hook 'completion-at-point-functions (add-hook 'completion-at-point-functions
'bash-completion-capf-nonexclusive nil t))) 'bash-completion-capf-nonexclusive nil t)))
) )
; Import bash aliases to eshell
(defun eshell-load-bash-aliases ()
"Read Bash aliases and add them to the list of eshell aliases."
;; Bash needs to be run - temporarily - interactively
;; in order to get the list of aliases.
(with-temp-buffer
(call-process "bash" nil '(t nil) nil "-ci" "alias")
(goto-char (point-min))
; Bash aliases to exclude
(flush-lines "^alias magit\\|^alias oc\\|^alias z\\|^alias zi\\|^alias cd\\|^alias cdi\\|^alias sudo")
(while (re-search-forward "alias \\(.+\\)='\\(.+\\)'$" nil t)
(add-to-list 'eshell-command-aliases-list (list (match-string 1) (match-string 2))))))
;; We only want Bash aliases to be loaded when Eshell loads its own aliases,
;; rather than every time `eshell-mode' is enabled.
(add-hook 'eshell-first-time-mode-hook 'eshell-load-bash-aliases t)
; Eat is a terminal emulator that can integrate nicely with eshell, allows us to run full ncurses applications inside eshell. ; Eat is a terminal emulator that can integrate nicely with eshell, allows us to run full ncurses applications inside eshell.
(use-package eat (use-package eat
:ensure t :ensure t
@ -554,11 +579,16 @@
) )
) )
;; Emacs everywhere - Use emacs for any text input
(use-package emacs-everywhere
:ensure t)
;; Rainbow delimiters ;; Rainbow delimiters
(use-package rainbow-delimiters (use-package rainbow-delimiters
:ensure t :ensure t
:hook :hook
(prog-mode . rainbow-delimiters-mode)) (prog-mode . rainbow-delimiters-mode))
;; Treesit Config ;; Treesit Config
(use-package treesit (use-package treesit
:ensure nil :ensure nil