Browse Source

Update

master
Nicolas Petton 9 months ago
parent
commit
986296e881
No known key found for this signature in database GPG Key ID: E8BCD7866AFCF978
17 changed files with 1104 additions and 1059 deletions
  1. +765
    -730
      custom.el
  2. +1
    -1
      etc/quelpa/recipes/ftgp
  3. +1
    -1
      etc/quelpa/recipes/indium
  4. +0
    -1
      etc/quelpa/recipes/khardel
  5. +0
    -0
      etc/quelpa/recipes/queue
  6. +1
    -1
      etc/yasnippet/snippets/fundamental-mode/email
  7. +0
    -10
      etc/yasnippet/snippets/org-mode/.yas-compiled-snippets.el
  8. +8
    -0
      etc/yasnippet/snippets/org-mode/article
  9. +8
    -0
      etc/yasnippet/snippets/org-mode/book
  10. +0
    -7
      etc/yasnippet/snippets/org-mode/html.yasnippet
  11. +5
    -0
      etc/yasnippet/snippets/org-mode/keywords
  12. +0
    -10
      etc/yasnippet/snippets/org-mode/meditation.yasnippet
  13. +0
    -14
      etc/yasnippet/snippets/org-mode/project.yasnippet
  14. +1
    -1
      hosts/blueberry/init-notmuch.el
  15. +0
    -218
      hosts/blueberry/init-org.el
  16. +308
    -12
      hosts/blueberry/init.el
  17. +6
    -53
      init.el

+ 765
- 730
custom.el
File diff suppressed because it is too large
View File


+ 1
- 1
etc/quelpa/recipes/ftgp View File

@ -1 +1 @@
(ftgp :fetcher git :url "git@gitea.petton.fr:ftgp/emacs.git")
(ftgp :fetcher git :url "git@git.petton.fr:ftgp/emacs.git")

+ 1
- 1
etc/quelpa/recipes/indium View File

@ -1 +1 @@
(indium :fetcher git :url "git@gitea.petton.fr:nico/Indium.git" :old-names (jade))
(indium :fetcher git :url "git@git.petton.fr:nico/Indium.git" :old-names (jade))

+ 0
- 1
etc/quelpa/recipes/khardel View File

@ -1 +0,0 @@
(khardel :fetcher git :url "https://gitlab.petton.fr/DamienCassou/khardel.git")

+ 0
- 0
etc/quelpa/recipes/queue View File


+ 1
- 1
etc/yasnippet/snippets/fundamental-mode/email View File

@ -1,4 +1,4 @@
# name: (user's email)
# key: email
# --
`user-mail-address`ftgp
`user-mail-address`

+ 0
- 10
etc/yasnippet/snippets/org-mode/.yas-compiled-snippets.el View File

@ -1,10 +0,0 @@
;;; Compiled snippets and support files for `org-mode'
;;; Snippet definitions:
;;;
(yas-define-snippets 'org-mode
'(("p" "** $1\n:PROPERTIES:\n:ORDERED: t\n:END:\n\n- Why? \n\n- Outcome: \n\n*** TODO $0" "project" nil nil nil "/home/nico/.emacs.d/etc/yasnippet/snippets/org-mode/project.yasnippet" nil nil)
("med" "* <`(format-time-string \"%Y-%m-%d %a\")`>\n** What did I do wrong?\n$1\n** What did I do right?\n\n** What duty’s left undone?" "meditation" nil nil nil "/home/nico/.emacs.d/etc/yasnippet/snippets/org-mode/meditation.yasnippet" nil nil)
("html" "#+BEGIN_HTML\n$1\n#+END_HTML" "html block" nil nil nil "/home/nico/.emacs.d/etc/yasnippet/snippets/org-mode/html.yasnippet" nil nil)))
;;; Do not edit! File generated at Mon Jan 7 17:38:42 2019

+ 8
- 0
etc/yasnippet/snippets/org-mode/article View File

@ -0,0 +1,8 @@
# -*- mode: snippet -*-
# name: article
# key: article
# --
- Author: $0
- Source:
- Recommended By:
- Keywords: [[file:2021-02-15-article.org][Article]]

+ 8
- 0
etc/yasnippet/snippets/org-mode/book View File

@ -0,0 +1,8 @@
# -*- mode: snippet -*-
# name: book
# key: book
# --
- Author: $0
- Reading Status:
- Recommended By:
- Keywords: [[file:2021-02-15-book.org][Book]]

+ 0
- 7
etc/yasnippet/snippets/org-mode/html.yasnippet View File

@ -1,7 +0,0 @@
# -*- mode: snippet -*-
# name: html block
# key: html
# --
#+BEGIN_HTML
$1
#+END_HTML

+ 5
- 0
etc/yasnippet/snippets/org-mode/keywords View File

@ -0,0 +1,5 @@
# -*- mode: snippet -*-
# name: keywords
# key: kw
# --
- Keywords: $0

+ 0
- 10
etc/yasnippet/snippets/org-mode/meditation.yasnippet View File

@ -1,10 +0,0 @@
# -*- mode: snippet -*-
# name: meditation
# key: med
# --
* <`(format-time-string "%Y-%m-%d %a")`>
** What did I do wrong?
$1
** What did I do right?
** What duty’s left undone?

+ 0
- 14
etc/yasnippet/snippets/org-mode/project.yasnippet View File

@ -1,14 +0,0 @@
# -*- mode: snippet -*-
# name: project
# key: p
# --
** $1
:PROPERTIES:
:ORDERED: t
:END:
- Why?
- Outcome:
*** TODO $0

+ 1
- 1
hosts/blueberry/init-notmuch.el View File

@ -66,7 +66,7 @@ I.e., the keyring has a public key for each recipient."
(mml-secure-message-sign-encrypt)))
(add-hook 'message-send-hook #'my/add-encryption-mark-if-possible)
;; (remove-hook 'message-send-hook #'my/add-encryption-mark-if-possible)
(add-hook 'message-setup-hook #'yas-minor-mode-on)


+ 0
- 218
hosts/blueberry/init-org.el View File

@ -1,218 +0,0 @@
(require 'cl-lib)
(require 'org)
(require 'org-element)
(require 'org-pomodoro)
(require 'org-jira-protocol)
(require 'org-gogs-protocol)
(require 'org-sip-protocol)
(require 'org-debbugs-protocol)
(require 'ob-js)
(require 'ox-md)
(require 'avy)
(require 'ivy)
(require 's)
(require 'seq)
(add-hook 'org-mode-hook #'org-indent-mode)
;; preserve the indentation inside of source blocks
(setq org-src-preserve-indentation t)
(defface nico-org-buffer-face
'((t :family "Gentium Book Basic"
:height 1.3))
"Temporary buffer-local face")
(defun nico-set-org-buffer-face ()
(buffer-face-set 'nico-org-buffer-face ))
;; (add-hook 'org-mode-hook #'nico-set-org-buffer-face)
;; Allow's electric-pair-mode to surround things with = and ~ in org-mode
(modify-syntax-entry ?~ "(~" org-mode-syntax-table)
(modify-syntax-entry ?= "(=" org-mode-syntax-table)
(add-to-list 'auto-mode-alist '("\\.org$" . org-mode))
(define-key global-map "\C-cl" #'org-store-link)
(define-key global-map "\C-ca" #'org-agenda)
(define-key global-map "\C-cb" #'org-iswitchb)
(define-key global-map "\C-cc" #'org-capture)
(define-key global-map "\C-cp" #'org-pomodoro)
(define-key org-mode-map (kbd "C-c C-j") #'avy-goto-word-1)
(define-key org-agenda-mode-map (kbd "C-c C-j") #'avy-goto-word-1)
(define-key org-mode-map (kbd "M-i") #'nico-org-imenu)
(defun nico-org-imenu (&optional arg)
"Like `counsel-imenu'.
With a prefix argument ARG, narrow the
buffer to the matched subtree."
(interactive "P")
(counsel-imenu)
(when arg
(org-narrow-to-subtree)))
(org-babel-do-load-languages
'org-babel-load-languages
'((ditaa . t)
(js . t)
(emacs-lisp . t)))
;; Fontify org-mode code blocks
(setq org-src-fontify-natively t)
(defvar nico/org-agenda-file "~/org/agenda.org")
(defvar nico/org-shared-agenda-file "~/org/shared.org")
(setq org-default-notes-file "~/org/inbox.org")
(setq org-agenda-files `(,org-default-notes-file
,nico/org-agenda-file
,nico/org-shared-agenda-file))
(setq org-refile-targets `((,nico/org-agenda-file :level . 1)
("~/org/inbox.org" :maxlevel . 1)
(,nico/org-shared-agenda-file :maxlevel . 1)))
(defun nico/find-notes-file ()
(interactive)
(find-file org-default-notes-file))
;; Export TODO items in iCal too
(setq org-icalendar-include-todo t)
;; org-capture
(setq org-capture-templates '())
(add-to-list 'org-capture-templates
'("t" "Todo [inbox]" entry (file org-default-notes-file)
"* TODO %i%?"))
(add-to-list 'org-capture-templates
'("l" "Todo (with link) [inbox]" entry (file org-default-notes-file)
"* TODO %? %a"))
(add-to-list 'org-capture-templates
'("p" "Appt [agenda]" entry (file nico/org-shared-agenda-file)
"* %i%? \n%^T"))
(defvar french-holiday
'((holiday-fixed 1 1 "Jour de l'an")
(holiday-fixed 5 1 "Fête du travail")
(holiday-fixed 5 8 "Victoire 45")
(holiday-fixed 7 14 "Fête nationale")
(holiday-fixed 8 15 "Assomption")
(holiday-fixed 11 1 "Toussaint")
(holiday-fixed 11 11 "Armistice 18")
(holiday-fixed 12 25 "Noël")
(holiday-easter-etc 1 "Lundi de Pâques")
(holiday-easter-etc 39 "Ascension")
(holiday-easter-etc 50 "Lundi de Pentecôte")))
(setq calendar-date-style 'european
calendar-holidays french-holiday
calendar-mark-holidays-flag t)
(defun nico/org-archive-done-tasks ()
"Archive all DONE entries"
(interactive)
(org-map-entries
(lambda ()
(org-archive-subtree)
(setq org-map-continue-from (outline-previous-heading)))
"/DONE" 'file))
;; Custom agenda function, see customized 'org-agenda-custom-commands.
;; Open the agenda in org-agenda-log-mode, with the archive file, and
;; for the previous week. To work well, 'org-log-done should be set to
;; 't, to ensure that everything is in the agenda.
(defun nico/org-agenda-log (arg)
(org-agenda-archives-mode)
(org-agenda-list arg)
(org-agenda-log-mode)
(org-agenda-earlier 1))
(defun org-agenda-skip-all-siblings-but-first ()
(let (should-skip-entry)
(unless (org-current-is-todo)
(setq should-skip-entry t))
(save-excursion
(while (and (not should-skip-entry) (org-goto-sibling t))
(when (org-current-is-todo)
(setq should-skip-entry t))))
(when should-skip-entry
(or (outline-next-heading)
(goto-char (point-max))))))
(defun org-current-is-todo ()
(string= "TODO" (org-get-todo-state)))
(defun org-agenda-format-parent (n)
;; (s-truncate n (org-format-outline-path (org-get-outline-path)))
(save-excursion
(save-restriction
(widen)
(org-up-heading-safe)
(s-truncate n (org-get-heading t t)))))
(add-hook 'before-save-hook
#'nico/org-align-all-tags)
(defun nico/org-align-all-tags ()
(interactive)
(when (eq major-mode 'org-mode)
(org-align-all-tags)))
(defun nico/org-update-parent-cookie ()
(when (eq major-mode 'org-mode)
(save-excursion
(ignore-errors
(org-back-to-heading)
(org-update-parent-todo-statistics)))))
(defadvice org-kill-line (after fix-cookies activate)
(nico/org-update-parent-cookie))
(defadvice kill-whole-line (after fix-cookies activate)
(nico/org-update-parent-cookie))
(defadvice org-archive-subtree (after fix-cookies activate)
(nico/org-update-parent-cookie))
;; (add-hook 'after-save-hook
;; #'nico/org-export-buffer)
(defun nico/org-export-buffer ()
(let* ((file-name (buffer-file-name))
(file-exists (and file-name
(file-exists-p file-name))))
(when (and file-name (eq major-mode 'org-mode))
(org-export-to-file 'html (format "%s.html" (file-name-sans-extension file-name))))))
(org-babel-do-load-languages
'org-babel-load-languages
'((shell . t)))
;; Notifications
(appt-activate t)
(setq appt-display-format 'window)
(setq appt-disp-window-function #'appt-disp-window)
(setq appt-display-mode-line t)
;; Caldav
(setq gnutls-algorithm-priority "NORMAL:-VERS-TLS1.3")
(use-package org-caldav
:bind (("C-c S" . org-caldav-sync))
:config
(progn
(setq org-caldav-url "https://dav.petton.fr/nico"
org-caldav-calendar-id "882703e4-1ee8-e657-dcec-5b5fe7a2ff52"
org-caldav-inbox "~/org/shared.org"
org-caldav-files '()
org-icalendar-timezone "Europe/Paris"
org-caldav-sync-changes-to-org 'all)))
(provide 'init-org)

+ 308
- 12
hosts/blueberry/init.el View File

@ -26,23 +26,14 @@
;; $HOME/.profile or similar.
(setenv "SSH_AUTH_SOCK"
(string-trim
(shell-command-to-string "gpgconf --list-dirs agent-ssh-socket")))
;; Use pinentry-emacs
;; (pinentry-start)
))
(use-package init-org
:demand t)
(shell-command-to-string "gpgconf --list-dirs agent-ssh-socket")))))
(use-package init-org-publish
:demand t)
:after org)
(use-package init-notmuch
:demand t)
;; (use-package init-exwm
;; :demand t)
(use-package flycheck-ledger
:demand t
:after (flycheck ledger-mode)
@ -56,6 +47,267 @@
:init (progn
(add-hook 'ledger-mode-hook #'company-mode)))
(use-package olivetti
:hook (org-mode . olivetti-mode)
:config (progn
(setq-default olivetti-body-width 80)))
(use-package org
:hook ((org-mode . org-indent-mode))
:bind (:map global-map
(("C-c l" . org-store-link)
("C-c a" . org-agenda)
("C-c c" . org-capture)
("C-c p" . org-pomodoro))
:map org-mode-map
(("C-c C-j" . avy-goto-word-1)
("M-," . org-mark-ring-goto)
("M-." . nico-org-open-at-point-same-window)))
:config (progn
;; preserve the indentation inside of source blocks
(setq org-src-preserve-indentation t)
;; Allow electric-pair-mode to surround things with = and ~ in org-mode
(modify-syntax-entry ?~ "(~" org-mode-syntax-table)
(modify-syntax-entry ?= "(=" org-mode-syntax-table)
(org-babel-do-load-languages
'org-babel-load-languages
'((ditaa . t)
(js . t)
(emacs-lisp . t)))
;; Fontify org-mode code blocks
(setq org-src-fontify-natively t)
;; Export TODO items in iCal too
(setq org-icalendar-include-todo t)
;; org-capture
(setq org-capture-templates '())
(add-to-list 'org-capture-templates
'("p" "Appt [agenda]" entry (file "~/org/agenda.org")
"* %i%? \n%^T"))
(add-to-list 'org-capture-templates
'("p" "Appt [shared]" entry (file "~/org/shared.org")
"* %i%? \n%^T"))
(defvar french-holiday
'((holiday-fixed 1 1 "Jour de l'an")
(holiday-fixed 5 1 "Fête du travail")
(holiday-fixed 5 8 "Victoire 45")
(holiday-fixed 7 14 "Fête nationale")
(holiday-fixed 8 15 "Assomption")
(holiday-fixed 11 1 "Toussaint")
(holiday-fixed 11 11 "Armistice 18")
(holiday-fixed 12 25 "Noël")
(holiday-easter-etc 1 "Lundi de Pâques")
(holiday-easter-etc 39 "Ascension")
(holiday-easter-etc 50 "Lundi de Pentecôte")))
(setq calendar-date-style 'european
calendar-holidays french-holiday
calendar-mark-holidays-flag t)
(defun nico-org-open-at-point-same-window ()
"Like `org-open-at-point', but configured to open in the same window."
(interactive)
(let ((org-link-frame-setup '((file . find-file))))
(org-open-at-point)))
(defun org-agenda-skip-all-siblings-but-first ()
(let (should-skip-entry)
(unless (org-current-is-todo)
(setq should-skip-entry t))
(save-excursion
(while (and (not should-skip-entry) (org-goto-sibling t))
(when (org-current-is-todo)
(setq should-skip-entry t))))
(when should-skip-entry
(or (outline-next-heading)
(goto-char (point-max))))))
(defun org-current-is-todo ()
(string= "TODO" (org-get-todo-state)))
(defun org-agenda-format-parent (n)
;; (s-truncate n (org-format-outline-path (org-get-outline-path)))
(save-excursion
(save-restriction
(widen)
(org-up-heading-safe)
(s-truncate n (org-get-heading t t)))))
(add-hook 'before-save-hook
#'nico/org-align-all-tags)
(defun nico/org-align-all-tags ()
(interactive)
(when (eq major-mode 'org-mode)
(org-align-all-tags)))
(defun nico/org-update-parent-cookie ()
(when (eq major-mode 'org-mode)
(save-excursion
(ignore-errors
(org-back-to-heading)
(org-update-parent-todo-statistics)))))
(defadvice org-kill-line (after fix-cookies activate)
(nico/org-update-parent-cookie))
(defadvice kill-whole-line (after fix-cookies activate)
(nico/org-update-parent-cookie))
(defadvice org-archive-subtree (after fix-cookies activate)
(nico/org-update-parent-cookie))))
(use-package org-caldav
:after org
:bind (("C-c S" . org-caldav-sync))
:config
(progn
(setq gnutls-algorithm-priority "NORMAL:-VERS-TLS1.3")
(setq org-caldav-url "https://dav.petton.fr/nico"
org-caldav-calendar-id "882703e4-1ee8-e657-dcec-5b5fe7a2ff52"
org-caldav-inbox "~/org/shared.org"
org-caldav-files '()
org-icalendar-timezone "Europe/Paris"
org-caldav-sync-changes-to-org 'all)))
(use-package org-pomodoro
:after org)
(use-package org-superstar
:after org
:hook (org-mode . org-superstar-mode)
:config (progn
(setq org-superstar-headline-bullets-list '(8226))
(setq org-superstar-special-todo-items t)))
(use-package org-roam
:hook (after-init . org-roam-mode)
:custom
(org-id-link-to-org-use-id t)
;; When renaming, links get updated after 2sec idle, which can lead to issues
;; when renaming multiple times without idling, see
;; https://github.com/org-roam/org-roam/issues/1425#issuecomment-775715148
(org-roam-db-update-method 'immediate)
(org-roam-directory "~/org/roam/")
(org-roam-db-location (expand-file-name "roam.db" org-roam-directory))
(org-roam-completion-system 'ivy)
(org-roam-buffer-position 'right)
(org-roam-dailies-capture-templates '(
("d" "default" plain #'org-roam-capture--get-point
"%?"
:file-name "daily/%<%Y-%m-%d>"
:head "#+title: %<%Y-%m-%d>\n")
("t" "Todo" plain #'org-roam-capture--get-point
"* TODO %?"
:file-name "daily/%<%Y-%m-%d>"
:head "#+title: %<%Y-%m-%d>\n")))
(org-roam-capture-templates '(("d" "default" plain #'org-roam-capture--get-point
"%?"
:file-name "%<%Y-%m-%d>-${slug}"
:head "#+title: ${title}\n#+created: %T\n#+Time-stamp: %T\n\n")))
:bind (:map org-roam-mode-map
(("C-c r l" . org-roam)
("C-c r f" . org-roam-find-file)
("C-c r g" . org-roam-graph)
("C-c r p" . org-roam-dailies-find-previous-note)
("C-c r n" . org-roam-dailies-find-next-note))
:map org-mode-map
(("C-c r i" . org-roam-insert)
("C-c r I" . org-roam-insert-immediate))
:map global-map
(("C-c r ." . org-roam-dailies-find-today)
("C-c r t" . org-roam-dailies-find-today)
("C-c r d" . org-roam-dailies-capture-today)
("C-c RET" . org-roam-capture)))
:config (progn
(setq org-default-notes-file "~/org/roam/2021-02-14-inbox.org")
;;
;; Task management with org-roam inspired by https://d12frosted.io/
;;
(defun nico-org-project-p ()
"Return non-nil if current buffer has any todo entry.
TODO entries marked as done are ignored, meaning the this
function returns nil if current buffer contains only completed
tasks."
(seq-find
(lambda (type)
(eq type 'todo))
(org-element-map
(org-element-parse-buffer 'headline)
'headline
(lambda (headline)
(org-element-property :todo-type headline)))))
(defun nico-org-project-update-tag ()
"Update PROJECT tag in the current buffer."
(when (and (not (active-minibuffer-window))
(nico-org-roam-buffer-p))
(let* ((file (buffer-file-name (buffer-base-buffer)))
(all-tags (org-roam--extract-tags file))
(prop-tags (org-roam--extract-tags-prop file))
(tags prop-tags))
(if (nico-org-project-p)
(setq tags (cons "Project" tags))
(setq tags (remove "Project" tags)))
(unless (eq prop-tags tags)
(org-roam--set-global-prop
"ROAM_TAGS"
(combine-and-quote-strings (seq-uniq tags)))))))
(defun nico-org-roam-buffer-p ()
"Return non-nil if the currently visited buffer is a note."
(and buffer-file-name
(string-prefix-p
(expand-file-name (file-name-as-directory org-roam-directory))
(file-name-directory buffer-file-name))))
(add-hook 'find-file-hook #'nico-org-project-update-tag)
(add-hook 'before-save-hook #'nico-org-project-update-tag)
(defun nico-org-project-files ()
"Return a list of note files containing Project tag."
(seq-map
#'car
(org-roam-db-query
[:select file
:from tags
:where (like tags (quote "%\"Project\"%"))])))
(defun nico-org-agenda-files-update (&rest _)
"Update the value of `org-agenda-files'."
(setq org-agenda-files `("~/org/agenda.org"
"~/org/shared.org"
,@(nico-org-project-files))))
(advice-add 'org-agenda :before #'nico-org-agenda-files-update)))
(use-package org-roam-protocol
:demand t)
(use-package org-roam-server
:config (progn
(setq org-roam-server-host "127.0.0.1"
org-roam-server-port 8080
org-roam-server-authenticate nil
org-roam-server-export-inline-images t
org-roam-server-serve-files nil
org-roam-server-served-file-extensions '("pdf" "mp4" "ogv")
org-roam-server-network-poll t
org-roam-server-network-arrows nil
org-roam-server-network-label-truncate t
org-roam-server-network-label-truncate-length 60
org-roam-server-network-label-wrap-length 20)))
(use-package ox-twbs
:after org)
(use-package prodigy
:config
(prodigy-define-service
@ -91,7 +343,51 @@
:tags '(personal)))
(when (window-system)
(set-face-attribute 'default nil :height 110 :family "Fira Mono"))
(require 'markdown-mode)
(set-face-attribute 'default nil :height 110 :family "Fira Mono")
(setq-default line-spacing 2)
;; (set-face-attribute 'variable-pitch nil :height 150 :font "ETBembo")
(set-face-attribute 'variable-pitch nil :height 140 :font "Gentium Book Basic")
;; (set-face-attribute 'variable-pitch nil :height 130 :font "Fira Sans")
(add-hook 'org-mode-hook 'variable-pitch-mode)
;; Set some faces as fixed pitch
(with-eval-after-load 'org
(mapc (lambda (face)
(let* ((inherited (face-attribute face :inherit))
(inherited-list (if (listp inherited)
inherited
(list inherited))))
(set-face-attribute
face nil
:height 110
:inherit `(fixed-pitch ,@inherited-list))))
'(org-drawer
org-verbatim
org-code
org-block
org-block-begin-line
org-block-end-line
org-table
org-block-begin-line
org-block-end-line
org-meta-line
org-todo
org-done
org-special-keyword
org-document-info-keyword
markdown-pre-face
markdown-code-face))
;; Some more custom fonts for org-mode
(set-face-attribute 'org-drawer nil :height 100)
(set-face-attribute 'org-document-info-keyword nil :height 100)
(set-face-attribute 'org-meta-line nil :height 100)
(set-face-attribute 'outline-1 nil :weight 'normal)
(set-face-attribute 'outline-2 nil :weight 'normal)
(set-face-attribute 'outline-3 nil :weight 'normal)
(set-face-attribute 'outline-4 nil :weight 'normal)
(set-face-attribute 'outline-5 nil :weight 'normal)
(set-face-attribute 'outline-6 nil :weight 'normal)))
;; Local Variables:
;; indent-tabs-mode: nil


+ 6
- 53
init.el View File

@ -322,6 +322,9 @@
(use-package pcmpl-git
:after pcomplete)
(use-package exec-path-from-shell
:init (exec-path-from-shell-initialize))
(use-package expand-region
:bind (("C-=" . er/expand-region)))
@ -405,7 +408,7 @@ be global."
(use-package ivy
:demand t
:bind (("C-c r" . ivy-resume))
;; :bind (("C-c r" . ivy-resume))
:config (progn
(ivy-mode 1)
(setq ivy-use-virtual-buffers t)
@ -435,6 +438,7 @@ be global."
(set-buffer buf)
(delete-region (point-min) (point-max))
(insert node-contents)))))
(use-package emacs-js
:commands (setup-js-buffer)
:init
@ -497,10 +501,6 @@ be global."
(add-hook 'lisp-interaction-mode-hook #'indent-spaces-mode))
(use-package magit
:bind (("C-x g" . magit-status)
("C-x M-g" . magit-dispatch-popup)
:map magit-mode-map
("C" . magit-commit-add-log))
:config (progn
;; (magit-add-section-hook 'magit-status-sections-hook
;; 'magit-insert-modules
@ -616,53 +616,6 @@ be global."
(use-package open-url-at-point
:bind ("C-c C-o" . open-url-at-point))
(use-package org-roam
:ensure t
:hook
(after-init . org-roam-mode)
:custom
(org-roam-directory "~/org/roam/")
(org-roam-db-location (expand-file-name "roam.db" org-roam-directory))
(org-roam-completion-system 'ivy)
(org-roam-dailies-directory)
(org-roam-capture-templates '(
("d" "default" plain #'org-roam-capture--get-point
"%?"
:file-name "%<%Y-%m-%d>-${slug}"
:head "#+title: ${title}\n#+created: %T\n#+Time-stamp: %T\n\n"
:unnarrowed t)))
:bind (:map org-roam-mode-map
(("C-c r l" . org-roam)
("C-c r f" . org-roam-find-file)
("C-c r g" . org-roam-graph)
("C-c r d" . org-roam-dailies-today))
:map org-mode-map
(("C-c r i" . org-roam-insert))
(("C-c r I" . org-roam-insert-immediate))))
(use-package org-roam-protocol
:demand t
:after org-roam)
(use-package org-roam-server
:ensure t
:config
(setq org-roam-server-host "127.0.0.1"
org-roam-server-port 8080
org-roam-server-authenticate nil
org-roam-server-export-inline-images t
org-roam-server-serve-files nil
org-roam-server-served-file-extensions '("pdf" "mp4" "ogv")
org-roam-server-network-poll t
org-roam-server-network-arrows nil
org-roam-server-network-label-truncate t
org-roam-server-network-label-truncate-length 60
org-roam-server-network-label-wrap-length 20))
(use-package ox-twbs
:demand t
:after org)
(use-package paredit
:demand t
:bind (:map paredit-mode-map
@ -754,7 +707,7 @@ be global."
:bind (("C-'" . shell-switcher-switch-buffer)
("C-M-'" . shell-switcher-new-shell))
:config (progn
(setq shell-switcher-new-shell-function #'vterm)))
(setq shell-switcher-new-shell-function #'eshell)))
(use-package simple
:config (column-number-mode))


Loading…
Cancel
Save