mirror of
https://github.com/SqrtMinusOne/dotfiles.git
synced 2025-12-10 19:23:03 +03:00
feat(emacs): magit-blame, nginx and the first version of gource
This commit is contained in:
parent
fc68c8d0eb
commit
1e5a588ef5
2 changed files with 341 additions and 26 deletions
171
.emacs.d/init.el
171
.emacs.d/init.el
|
|
@ -266,7 +266,8 @@
|
|||
prodigy
|
||||
slime
|
||||
forge
|
||||
deadgrep)))
|
||||
deadgrep
|
||||
vc-annonate)))
|
||||
|
||||
(use-package avy
|
||||
:straight t
|
||||
|
|
@ -614,18 +615,13 @@ then it takes a second \\[keyboard-quit] to abort the minibuffer."
|
|||
"M" 'magit-file-dispatch)
|
||||
:config
|
||||
(setq magit-blame-styles
|
||||
'((margin
|
||||
(margin-format . ("%a %A %s"))
|
||||
(margin-width . 42)
|
||||
(margin-face . magit-blame-margin)
|
||||
(margin-body-face . (magit-blame-dimmed)))
|
||||
(headings
|
||||
(heading-format . "%-20a %C %s\n"))
|
||||
(highlight
|
||||
(highlight-face . magit-blame-highlight))
|
||||
(lines
|
||||
(show-lines . t)
|
||||
(show-message . t)))))
|
||||
'((headings
|
||||
(heading-format . "%-20a %C %s\n"))
|
||||
(highlight
|
||||
(highlight-face . magit-blame-highlight))
|
||||
(lines
|
||||
(show-lines . t)
|
||||
(show-message . t)))))
|
||||
|
||||
(use-package forge
|
||||
:after magit
|
||||
|
|
@ -2425,6 +2421,11 @@ Returns (<buffer> . <workspace-index>) or nil."
|
|||
(use-package crontab-mode
|
||||
:straight t)
|
||||
|
||||
(use-package nginx-mode
|
||||
:straight t
|
||||
:config
|
||||
(my/set-smartparens-indent 'nginx-mode))
|
||||
|
||||
(add-hook 'sh-mode-hook #'smartparens-mode)
|
||||
|
||||
(use-package fish-mode
|
||||
|
|
@ -4988,6 +4989,7 @@ ENTRY is an instance of `elfeed-entry'."
|
|||
;; (evil-lion-mode -1)
|
||||
;; (evil-commentary-mode -1)
|
||||
;; ))
|
||||
;; <I've just read the line below as "I hate everything">
|
||||
;; I have everything I need in polybar
|
||||
(emms-mode-line-mode -1)
|
||||
(emms-playing-time-display-mode -1)
|
||||
|
|
@ -5536,3 +5538,146 @@ ENTRY is an instance of `elfeed-entry'."
|
|||
:action (lambda (elem)
|
||||
(setq zone-programs (vector (cdr elem)))
|
||||
(zone))))
|
||||
|
||||
(defun my/gravatar-retrieve-sync (email file-name)
|
||||
(let ((gravatar-default-image "identicon")
|
||||
(gravatar-size nil)
|
||||
(coding-system-for-write 'binary)
|
||||
(write-region-annotate-functions nil)
|
||||
(write-region-post-annotation-function nil))
|
||||
(write-region
|
||||
(image-property (gravatar-retrieve-synchronously email) :data)
|
||||
nil file-name nil :silent)))
|
||||
|
||||
(setq my/gravatar-folder "/home/pavel/.cache/gravatars/")
|
||||
|
||||
(defun my/gravatar-save (email author)
|
||||
(let ((file-name (concat my/gravatar-folder author ".png")))
|
||||
(mkdir my/gravatar-folder t)
|
||||
(unless (file-exists-p file-name)
|
||||
(message "Fetching gravatar for %s (%s)" author email)
|
||||
(my/gravatar-retrieve-sync email file-name))))
|
||||
|
||||
(defun my/git-get-authors (repo &optional authors-init)
|
||||
(let* ((default-directory repo)
|
||||
(data (shell-command-to-string
|
||||
"git log --pretty=format:\"%ae|%an\" | sort | uniq -c | sed \"s/^[ \t]*//;s/ /|/\""))
|
||||
(authors
|
||||
(cl-loop for string in (split-string data "\n")
|
||||
if (= (length (split-string string "|")) 3)
|
||||
collect (let ((datum (split-string string "|")))
|
||||
`((count . ,(string-to-number (nth 0 datum)))
|
||||
(email . ,(downcase (nth 1 datum)))
|
||||
(author . ,(nth 2 datum)))))))
|
||||
(mapcar
|
||||
(lambda (datum)
|
||||
(setf (alist-get 'author datum)
|
||||
(car (cl-reduce
|
||||
(lambda (acc author)
|
||||
(if (> (cdr author) (cdr acc))
|
||||
author
|
||||
acc))
|
||||
(alist-get 'authors datum)
|
||||
:initial-value '(nil . -1))))
|
||||
(setf (alist-get 'email datum)
|
||||
(car (cl-reduce
|
||||
(lambda (acc email)
|
||||
(if (> (cdr email) (cdr acc))
|
||||
email
|
||||
acc))
|
||||
(alist-get 'emails datum)
|
||||
:initial-value '(nil . -1))))
|
||||
datum)
|
||||
(cl-reduce
|
||||
(lambda (acc val)
|
||||
(let* ((author (alist-get 'author val))
|
||||
(email (alist-get 'email val))
|
||||
(count (alist-get 'count val))
|
||||
(saved-value
|
||||
(seq-find
|
||||
(lambda (cand)
|
||||
(or (alist-get email (alist-get 'emails cand)
|
||||
nil nil #'string-equal)
|
||||
(alist-get author (alist-get 'authors cand)
|
||||
nil nil #'string-equal)
|
||||
(alist-get email (alist-get 'authors cand)
|
||||
nil nil #'string-equal)
|
||||
(alist-get author (alist-get 'emails cand)
|
||||
nil nil #'string-equal)))
|
||||
acc)))
|
||||
(if saved-value
|
||||
(progn
|
||||
(if (alist-get email (alist-get 'emails saved-value)
|
||||
nil nil #'string-equal)
|
||||
(cl-incf (alist-get email (alist-get 'emails saved-value)
|
||||
nil nil #'string-equal)
|
||||
count)
|
||||
(push (cons email count) (alist-get 'emails saved-value)))
|
||||
(if (alist-get author (alist-get 'authors saved-value)
|
||||
nil nil #'string-equal)
|
||||
(cl-incf (alist-get author (alist-get 'authors saved-value)
|
||||
nil nil #'string-equal)
|
||||
count)
|
||||
(push (cons author count) (alist-get 'authors saved-value))))
|
||||
(setq saved-value
|
||||
(push `((emails . ((,email . ,count)))
|
||||
(authors . ((,author . ,count))))
|
||||
acc)))
|
||||
acc))
|
||||
authors
|
||||
:initial-value authors-init))))
|
||||
|
||||
(defun my/gource-prepare-log (repo authors)
|
||||
(let ((log (shell-command-to-string
|
||||
(concat
|
||||
"gource --output-custom-log - "
|
||||
repo)))
|
||||
(authors-mapping (make-hash-table :test #'equal))
|
||||
(prefix (file-name-base repo)))
|
||||
(cl-loop for author-datum in authors
|
||||
for author = (alist-get 'author author-datum)
|
||||
do (my/gravatar-save (alist-get 'email author-datum) author)
|
||||
do (cl-loop for other-author in (alist-get 'authors author-datum)
|
||||
unless (string-equal (car other-author) author)
|
||||
do (puthash (car other-author) author
|
||||
authors-mapping)))
|
||||
(cl-loop for line in (split-string log "\n")
|
||||
concat (let ((fragments (split-string line "|")))
|
||||
(when (> (length fragments) 3)
|
||||
(when-let (mapped-author (gethash (nth 1 fragments)
|
||||
authors-mapping))
|
||||
(setf (nth 1 fragments) mapped-author))
|
||||
(setf (nth 3 fragments)
|
||||
(concat "/" prefix (nth 3 fragments))))
|
||||
(string-join fragments "|"))
|
||||
concat "\n")))
|
||||
|
||||
(defun my/gource-dired-create-logs (repos log-name)
|
||||
(interactive (list (or (dired-get-marked-files nil nil #'file-directory-p)
|
||||
(user-error "Select at least one directory"))
|
||||
(read-file-name "Log file name: " nil "combined.log")))
|
||||
(let* ((authors
|
||||
(cl-reduce
|
||||
(lambda (acc repo)
|
||||
(my/git-get-authors repo acc))
|
||||
repos
|
||||
:initial-value nil))
|
||||
(logs (string-join
|
||||
(seq-filter
|
||||
(lambda (line)
|
||||
(not (string-empty-p line)))
|
||||
(seq-sort-by
|
||||
(lambda (line)
|
||||
(if-let (time (car (split-string line "|")))
|
||||
(string-to-number time)
|
||||
0))
|
||||
#'<
|
||||
(split-string
|
||||
(mapconcat
|
||||
(lambda (repo)
|
||||
(my/gource-prepare-log repo authors))
|
||||
repos "\n")
|
||||
"\n")))
|
||||
"\n")))
|
||||
(with-temp-file log-name
|
||||
(insert logs))))
|
||||
|
|
|
|||
196
Emacs.org
196
Emacs.org
|
|
@ -492,7 +492,8 @@ Do ex search in other buffer. Like =*=, but switch to other buffer and search th
|
|||
prodigy
|
||||
slime
|
||||
forge
|
||||
deadgrep)))
|
||||
deadgrep
|
||||
vc-annonate)))
|
||||
#+end_src
|
||||
*** Avy
|
||||
[[https://github.com/abo-abo/avy][Avy]] is a package that helps navigate Emacs in a tree-like manner.
|
||||
|
|
@ -1041,18 +1042,13 @@ Another important package that also touches this category is [[*Dired][dired]],
|
|||
"M" 'magit-file-dispatch)
|
||||
:config
|
||||
(setq magit-blame-styles
|
||||
'((margin
|
||||
(margin-format . ("%a %A %s"))
|
||||
(margin-width . 42)
|
||||
(margin-face . magit-blame-margin)
|
||||
(margin-body-face . (magit-blame-dimmed)))
|
||||
(headings
|
||||
(heading-format . "%-20a %C %s\n"))
|
||||
(highlight
|
||||
(highlight-face . magit-blame-highlight))
|
||||
(lines
|
||||
(show-lines . t)
|
||||
(show-message . t)))))
|
||||
'((headings
|
||||
(heading-format . "%-20a %C %s\n"))
|
||||
(highlight
|
||||
(highlight-face . magit-blame-highlight))
|
||||
(lines
|
||||
(show-lines . t)
|
||||
(show-message . t)))))
|
||||
#+end_src
|
||||
|
||||
[[https://github.com/magit/forge][forge]] provides integration with forges, such as GitHub and GitLab.
|
||||
|
|
@ -3332,6 +3328,13 @@ A package to quickly create =.gitignore= files.
|
|||
(use-package crontab-mode
|
||||
:straight t)
|
||||
#+end_src
|
||||
*** nginx
|
||||
#+begin_src emacs-lisp
|
||||
(use-package nginx-mode
|
||||
:straight t
|
||||
:config
|
||||
(my/set-smartparens-indent 'nginx-mode))
|
||||
#+end_src
|
||||
** Shell
|
||||
*** sh
|
||||
#+begin_src emacs-lisp
|
||||
|
|
@ -6972,6 +6975,7 @@ References:
|
|||
;; (evil-lion-mode -1)
|
||||
;; (evil-commentary-mode -1)
|
||||
;; ))
|
||||
;; <I've just read the line below as "I hate everything">
|
||||
;; I have everything I need in polybar
|
||||
(emms-mode-line-mode -1)
|
||||
(emms-playing-time-display-mode -1)
|
||||
|
|
@ -7837,6 +7841,172 @@ Watch out if you are using EXWM.
|
|||
(zone))))
|
||||
#+end_src
|
||||
|
||||
*** Gource
|
||||
[[https://gource.io/][Gource]] is a nice repository visualization tool.
|
||||
|
||||
The goal of the functions below is to run the tool for multiple repos from Dired. Maybe I'll extract it into a separate package at some point, but I'm fine with letting it live here for now.
|
||||
|
||||
**** Gravatars
|
||||
Gource can use pictures to visualize users, so I want to use gravatars. It's quite amazing that Emacs has a built-in gravatar package.
|
||||
|
||||
First, retrieve a particular gravatar, with a fallback to identicon if necessary:
|
||||
#+begin_src emacs-lisp
|
||||
(defun my/gravatar-retrieve-sync (email file-name)
|
||||
(let ((gravatar-default-image "identicon")
|
||||
(gravatar-size nil)
|
||||
(coding-system-for-write 'binary)
|
||||
(write-region-annotate-functions nil)
|
||||
(write-region-post-annotation-function nil))
|
||||
(write-region
|
||||
(image-property (gravatar-retrieve-synchronously email) :data)
|
||||
nil file-name nil :silent)))
|
||||
#+end_src
|
||||
|
||||
These images have to be saved to a folder, with the name corresponding to the git username.
|
||||
#+begin_src emacs-lisp
|
||||
(setq my/gravatar-folder "/home/pavel/.cache/gravatars/")
|
||||
|
||||
(defun my/gravatar-save (email author)
|
||||
(let ((file-name (concat my/gravatar-folder author ".png")))
|
||||
(mkdir my/gravatar-folder t)
|
||||
(unless (file-exists-p file-name)
|
||||
(message "Fetching gravatar for %s (%s)" author email)
|
||||
(my/gravatar-retrieve-sync email file-name))))
|
||||
#+end_src
|
||||
**** Author names
|
||||
That's a hell of a function...
|
||||
|
||||
The problem it tries to solve is that, at least in the repos I'm working with, one person can have different commits signed by different emails with the same username, or by same username with different emails. So this function tries to extract and match all such users.
|
||||
|
||||
#+begin_src emacs-lisp
|
||||
(defun my/git-get-authors (repo &optional authors-init)
|
||||
(let* ((default-directory repo)
|
||||
(data (shell-command-to-string
|
||||
"git log --pretty=format:\"%ae|%an\" | sort | uniq -c | sed \"s/^[ \t]*//;s/ /|/\""))
|
||||
(authors
|
||||
(cl-loop for string in (split-string data "\n")
|
||||
if (= (length (split-string string "|")) 3)
|
||||
collect (let ((datum (split-string string "|")))
|
||||
`((count . ,(string-to-number (nth 0 datum)))
|
||||
(email . ,(downcase (nth 1 datum)))
|
||||
(author . ,(nth 2 datum)))))))
|
||||
(mapcar
|
||||
(lambda (datum)
|
||||
(setf (alist-get 'author datum)
|
||||
(car (cl-reduce
|
||||
(lambda (acc author)
|
||||
(if (> (cdr author) (cdr acc))
|
||||
author
|
||||
acc))
|
||||
(alist-get 'authors datum)
|
||||
:initial-value '(nil . -1))))
|
||||
(setf (alist-get 'email datum)
|
||||
(car (cl-reduce
|
||||
(lambda (acc email)
|
||||
(if (> (cdr email) (cdr acc))
|
||||
email
|
||||
acc))
|
||||
(alist-get 'emails datum)
|
||||
:initial-value '(nil . -1))))
|
||||
datum)
|
||||
(cl-reduce
|
||||
(lambda (acc val)
|
||||
(let* ((author (alist-get 'author val))
|
||||
(email (alist-get 'email val))
|
||||
(count (alist-get 'count val))
|
||||
(saved-value
|
||||
(seq-find
|
||||
(lambda (cand)
|
||||
(or (alist-get email (alist-get 'emails cand)
|
||||
nil nil #'string-equal)
|
||||
(alist-get author (alist-get 'authors cand)
|
||||
nil nil #'string-equal)
|
||||
(alist-get email (alist-get 'authors cand)
|
||||
nil nil #'string-equal)
|
||||
(alist-get author (alist-get 'emails cand)
|
||||
nil nil #'string-equal)))
|
||||
acc)))
|
||||
(if saved-value
|
||||
(progn
|
||||
(if (alist-get email (alist-get 'emails saved-value)
|
||||
nil nil #'string-equal)
|
||||
(cl-incf (alist-get email (alist-get 'emails saved-value)
|
||||
nil nil #'string-equal)
|
||||
count)
|
||||
(push (cons email count) (alist-get 'emails saved-value)))
|
||||
(if (alist-get author (alist-get 'authors saved-value)
|
||||
nil nil #'string-equal)
|
||||
(cl-incf (alist-get author (alist-get 'authors saved-value)
|
||||
nil nil #'string-equal)
|
||||
count)
|
||||
(push (cons author count) (alist-get 'authors saved-value))))
|
||||
(setq saved-value
|
||||
(push `((emails . ((,email . ,count)))
|
||||
(authors . ((,author . ,count))))
|
||||
acc)))
|
||||
acc))
|
||||
authors
|
||||
:initial-value authors-init))))
|
||||
#+end_src
|
||||
**** Get Gource Log
|
||||
#+begin_src emacs-lisp
|
||||
(defun my/gource-prepare-log (repo authors)
|
||||
(let ((log (shell-command-to-string
|
||||
(concat
|
||||
"gource --output-custom-log - "
|
||||
repo)))
|
||||
(authors-mapping (make-hash-table :test #'equal))
|
||||
(prefix (file-name-base repo)))
|
||||
(cl-loop for author-datum in authors
|
||||
for author = (alist-get 'author author-datum)
|
||||
do (my/gravatar-save (alist-get 'email author-datum) author)
|
||||
do (cl-loop for other-author in (alist-get 'authors author-datum)
|
||||
unless (string-equal (car other-author) author)
|
||||
do (puthash (car other-author) author
|
||||
authors-mapping)))
|
||||
(cl-loop for line in (split-string log "\n")
|
||||
concat (let ((fragments (split-string line "|")))
|
||||
(when (> (length fragments) 3)
|
||||
(when-let (mapped-author (gethash (nth 1 fragments)
|
||||
authors-mapping))
|
||||
(setf (nth 1 fragments) mapped-author))
|
||||
(setf (nth 3 fragments)
|
||||
(concat "/" prefix (nth 3 fragments))))
|
||||
(string-join fragments "|"))
|
||||
concat "\n")))
|
||||
#+end_src
|
||||
|
||||
#+begin_src emacs-lisp
|
||||
(defun my/gource-dired-create-logs (repos log-name)
|
||||
(interactive (list (or (dired-get-marked-files nil nil #'file-directory-p)
|
||||
(user-error "Select at least one directory"))
|
||||
(read-file-name "Log file name: " nil "combined.log")))
|
||||
(let* ((authors
|
||||
(cl-reduce
|
||||
(lambda (acc repo)
|
||||
(my/git-get-authors repo acc))
|
||||
repos
|
||||
:initial-value nil))
|
||||
(logs (string-join
|
||||
(seq-filter
|
||||
(lambda (line)
|
||||
(not (string-empty-p line)))
|
||||
(seq-sort-by
|
||||
(lambda (line)
|
||||
(if-let (time (car (split-string line "|")))
|
||||
(string-to-number time)
|
||||
0))
|
||||
#'<
|
||||
(split-string
|
||||
(mapconcat
|
||||
(lambda (repo)
|
||||
(my/gource-prepare-log repo authors))
|
||||
repos "\n")
|
||||
"\n")))
|
||||
"\n")))
|
||||
(with-temp-file log-name
|
||||
(insert logs))))
|
||||
#+end_src
|
||||
* Guix settings
|
||||
| Guix dependency | Description |
|
||||
|---------------------+-------------------------------|
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue