From 27eb7d2d92a07c633ad06b6f6b5b16948058f10a Mon Sep 17 00:00:00 2001 From: Marc Coquand Date: Sun, 3 Nov 2024 09:58:35 +0200 Subject: . --- home/dots/.emacs | 67 ++++++++++++++++++++++++++++++++++++-------------------- 1 file changed, 43 insertions(+), 24 deletions(-) diff --git a/home/dots/.emacs b/home/dots/.emacs index 34c0180..68bd8a7 100644 --- a/home/dots/.emacs +++ b/home/dots/.emacs @@ -25,6 +25,8 @@ exwm geiser geiser-guile + git-gutter + git-gutter-fringe go-mode guix pdf-tools @@ -59,7 +61,6 @@ (package-initialize) - (unless package-archive-contents (package-refresh-contents)) @@ -181,11 +182,10 @@ (use-package geiser :ensure t - :demand t :bind (:map geiser-mode-map ("C-." . nil)) - :config + :init (with-eval-after-load 'geiser-guile (add-to-list 'geiser-guile-load-path "~/builds/nonguix"))) @@ -232,8 +232,7 @@ kept-new-versions 6 kept-old-versions 2 version-control t - auto-save-default nil) - (auto-save-visited-mode -1)) + auto-save-default nil)) (use-package minibuffer :defer t @@ -394,6 +393,29 @@ (add-hook 'ednc-notification-presentation-functions (lambda (&rest _) (force-mode-line-update t)))) +(use-package git-gutter + :diminish git-gutter-mode + :hook + (go-mode . git-gutter-mode) + (prog-mode . git-gutter-mode) + :bind + (("C-c g p" . git-gutter:previous-hunk) + ("C-c g n" . git-gutter:next-hunk) + ("C-c g s" . git-gutter:stage-hunk) + ("C-c g r" . git-gutter:revert-hunk) + ("C-c g =" . git-gutter:popup-hunk) + :repeat-map git-gutter-repeat-map + ("n" . git-gutter:next-hunk) + ("=" . git-gutter:popup-hunk) + ("s" . git-gutter:stage-hunk) + ("r" . git-gutter:revert-hunk) + ("p" . git-gutter:previous-hunk)) + :config + :ensure t) + +(use-package git-gutter-fringe + :ensure t) + (use-package org-crypt :ensure nil :init @@ -544,7 +566,6 @@ (use-package custom-keymaps :load-path "elisp" - :ensure nil :config (keymaps-mode) :bind @@ -623,16 +644,10 @@ :init (ido-mode t)) -(use-package org-link-minor-mode - :load-path "elisp" - :defer t) - (use-package calendar :defer t :hook ((diary-mode . variable-pitch-mode) - ; (diary-mode . org-link-minor-mode) - ; (diary-fancy-display-mode . org-link-minor-mode) (diary-fancy-display-mode . variable-pitch-mode)) :config (global-set-key (kbd "C-c d") 'calendar) @@ -762,17 +777,18 @@ (global-set-key (kbd "C-c a") #'org-agenda) (global-set-key (kbd "C-c c") #'org-capture) (global-set-key (kbd "C-c j") #'org-goto) - (global-set-key (kbd "C-c s") #'project-find-regexp) (global-set-key (kbd "C-c C-o") #'org-open-at-point-global) (global-set-key (kbd "C-c C-s") #'sync-org) ;; Something errors out with capture logs and non-org files (add-to-list 'warning-suppress-log-types '(org-element)) (add-to-list 'warning-suppress-types '(org-element)) + (advice-add 'org-agenda-quit :before 'org-save-all-org-buffers) + (advice-add 'org-refile :after 'org-save-all-org-buffers) :hook - ((org-mode . auto-save-visited-mode) - (org-mode . org-indent-mode) + ((org-mode . org-indent-mode) (org-mode . flyspell-mode) - (org-mode . auto-revert-mode) + (org-mode . (lambda () + (auto-revert-mode 1))) (org-mode . visual-line-mode) (org-mode . (lambda () (add-hook 'after-save-hook 'sync-org nil t))) @@ -1003,9 +1019,12 @@ '(fixed-pitch ((t (:family "Iosevka SS13 Extended")))) '(font-lock-builtin-face ((t (:weight regular)))) '(font-lock-comment-face ((t (:foreground "gray40")))) - '(font-lock-constant-face ((t (:slant italic :weight regular)))) - '(font-lock-function-name-face ((t (:weight regular)))) - '(font-lock-keyword-face ((t (:weight regular)))) + '(font-lock-constant-face ((t (:slant italic)))) + '(git-gutter:added ((t ()))) + '(git-gutter:modified ((t ()))) + '(git-gutter:deleted ((t (:foreground "red")))) + '(font-lock-function-name-face ((t ()))) + '(font-lock-keyword-face ((t ()))) '(font-lock-string-face ((t (:foreground "#111111" :slant italic)))) '(font-lock-type-face ((t (:foreground "#111111")))) '(magit-section-heading ((t (:foreground "royalblue")))) @@ -1023,7 +1042,7 @@ '(mastodon-display-name-face ((t (:inherit nil :weight bold)))) '(minibuffer-prompt ((t ()))) '(mode-line ((t (:background "#EEEEE8" :foreground "#111111" :box (:line-width (8 . 8) :style flat-button) :overline "white" :underline (:color "#fffff8" :style line :position t) :family "Iosevka Aile")))) - '(mode-line-emphasis ((t (:weight regular)))) + '(mode-line-emphasis ((t ()))) '(mode-line-buffer-id ((t ()))) '(magit-section-highlight ((t (:background "#EEEEE8")))) '(mode-line-inactive ((t (:inherit mode-line :background "#f9f9f3" :foreground "grey60" :overline "#f9f9f9" :underline (:color "#f9f9f9" :style line :position 0) :weight light)))) @@ -1037,23 +1056,23 @@ '(help-key-binding ((t (:weight semibold :background "#EEEEE8" :box (:line-width (1 . -1) :color "#AAAAA8"))))) '(org-agenda-done ((t (:strike-through t :inherit org-time-grid :extend nil)))) '(org-agenda-structure-filter ((t (:slant italic)))) - '(org-done ((t (:strike-through "on" :weight bold :inherit org-agenda-dimmed-todo-face :extend nil)))) + '(org-done ((t (:strike-through t :weight bold :inherit org-agenda-dimmed-todo-face :extend nil)))) '(org-todo ((t (:weight bold)))) - '(org-headline-done ((t (:strike-through "on" :inherit org-agenda-dimmed-todo-face :extend nil)))) + '(org-headline-done ((t (:strike-through t :inherit org-agenda-dimmed-todo-face :extend nil)))) '(org-level-1 ((t (:inherit outline-1 :extend nil :weight regular)))) '(org-tag ((t (:inherit fixed-pitch :foreground "gray50")))) '(org-time-grid ((t (:foreground "gray")))) '(org-quote ((t (:inherit org-block :slant italic)))) '(outline-4 ((t (:inherit outline-2)))) '(tab-bar ((t (:box (:line-width (12 . 24) :style flat-button) :weight semi-light :family "Iosevka Aile")))) - '(tab-bar-tab ((t (:inherit tab-bar :foreground "#111111" :box (:line-width (20 . 1) :color "#fffff8") :weight semi-bold)))) + '(tab-bar-tab ((t (:inherit tab-bar :foreground "#111111" :box (:line-width (20 . 1) :color "#fffff8"))))) '(tab-bar-tab-inactive ((t (:inherit tab-bar-tab :background "#fffff8" :foreground "#999999" :weight semi-light)))) '(tldr-code-block ((t (:background "cornsilk" :foreground "#111111")))) '(tldr-description ((t ()))) '(tldr-command-argument ((t (:background "cornsilk" :foreground "#111111")))) '(tldr-command-itself ((t (:background "khaki" :foreground "#111111" :weight bold)))) '(tldr-introduction ((t (:foreground "#111111" :slant italic)))) - '(tldr-title ((t (:inherit variable-pitch :foreground "#111111" :weight bold :height 1.2)))) + '(tldr-title ((t (:inherit variable-pitch :foreground "#111111" :weight bold)))) '(variable-pitch ((t (:family "Iosevka Aile")))) '(window-divider ((t (:foreground "gray90"))))) (custom-set-variables -- cgit v1.2.3