diff options
| -rw-r--r-- | emacs | 46 |
1 files changed, 27 insertions, 19 deletions
@@ -18,6 +18,7 @@ devdocs rec-mode almost-mono-themes + eldoc-box markdown-mode yasnippet yasnippet-snippets @@ -67,7 +68,7 @@ (use-package project :ensure t - :config + :init (add-to-list 'project-switch-commands '(project-shell "Shell"))) (use-package exwm @@ -101,13 +102,13 @@ :config (setq ring-bell-function 'ignore - default-directory (concat (getenv "HOME") "/") + default-directory "/home/mccd/" focus-follows-mouse t mouse-autoselect-window t) :hook (;; Make sure titles match X window (server-after-make-frame . (lambda () - (set-window-margins (selected-window) 1 1))) + (set-window-margins (selected-window) 2 2))) (exwm-update-title . (lambda () (exwm-workspace-rename-buffer (concat exwm-class-name ":" @@ -142,18 +143,12 @@ (delete-selection-mode)) (use-package files - :init - (defconst emacs-tmp-dir (expand-file-name (format "emacs%d" (user-uid)) temporary-file-directory)) :config - (setq backup-by-copying t - delete-old-versions t + (setq delete-old-versions t kept-new-versions 6 kept-old-versions 2 - auto-save-list-file-prefix emacs-tmp-dir - version-control nil - auto-save-default nil - auto-save-file-name-transforms `((".*" ,emacs-tmp-dir t)) - backup-directory-alist `((".*" . ,emacs-tmp-dir)))) + version-control t + auto-save-default nil)) (use-package minibuffer :defer t @@ -195,7 +190,7 @@ ("B" . backward-word) ("v" . scroll-up-command) ("V" . scroll-down-command) - ("o" . 'avy-goto-char-timer) + ("o" . avy-goto-char-timer) ("g" . goto-line) ("a" . move-beginning-of-line) ("k" . kill-line) @@ -248,6 +243,7 @@ :init (pinentry-start)) + (use-package epa-file :init (epa-file-enable) @@ -360,9 +356,12 @@ (use-package sgml-mode :init (add-to-list 'auto-mode-alist '("\\.njk\\'" . html-mode)) - (add-to-list 'auto-mode-alist '("\\.tmpl\\'" . html-mode)) + (add-to-list 'auto-mode-alist '("\\.tmpl\\'" . html-mode)) :hook - ((html-mode . (lambda() + ;; TODO fix + ((html-mode . (lambda () + (keymap-local-set (kbd "M-o") 'avy-goto-char-timer))) + (html-mode . (lambda () (setq sgml-basic-offset 8 indent-tabs-mode t))))) @@ -377,6 +376,14 @@ eldoc-echo-area-use-multiline-p nil) :hook (prog-mode . eldoc-mode)) +(use-package eldoc-box + :ensure t + :demand t + :hook + (eglot-managed-mode . #'eldoc-box-hover-mode) + :config + (global-set-key (kbd "C-h .") #'eldoc-box-help-at-point)) + (use-package markdown-mode :ensure t :config @@ -510,9 +517,9 @@ org-default-notes-file "~/personal-db/notes/todo.org" org-hide-emphasis-markers t org-agenda-include-diary t - org-agenda-remove-tags nil + org-agenda-remove-tags t org-startup-folded 'content - org-agenda-inhibit-startup t + org-agenda-inhibit-startup nil ;; Add /New Heading at the end for use org-refile-allow-creating-parent-nodes 'confirm org-outline-path-complete-in-steps nil @@ -743,6 +750,7 @@ '(eglot-highlight-symbol-face ((t (:weight bold)))) '(eglot-mode-line ((t (:weight regular)))) '(erc-timestamp-face ((t (:foreground "blue" :weight bold)))) + '(eshell-prompt ((t (:weight bold)))) '(eww-valid-certificate ((t (:foreground "black" :weight bold)))) '(fixed-pitch ((t (:family "Iosevka SS13 Extended")))) '(font-lock-builtin-face ((t (:weight regular)))) @@ -810,10 +818,10 @@ '((:name "Last 7 days" :query "date:7d..now" :hide-unread t :key 119) (:name "Messages with images" :query "mime:image/*" :key 112))) '(org-agenda-files - '("~/personal-db/notes/cal-ios.org" "/home/mccd/personal-db/notes/ethics-and-software.org" "/home/mccd/personal-db/notes/reminders.org" "/home/mccd/builds/sustainably/piva.org" "/home/mccd/personal-db/notes/programming.org" "/home/mccd/personal-db/notes/unix.org" "/home/mccd/personal-db/notes/sustainable-software.org" "/home/mccd/personal-db/notes/agency-and-tech.org" "/home/mccd/personal-db/notes/emacs-teaches.org" "/home/mccd/personal-db/notes/emacs.org" "/home/mccd/personal-db/notes/inbox.org" "/home/mccd/personal-db/notes/todo.org")) + '("~/personal-db/notes/sustainable-software.org" "/home/mccd/personal-db/notes/thoughts.org" "/home/mccd/personal-db/notes/cal-ios.org" "/home/mccd/personal-db/notes/ethics-and-software.org" "/home/mccd/personal-db/notes/reminders.org" "/home/mccd/builds/sustainably/piva.org" "/home/mccd/personal-db/notes/programming.org" "/home/mccd/personal-db/notes/unix.org" "/home/mccd/personal-db/notes/agency-and-tech.org" "/home/mccd/personal-db/notes/emacs-teaches.org" "/home/mccd/personal-db/notes/emacs.org" "/home/mccd/personal-db/notes/inbox.org" "/home/mccd/personal-db/notes/todo.org")) '(org-fold-core-style 'overlays) '(package-selected-packages - '(exwm-mff eat pinentry exwm emms company orglink web-mode flycheck nix-mode nix-ts-mode avy pdf-tools elfeed-protocol lem yasnippet-snippets elfeed yasnippet smartparens markdown-mode mastodon tldr almost-mono-themes rec-mode magit go-mode expand-region devdocs)) + '(eldoc-box hide-mode-line exwm-mff eat pinentry exwm emms company orglink web-mode flycheck nix-mode nix-ts-mode avy pdf-tools elfeed-protocol lem yasnippet-snippets elfeed yasnippet smartparens markdown-mode mastodon tldr almost-mono-themes rec-mode magit go-mode expand-region devdocs)) '(tab-bar-auto-width t) '(tab-bar-close-button-show nil) '(tab-bar-format |