summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--attic/misc.org72
-rw-r--r--completion.org14
-rw-r--r--init.org74
3 files changed, 85 insertions, 75 deletions
diff --git a/attic/misc.org b/attic/misc.org
index b902e18..2daefcd 100644
--- a/attic/misc.org
+++ b/attic/misc.org
@@ -1,5 +1,57 @@
#+title: Miscellaneous config bits that i don't use anymore
+* elixir
+*** packages
+ #+begin_src emacs-lisp
+ (use-package elixir-mode
+ :ensure t
+ :custom (lsp-clients-elixir-server-executable
+ (expand-file-name "~/usr/share/elixir-ls/language_server.sh"))
+ ;; :bind (:map elixir-mode-map (("C-c C-z" . jao-vterm-repl-pop-to-repl)))
+ )
+
+ (use-package mix
+ :ensure t
+ :hook (elixir-mode . mix-minor-mode)
+ ;; :init (jao-vterm-repl-register "mix.exs" "iex -S mix" "^iex([0-9]+)> ")
+ :diminish ((mix-minor-mode . "")))
+
+ (use-package exunit :ensure t)
+ #+end_src
+*** hydra
+ #+begin_src emacs-lisp
+ (major-mode-hydra-define elixir-mode nil
+ ("Doc"
+ (("dd" lsp-describe-thing-at-point "Describe thing at point"))
+ "Xref"
+ (("xd" xref-find-definitions "Definitions")
+ ("xo" xref-find-definitions-other-window "-> other win")
+ ("xr" xref-find-references "References"))
+ "LSP"
+ (("lg" lsp-goto-implementation "Implementation")
+ ("lf" lsp-format-buffer "Format buffer")
+ ("ls" lsp-describe-session "Describe session"))
+ "LSP modes"
+ (("Tl" lsp-lens-mode "Lens mode" :toggle t)
+ ("Td" lsp-modeline-diagnostics-mode "Modeline diagnostics" :toggle t)
+ ("Tb" lsp-headerline-breadcrumb-mode "Header breadcrumb" :toggle t)
+ ("Ti" lsp-toggle-trace-io "Trace I/O" :toggle lsp-print-io))
+ "Mix"
+ (("me" mix-execute-task "Execute mix task")
+ ("mt" mix-test "Run tests")
+ ("mc" mix-compile "Compile")
+ ("mm" jao-elixir-pop-to-iex "Pop to iex"))
+ "Mix subproject"
+ (("Me" (lambda () (interactive) (mix-execute-task nil t))
+ "Execute task")
+ ("Mt" (lambda () (interactive) (mix-compile nil t)) "Compile")
+ ("Mt" (lambda () (interactive) (mix-test nil t)) "Run tests"))
+ "Tests"
+ (("tt" exunit-verify-single "Run single test")
+ ("tr" exunit-rerun "Re-run tests")
+ ("ta" exunit-verify "Run test suites")
+ ("tA" exunit-verify-all "Run all test suites"))))
+ #+end_src
* mpdel
#+BEGIN_SRC emacs-lisp
(jao-load-path "libmpdel")
@@ -508,3 +560,23 @@
(use-package jao-vterm-repl)
(jao-define-attached-buffer "^\\* vrepl - .+ \\*.*")
#+end_src
+* ednc
+ #+begin_src emacs-lisp
+ (use-package ednc
+ :ensure t
+ :diminish)
+
+ (use-package jao-ednc
+ :after ednc
+ :commands (jao-ednc-setup)
+ :config
+ (jao-ednc-ignore-app "Spotify")
+ (jao-ednc-ignore-app "NetworkManager")
+ (defhydra jao-hydra-ednc (:color blue)
+ "Notifications"
+ ("s" jao-ednc-show "show last")
+ ("d" jao-ednc-dismiss "dismiss last")
+ ("D" jao-ednc-dismiss-all "dismiss all")
+ ("i" jao-ednc-invoke-last-action "invoke last action")
+ ("n" jao-ednc-pop "show all")))
+ #+end_src
diff --git a/completion.org b/completion.org
index b3b5964..5fb95ad 100644
--- a/completion.org
+++ b/completion.org
@@ -7,7 +7,7 @@
(use-package emacs
:init
(setq completion-category-defaults nil
- completion-cycle-threshold 3
+ completion-cycle-threshold nil
completion-category-overrides
'((file (styles . (partial-completion))))))
#+end_src
@@ -35,13 +35,23 @@
(use-package corfu
:ensure t
:init (setq corfu-cycle t
+ corfu-count 10
+ corfu-no-match (propertize "ยทยทยท" 'face 'bold)
+ corfu-auto t
corfu-min-width 20
- corfu-max-width 100)
+ corfu-max-width 100
+ corfu-excluded-modes '(eshell-mode))
:bind (:map corfu-map
("TAB" . corfu-next)
("S-TAB" . corfu-previous)))
(corfu-global-mode 1)
+
+ (with-eval-after-load "eshell"
+ (defun jao-corfu-eshell ()
+ (setq-local corfu-auto nil)
+ (corfu-mode 1))
+ (add-hook 'eshell-mode-hook #'jao-corfu-eshell))
#+end_src
* vertico
#+begin_src emacs-lisp
diff --git a/init.org b/init.org
index ff01bd8..7e2f199 100644
--- a/init.org
+++ b/init.org
@@ -427,7 +427,7 @@
(jao-load-org "exwm.org")
(setq jao-exwm-enabled-p t)
(display-time-mode -1)
- (jao-ednc-setup 95)
+ ;; (jao-ednc-setup 95)
(exwm-enable)
(jao-minibuffer-adjust-mode-line-faces)
(jao-trisect t)
@@ -707,26 +707,6 @@
:init (setq jao-tracking-bkg
(if (jao-colors-scheme-dark-p) "grey20" "grey93")))
#+end_src
-*** ednc
- #+begin_src emacs-lisp
- (use-package ednc
- :ensure t
- :diminish)
-
- (use-package jao-ednc
- :after ednc
- :commands (jao-ednc-setup)
- :config
- (jao-ednc-ignore-app "Spotify")
- (jao-ednc-ignore-app "NetworkManager")
- (defhydra jao-hydra-ednc (:color blue)
- "Notifications"
- ("s" jao-ednc-show "show last")
- ("d" jao-ednc-dismiss "dismiss last")
- ("D" jao-ednc-dismiss-all "dismiss all")
- ("i" jao-ednc-invoke-last-action "invoke last action")
- ("n" jao-ednc-pop "show all")))
- #+end_src
* Calendar, diary, weather
*** Diary
#+BEGIN_SRC emacs-lisp
@@ -2333,58 +2313,6 @@
(idris-stay-in-current-window-on-compiler-error t)))
(jao-define-attached-buffer "^\\*idris.*" 0.4)
#+end_src
-*** Elixir
-***** packages
- #+begin_src emacs-lisp
- (use-package elixir-mode
- :ensure t
- :custom (lsp-clients-elixir-server-executable
- (expand-file-name "~/usr/share/elixir-ls/language_server.sh"))
- ;; :bind (:map elixir-mode-map (("C-c C-z" . jao-vterm-repl-pop-to-repl)))
- )
-
- (use-package mix
- :ensure t
- :hook (elixir-mode . mix-minor-mode)
- ;; :init (jao-vterm-repl-register "mix.exs" "iex -S mix" "^iex([0-9]+)> ")
- :diminish ((mix-minor-mode . "")))
-
- (use-package exunit :ensure t)
- #+end_src
-***** hydra
- #+begin_src emacs-lisp
- (major-mode-hydra-define elixir-mode nil
- ("Doc"
- (("dd" lsp-describe-thing-at-point "Describe thing at point"))
- "Xref"
- (("xd" xref-find-definitions "Definitions")
- ("xo" xref-find-definitions-other-window "-> other win")
- ("xr" xref-find-references "References"))
- "LSP"
- (("lg" lsp-goto-implementation "Implementation")
- ("lf" lsp-format-buffer "Format buffer")
- ("ls" lsp-describe-session "Describe session"))
- "LSP modes"
- (("Tl" lsp-lens-mode "Lens mode" :toggle t)
- ("Td" lsp-modeline-diagnostics-mode "Modeline diagnostics" :toggle t)
- ("Tb" lsp-headerline-breadcrumb-mode "Header breadcrumb" :toggle t)
- ("Ti" lsp-toggle-trace-io "Trace I/O" :toggle lsp-print-io))
- "Mix"
- (("me" mix-execute-task "Execute mix task")
- ("mt" mix-test "Run tests")
- ("mc" mix-compile "Compile")
- ("mm" jao-elixir-pop-to-iex "Pop to iex"))
- "Mix subproject"
- (("Me" (lambda () (interactive) (mix-execute-task nil t))
- "Execute task")
- ("Mt" (lambda () (interactive) (mix-compile nil t)) "Compile")
- ("Mt" (lambda () (interactive) (mix-test nil t)) "Run tests"))
- "Tests"
- (("tt" exunit-verify-single "Run single test")
- ("tr" exunit-rerun "Re-run tests")
- ("ta" exunit-verify "Run test suites")
- ("tA" exunit-verify-all "Run all test suites"))))
- #+end_src
*** Clojure
#+begin_src emacs-lisp
(use-package clojure-mode