diff options
Diffstat (limited to 'home/dots')
| -rw-r--r-- | home/dots/.emacs | 146 | ||||
| -rwxr-xr-x | home/dots/.local/bin/org-sync | 1 | ||||
| -rwxr-xr-x | home/dots/.xinitrc | 2 |
3 files changed, 76 insertions, 73 deletions
diff --git a/home/dots/.emacs b/home/dots/.emacs index 03eda46..ab24115 100644 --- a/home/dots/.emacs +++ b/home/dots/.emacs @@ -73,7 +73,9 @@ (use-package tab-bar :init - (tab-bar-mode)) + (tab-bar-mode) + :config + (setq tab-bar-new-tab-choice "*scratch*")) (use-package project :ensure t @@ -129,9 +131,6 @@ (start-process-shell-command cmd nil cmd))) (exwm-enable) (exwm-xim-mode) - (require 'exwm-systemtray) - (exwm-systemtray-mode) - (setq exwm-systemtray-height 30) (shell-command "xrdb ~/.Xresources") (shell-command "dbus-update-activation-environment DISPLAY") ;; Sticky keys @@ -157,6 +156,12 @@ (if (<= (length exwm-title) 50) exwm-title (concat (substring exwm-title 0 49) "...")))))))) +(use-package exwm-systemtray + :after exwm + :config + (exwm-systemtray-mode) + (setq exwm-systemtray-height 30)) + (use-package transpose-frame :ensure t @@ -182,9 +187,6 @@ (use-package geiser :ensure t - :bind - (:map geiser-mode-map - ("C-." . nil)) :init (with-eval-after-load 'geiser-guile (add-to-list 'geiser-guile-load-path "~/builds/nonguix"))) @@ -250,6 +252,7 @@ x-select-enable-primary t)) (use-package exwm-randr + :after exwm :config (exwm-randr-mode) (start-process-shell-command "xrandr" nil "")) @@ -274,10 +277,10 @@ (add-to-list 'auto-mode-alist '("\\.epub'" . nov-mode))) (use-package ednc + :after exwm :diminish ednc-mode :ensure t - :demand t - :init + :config (ednc-mode)) (use-package scheme @@ -308,9 +311,9 @@ (org-remark-global-tracking-mode +1) :config (defun mccd/store-remarks () - (concat "~/personal-db/notes/" - (file-name-base (org-remark-notes-file-name-function)) - "-remark.org")) + (concat "~/personal-db/notes/" + (file-name-base (org-remark-notes-file-name-function)) + "-remark.org")) (setq org-remark-icon-notes nil org-remark-use-org-id t org-remark-notes-file-name #'mccd/store-remarks) @@ -333,47 +336,47 @@ :demand t :bind (("C-z" . repeat) - :repeat-map - repeat-basic-movement-map - ("n" . next-line) - ("p" . previous-line) - ("f" . forward-char) - ("M-f" . forward-word) - ("M-b" . backward-word) - ("o" . avy-goto-char-timer) - ("b" . backward-char) - ("e" . move-end-of-line) - ("v" . scroll-up-command) - ("M-v" . scroll-down-command) - ("M-e" . forward-sentence) - ("a" . move-beginning-of-line) - :repeat-map - repeat-repeat-map - ("z" . repeat) - :repeat-map - repeat-undo-map - ("/" . undo) - ("?" . undo-redo) - :repeat-map - repeat-kill-map - ("d" . delete-char) - ("M-d" . kill-word) - ("k" . kill-line) - :repeat-map - repeat-movement-map - ("e" . end-of-defun) - ("f" . forward-sexp) - ("n" . forward-list) - ("p" . backward-list) - ("d" . down-list) - ("u" . up-list) - ("b" . backward-sexp) - ("a" . beginning-of-defun)) + :repeat-map + repeat-basic-movement-map + ("n" . next-line) + ("p" . previous-line) + ("f" . forward-char) + ("M-f" . forward-word) + ("M-b" . backward-word) + ("o" . avy-goto-char-timer) + ("b" . backward-char) + ("e" . move-end-of-line) + ("v" . scroll-up-command) + ("M-v" . scroll-down-command) + ("M-e" . forward-sentence) + ("a" . move-beginning-of-line) + :repeat-map + repeat-repeat-map + ("z" . repeat) + :repeat-map + repeat-undo-map + ("/" . undo) + ("?" . undo-redo) + :repeat-map + repeat-kill-map + ("d" . delete-char) + ("M-d" . kill-word) + ("k" . kill-line) + :repeat-map + repeat-movement-map + ("e" . end-of-defun) + ("f" . forward-sexp) + ("n" . forward-list) + ("p" . backward-list) + ("d" . down-list) + ("u" . up-list) + ("b" . backward-sexp) + ("a" . beginning-of-defun)) :config (setq repeat-on-final-keystroke t set-mark-command-repeat-pop t repeat-exit-key (kbd "<TAB>")) - (repeat-mode 1)) + (repeat-mode 1)) (use-package eww :config @@ -774,7 +777,7 @@ :empty-lines 1) ("r" "Reminder" entry (file "~/personal-db/notes/reminders.org") - "* %?\n%^T" + "* TODO %?\nSCHEDULED: %^T" :empty-lines 1) ("l" "Log" entry (file+headline "~/personal-db/notes/log.org" "Log") @@ -790,6 +793,9 @@ (set-face-attribute 'org-table nil :inherit 'fixed-pitch) (set-face-attribute 'org-date nil :inherit 'fixed-pitch) (set-face-attribute 'org-tag nil :inherit 'fixed-pitch) + (set-face-attribute 'org-drawer nil :inherit 'fixed-pitch) + (set-face-attribute 'org-property-value nil :inherit 'fixed-pitch) + (set-face-attribute 'org-special-keyword nil :inherit 'fixed-pitch) (global-set-key (kbd "C-c l") #'org-store-link) (global-set-key (kbd "C-c a") #'org-agenda) (global-set-key (kbd "C-c c") #'org-capture) @@ -799,24 +805,30 @@ (add-to-list 'warning-suppress-log-types '(org-element)) (add-to-list 'warning-suppress-types '(org-element)) (advice-add 'org-agenda-quit :before (lambda () - (interactive) - (org-save-all-org-buffers) - (sync-org))) - (advice-add 'org-refile :after (lambda () - (interactive) - (org-save-all-org-buffers) - (sync-org))) + (interactive) + (org-save-all-org-buffers) + (sync-org))) :hook ((org-mode . org-indent-mode) + (org-capture-after-finalize . sync-org) (org-mode . flyspell-mode) (org-mode . (lambda () (auto-revert-mode 1))) (org-mode . visual-line-mode) (org-mode . variable-pitch-mode))) +(use-package org-id + :after org + :config + (setq org-id-link-to-org-use-id 'create-if-interactive-and-no-custom-id)) + (use-package autorevert :diminish auto-revert-mode) +(use-package org-agenda + :demand t + :ensure nil) + (use-package appt :after org-agenda :demand t @@ -825,9 +837,10 @@ :config (setq appt-message-warning-time 15 appt-display-interval 5 + appt-display-mode-line nil appt-disp-window-function (lambda (remaining new-time msg) (notifications-notify - :title (format "In %s minutes" remaining) + :title (format "Scheduled for %s minutes" remaining) :body msg :urgency 'critical))) @@ -856,7 +869,8 @@ (add-to-list 'project-switch-commands '(magit-project-status "magit"))) (use-package magit-extras - :demand t) + :demand t + :ensure magit) (use-package yasnippet :diminish yas-minor-mode @@ -864,10 +878,6 @@ :init (yas-global-mode 1)) -;(use-package register -; :bind -; (("C-z" . 'point-to-register))) - (defun marc/set-msmtp-account () (if (message-mail-p) (save-excursion @@ -882,12 +892,6 @@ ((string-match "marc@mccd.space" from) "home")))) (setq message-sendmail-extra-arguments (list '"-a" account)))))) -;(use-package message -; :defer t -; :hook -; ((message-send-mail . marc/set-msmtp-account) -; (message-mode-hook flyspell-mode))) - (add-hook 'message-send-mail-hook #'marc/set-msmtp-account) (add-hook 'message-mode-hook #'flyspell-mode) @@ -925,7 +929,7 @@ ;; select the right sender email from the context. (setq message-sendmail-envelope-from 'header) - + ;; Refresh mail using isync every 10 minutes (setq mu4e-update-interval (* 10 60) mu4e-get-mail-command "mbsync -a" @@ -958,7 +962,7 @@ (("/home/INBOX" . ?i) ("/home/Archive/Done" . ?d) ("/home/Archive" . ?a) - ("/home/Archive/Todo" . ?t))))) + ("/home/Archive/Todo" . ?t))))) ;; Work account (make-mu4e-context :name "work" diff --git a/home/dots/.local/bin/org-sync b/home/dots/.local/bin/org-sync index 22ab2f8..674dfed 100755 --- a/home/dots/.local/bin/org-sync +++ b/home/dots/.local/bin/org-sync @@ -7,5 +7,4 @@ then echo "System is not connected to Wifi. Will not sync"; else ~/go/bin/rclone bisync storage:personal-db ~/personal-db; - echo "Sync complete"; fi diff --git a/home/dots/.xinitrc b/home/dots/.xinitrc index af5b122..4e46f32 100755 --- a/home/dots/.xinitrc +++ b/home/dots/.xinitrc @@ -14,6 +14,7 @@ export GDK_DPI_SCALE="1.5" export GDK_SCALE="1.5" export XCURSOR_SIZE="32" #autocutsel & +emacs --daemon -f exwm-enable xsetroot -solid '#000000' & gsettings set org.gnome.desktop.interface document-font-name 'Iosevka Aile' & gsettings set org.gnome.desktop.interface font-name 'Iosevka Aile' & @@ -23,5 +24,4 @@ gsettings set org.gnome.desktop.interface cursor-theme Adwaita & setxkbmap -layout us -variant colemak -option "caps:nocaps" & xsetroot -cursor_name left_ptr & xset r rate 200 60 & -emacs --daemon --eval "(require 'exwm)" -f exwm-enable exec dbus-run-session emacsclient -c |