diff options
| -rw-r--r-- | attic/counsel.org (renamed from counsel.org) | 12 | ||||
| -rw-r--r-- | attic/w3m.org (renamed from w3m.org) | 0 | ||||
| -rw-r--r-- | consult.org | 12 | ||||
| -rw-r--r-- | exwm.org | 3 | ||||
| -rw-r--r-- | init.org | 46 | ||||
| -rw-r--r-- | readme.org | 23 |
6 files changed, 55 insertions, 41 deletions
diff --git a/counsel.org b/attic/counsel.org index 10268be..5732fb7 100644 --- a/counsel.org +++ b/attic/counsel.org @@ -229,6 +229,18 @@ (add-to-list 'cmap-targets #'jao-cmap-target-w3m-url) (add-to-list 'cmap-targets #'jao-cmap-target-video-url) #+end_src +* hooks + #+begin_src emacs-lisp + (with-eval-after-load "exwm" + (add-to-list 'exwm-input-global-keys '([?\s-r] . counsel-linux-app))) + + (with-eval-after-load "espotify" + (require 'ivy-spotify) + (defalias 'jao-spotify-album #'ivy-spotify-album) + (defalias 'jao-spotify-track #'ivy-spotify-track) + (defalias 'jao-spotify-artist #'ivy-spotify-artist) + (defalias 'jao-spotify-playlist #'ivy-spotify-playlist)) + #+end_src * startup #+begin_src emacs-lisp (ivy-mode 1) diff --git a/consult.org b/consult.org index 8fcf09b..76ebee7 100644 --- a/consult.org +++ b/consult.org @@ -385,6 +385,18 @@ (add-to-list 'embark-transformer-alist '(url . jao-embark-targets--refine-url)) (add-to-list 'embark-keymap-alist '(video-url . jao-embark-targets-video-url-map)) #+end_src +*** spotify + #+begin_src emacs-lisp + (with-eval-after-load "consult-spotify" + (embark-define-keymap spotify-item-keymap + "Actions for Spotify search results" + ("y" espotify-yank-candidate-url) + ("a" espotify-play-candidate-album) + ("h" espotify-show-candidate-info)) + + (add-to-list 'embark-keymap-alist + '(spotify-search-item . spotify-item-keymap))) + #+end_src * startup #+begin_src emacs-lisp (marginalia-mode 1) @@ -492,9 +492,6 @@ ([f7] . jao-toggle-audio-applet) ([f8] . jao-toggle-nm-applet))) - (when (eq 'counsel jao-completion-engine) - (add-to-list 'exwm-input-global-keys '([?\s-r] . counsel-linux-app))) - ;; (customize-set-variable 'exwm-input-global-keys exwm-input-global-keys) #+end_src @@ -917,11 +917,10 @@ #+end_src *** completion engine - We load either [[./consult.org][consult.org]] or [[./counsel.org][counsel.org]] to configure completion - engines: + We can load either [[./consult.org][consult.org]] or [[./attic/counsel.org][counsel.org]] to configure + completion engines: #+begin_src emacs-lisp - (defvar jao-completion-engine 'consult) - (jao-load-org (format "%s" jao-completion-engine)) + (jao-load-org "consult") #+end_src * Calendar, diary, weather *** Diary @@ -3313,11 +3312,18 @@ :init (setq geiser-repl-history-filename "~/.emacs.d/cache/geiser-history") (setq geiser-repl-startup-time 20000) - (setq geiser-debug-auto-display-images-p t) - (setq geiser-chez-binary "scheme")) + (setq geiser-debug-auto-display-images-p t)) + (jao-load-path "~/usr/jao/geiser/mit") (use-package geiser-mit) + (jao-load-path "~/usr/jao/geiser/chez") + (use-package geiser-chez + :init (setq geiser-chez-binary "scheme")) + + (jao-load-path "~/usr/jao/geiser/gambit") + (use-package geiser-gambit) + (jao-load-path "~/usr/jao/geiser/racket") (use-package geiser-racket) #+END_SRC @@ -3892,29 +3898,11 @@ (jao-load-path "espotify") (use-package espotify :demand t) - - (when (eq 'consult jao-completion-engine) - (use-package consult-spotify :demand t) - (defalias 'jao-spotify-album #'consult-spotify-album) - (defalias 'jao-spotify-track #'consult-spotify-track) - (defalias 'jao-spotify-artist #'consult-spotify-artist) - (defalias 'jao-spotify-playlist #'consult-spotify-playlist) - - (embark-define-keymap spotify-item-keymap - "Actions for Spotify search results" - ("y" espotify-yank-candidate-url) - ("a" espotify-play-candidate-album) - ("h" espotify-show-candidate-info)) - - (add-to-list 'embark-keymap-alist - '(spotify-search-item . spotify-item-keymap))) - - (when (eq 'counsel jao-completion-engine) - (require 'ivy-spotify) - (defalias 'jao-spotify-album #'ivy-spotify-album) - (defalias 'jao-spotify-track #'ivy-spotify-track) - (defalias 'jao-spotify-artist #'ivy-spotify-artist) - (defalias 'jao-spotify-playlist #'ivy-spotify-playlist)) + (use-package consult-spotify :demand t) + (defalias 'jao-spotify-album #'consult-spotify-album) + (defalias 'jao-spotify-track #'consult-spotify-track) + (defalias 'jao-spotify-artist #'consult-spotify-artist) + (defalias 'jao-spotify-playlist #'consult-spotify-playlist) #+end_src *** mpdel #+BEGIN_SRC emacs-lisp @@ -1,16 +1,19 @@ #+title: Emacs configuration and personal packages -#+PROPERTY: header-args :tangle ~/.emacs.d/init.el :comments yes :results silent +#+property: header-args :tangle ~/.emacs.d/init.el :comments yes :results silent +#+auto_tangle: t * Bootstrap This is the emacs standard init file, which will load (maybe - tangled) [[./init.org][init.org]] the file, checking first whether a fresh tangle is + tangled) the file [[./init.org][init.org]], checking first whether a fresh tangle is needed. Note that the rest of elisp tangling in init.org goes to a different file (namely, the one that is loaded by - =~/.emacs.d/init.el=). However, also note that if [[https://github.com/jingtaozf/literate-elisp/blob/master/literate-elisp.org][literate-elisp]] is - installed, we load instead directly the org file. It's because of - that that we start by setting up packages. + =~/.emacs.d/init.el=). - Here's the directory where a checkout of this repo live: + However, also note that if [[https://github.com/jingtaozf/literate-elisp/blob/master/literate-elisp.org][literate-elisp]] is installed, we load + instead directly the org file. It's because of that that we start + by setting up packages. + + Here's the directory where a checkout of this repo lives: #+begin_src emacs-lisp (defvar jao-emacs-dir (expand-file-name "~/etc/emacs")) @@ -33,7 +36,7 @@ and a tangling helper: - #+BEGIN_SRC emacs-lisp + #+begin_src emacs-lisp (defun jao-maybe-tangle (basename) (let ((el (expand-file-name (format "%s.el" basename) jao-emacs-dir)) (org (expand-file-name (format "%s.org" basename) jao-emacs-dir))) @@ -59,11 +62,13 @@ - [[./init.org][init.org]]: main configuration as a literate org file; it uses (besides lots of packages), many of my libraries in [[./lib][lib]], and loads on demand the other org files below. -- [[./org.org][org.org]] org mode configuration. - [[./consult.org][consult.org]]: completion setup using selectrum, consult and friends. -- [[./counsel.org][counsel.org]]: completion setup using ivy, counsel and friends. +- [[./org.org][org.org]] org mode configuration. - [[./blog.org][blog.org]]: blogging using org-static-blog. - [[./gnus.org][gnus.org]]: tangled to gnus.el automatically by init.org, so that it's ready for loading by Gnus. - [[./exwm.org][exwm.org]]: configuration for exwm, loaded when ~jao-exwmn-enable~ is called. + +The [[./attic][attic]] contains other literate configuration files not currently +used by init.org. |