diff options
| -rw-r--r-- | attic/misc.org | 21 | ||||
| -rw-r--r-- | exwm.org | 19 | ||||
| -rw-r--r-- | init.org | 33 | ||||
| -rw-r--r-- | lib/themes/jao-themes.el | 8 |
4 files changed, 48 insertions, 33 deletions
diff --git a/attic/misc.org b/attic/misc.org index ddc5cd9..39b1cc8 100644 --- a/attic/misc.org +++ b/attic/misc.org @@ -577,7 +577,7 @@ #+end_src * vterm -*** vterm +*** vterm-toggle #+begin_src emacs-lisp :tangle no (use-package vterm-toggle :ensure t @@ -586,25 +586,6 @@ (interactive "P") (if cd (vterm-toggle-cd) (vterm-toggle))) :bind (("C-<f3>" . jao-vterm--toggle))) - - (use-package vterm - :ensure t - :config - :custom ((vterm-kill-buffer-on-exit t))) - - (use-package eshell-vterm - :ensure t - :config (eshell-vterm-mode)) - - (defun jao-exec-in-vterm (cmd bname) - (if (string-blank-p (or cmd "")) - (vterm) - (let ((vterm-shell cmd) - (vterm-kill-buffer-on-exit t) - (buff (generate-new-buffer bname))) - (switch-to-buffer buff) - (vterm-mode)))) - #+end_src *** Vterm repls #+begin_src emacs-lisp @@ -203,7 +203,7 @@ #+end_src * App runners - #+BEGIN_SRC emacs-lisp + #+begin_src emacs-lisp (defun jao-exwm-run (command) (interactive (list (read-shell-command "$ " @@ -263,11 +263,15 @@ (jao-def-runner jao-exwm-signal 0 "Signal" "signal-desktop") (jao-def-runner jao-exwm-proton-bridge 0 "*proton-bridge*" "protonmail-bridge") - (jao-def-runner jao-exwm-htop 0 "htop-xterm" - "xterm" "-title" "htop-xterm" "-e" "htop") - (jao-def-runner jao-exwm-aptitude 0 "aptitude-xterm" - "xterm" "-title" "aptitude-xterm" "-e" "aptitude") + ;; (jao-def-runner jao-exwm-htop 0 "htop-xterm" + ;; "xterm" "-title" "htop-xterm" "-e" "htop") + (jao-def-runner jao-exwm-htop 0 "htop" jao-term-htop) + + ;; (jao-def-runner jao-exwm-aptitude 0 "aptitude-xterm" + ;; "xterm" "-title" "aptitude-xterm" "-e" "aptitude") + (jao-def-runner jao-exwm-aptitude 0 "aptitude" jao-term-aptitude) + (jao-def-runner jao-exwm-blueman 0 "Blueman-manager" "blueman-manager") (jao-def-runner jao-exwm-ncmpcpp 0 "ncmpcpp" "xterm" "-e" "ncmpcpp" "-p" "6669") (jao-def-runner jao-exwm-mpc 0 "*MPC-Status*" mpc) @@ -301,7 +305,7 @@ "/tmp/screenshot/$(date +'%g%m%d-%H%M%S').png"))) (start-process-shell-command "import" "* exwm - console *" c))) - #+END_SRC + #+end_src * Zathura support #+begin_src emacs-lisp (defun jao-zathura--buffer-p (b) @@ -562,7 +566,8 @@ ([?\s-p] . jao-prev-window) ([?\s-r] . app-launcher-run-app) ([?\s-s] . jao-transient-spotify) - ([?\s-t] . jao-exwm-xterm) + ;; ([?\s-t] . jao-exwm-xterm) + ([?\s-t] . vterm) ([?\s-w] . jao-transient-exwm) ([?\s-z] . jao-transient-sleep) ([XF86AudioMute] . jao-mixer-master-toggle) @@ -1793,10 +1793,35 @@ (autoload 'ansi-color-for-comint-mode-on "ansi-color" nil t) (add-hook 'shell-mode-hook 'ansi-color-for-comint-mode-on) #+end_src +*** vterm + #+begin_src emacs-lisp :tangle no + (defvar jao-use-vterm nil) + + (use-package vterm + :ensure t + :init (setq vterm-kill-buffer-on-exit t + vterm-copy-exclude-prompt t + jao-use-vterm t) + :config (jao-define-attached-buffer "\\*vterm\\*" 0.5) + :bind (("<f3>" . vterm))) + + (use-package eshell-vterm + :ensure t + :config (eshell-vterm-mode)) + + (defun jao-exec-in-vterm (cmd bname) + (if (string-blank-p (or cmd "")) + (vterm) + (let ((vterm-shell cmd) + (vterm-kill-buffer-on-exit t) + (buff (generate-new-buffer bname))) + (switch-to-buffer buff) + (vterm-mode)))) + + #+end_src *** term #+begin_src emacs-lisp (defvar-local jao-term--cmd nil) - (defvar jao-use-vterm nil) (defun jao-term--find (cmd) (seq-find (lambda (b) @@ -1935,10 +1960,8 @@ ***** Completion #+begin_src emacs-lisp (defun jao-eshell-completion-capf () - (let ((c (bash-completion-dynamic-complete-nocomint - (save-excursion (eshell-bol) (point)) - (point) - t))) + (let* ((b (save-excursion (eshell-bol) (point))) + (c (bash-completion-dynamic-complete-nocomint b (point) t))) (when (and c (listp c)) (append c '(:exclusive no))))) diff --git a/lib/themes/jao-themes.el b/lib/themes/jao-themes.el index 04b8ce4..6d89234 100644 --- a/lib/themes/jao-themes.el +++ b/lib/themes/jao-themes.el @@ -1089,7 +1089,13 @@ (vertico-current (p hilite)) (vertico-group-title (p dimm)) (vertico-group-separator (p dimm) :strike-through "grey80") - (vertico-truncation (~ shadow))) + (vertico-truncation (~ shadow)) + (vterm-color-green (c "darkseagreen4")) + (vterm-color-blue (c "steelblue4")) + (vterm-color-cyan (c "cadetblue4")) + (vterm-color-red (c "orangered4")) + (vterm-color-magenta (c "dark orange")) + (vterm-color-yellow (c "lemon chiffon"))) `((w3m-anchor link) (w3m-arrived-anchor vlink) (w3m-bold bf dbg dfg) |