summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorjao <jao@gnu.org>2022-01-28 18:28:17 +0000
committerjao <jao@gnu.org>2022-01-28 23:26:55 +0000
commitfe17687ca528a8d8526f40e8ba895cf48800e803 (patch)
treee13932390663d7e8e55608612bc182e90d4b0375
parent305d1c5931a25f36bd2ba89b77971773b0de7ac4 (diff)
downloadelibs-fe17687ca528a8d8526f40e8ba895cf48800e803.tar.gz
elibs-fe17687ca528a8d8526f40e8ba895cf48800e803.tar.bz2
wee tweaks
-rw-r--r--completion.org1
-rw-r--r--exwm.org56
-rw-r--r--init.org5
-rw-r--r--lib/eos/jao-afio.el12
4 files changed, 39 insertions, 35 deletions
diff --git a/completion.org b/completion.org
index c907a93..cc2c8ac 100644
--- a/completion.org
+++ b/completion.org
@@ -92,6 +92,7 @@
mct-show-completion-line-numbers nil
mct-apply-completion-stripes nil
mct-minimum-input 3
+ mct-completion-window-size '(mct--frame-height-fraction . 1)
mct-live-update-delay 0.3
mct-live-completion t ;; 'visible
mct-completion-blocklist nil
diff --git a/exwm.org b/exwm.org
index d4dc150..4feef4e 100644
--- a/exwm.org
+++ b/exwm.org
@@ -218,16 +218,10 @@
(defun jao-exwm-workspace (n)
(if jao-exwm--use-afio
- (cl-case n
- ((1) (jao-afio--goto-main))
- ((2) (jao-afio--goto-mail))
- ((3) (jao-afio--goto-www))
- ((4) (jao-afio--goto-docs))
- ((5) (jao-afio--goto-scratch-1))
- ((0) (jao-afio--goto-scratch)))
+ (jao-afio-goto-nth n)
(exwm-workspace-switch-create n)))
- (defmacro jao-def-runner (name ws class &rest args)
+ (defmacro jao-def-exwm-runner (name ws class &rest args)
`(defun ,name (&rest other-args)
(interactive)
,@(when ws `((jao-exwm-workspace ,ws)))
@@ -242,10 +236,10 @@
" "))
args))))
- (jao-def-runner jao-exwm-spotify 0 "Spotify" "spotify")
- (jao-def-runner jao-exwm-spt 0 "spt" "xterm" "-e" "spt")
+ (jao-def-exwm-runner jao-exwm-spotify 0 "Spotify" "spotify")
+ (jao-def-exwm-runner jao-exwm-spt 0 "spt" "xterm" "-e" "spt")
- (jao-def-runner jao-exwm-firefox 5 "Firefox" "firefox")
+ (jao-def-exwm-runner jao-exwm-firefox 5 "Firefox" "firefox")
(defun jao-exwm-firefox-1 ()
(interactive)
@@ -257,31 +251,31 @@
(apply #'browse-url-firefox args))
(setq browse-url-secondary-browser-function #'jao-exwm-browse-with-firefox)
- (jao-def-runner jao-exwm-vlc 4 "VLC" "vlc")
+ (jao-def-exwm-runner jao-exwm-vlc 4 "VLC" "vlc")
- (jao-def-runner jao-exwm-slack 0 "Slack" "slack")
- (jao-def-runner jao-exwm-signal 0 "Signal" "signal-desktop")
+ (jao-def-exwm-runner jao-exwm-slack 0 "Slack" "slack")
+ (jao-def-exwm-runner jao-exwm-signal 0 "Signal" "signal-desktop")
- (jao-def-runner jao-exwm-proton-bridge 0 "*proton-bridge*" "protonmail-bridge")
+ (jao-def-exwm-runner jao-exwm-proton-bridge 0 "*proton-bridge*" "protonmail-bridge")
- ;; (jao-def-runner jao-exwm-htop 0 "htop-xterm"
+ ;; (jao-def-exwm-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-exwm-runner jao-exwm-htop 0 "htop" jao-term-htop)
- ;; (jao-def-runner jao-exwm-aptitude 0 "aptitude-xterm"
+ ;; (jao-def-exwm-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-exwm-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)
+ (jao-def-exwm-runner jao-exwm-blueman 0 "Blueman-manager" "blueman-manager")
+ (jao-def-exwm-runner jao-exwm-ncmpcpp 0 "ncmpcpp" "xterm" "-e" "ncmpcpp" "-p" "6669")
+ (jao-def-exwm-runner jao-exwm-mpc 0 "*MPC-Status*" mpc)
- (jao-def-runner jao-exwm-proton-vpn 0 "*pvpn*" proton-vpn-status)
- (jao-def-runner jao-exwm-enwc 0 "*ENWC*" enwc)
- (jao-def-runner jao-exwm-bluetooth 0 "*Bluetooth*" bluetooth-list-devices)
- (jao-def-runner jao-exwm-paradox 0 "*Packages*" paradox-list-packages nil)
- (jao-def-runner jao-exwm-packages 0 "*Packages*" list-packages nil)
- (jao-def-runner jao-exwm-proced 0 "*Proced*" proced)
+ (jao-def-exwm-runner jao-exwm-proton-vpn 0 "*pvpn*" proton-vpn-status)
+ (jao-def-exwm-runner jao-exwm-enwc 0 "*ENWC*" enwc)
+ (jao-def-exwm-runner jao-exwm-bluetooth 0 "*Bluetooth*" bluetooth-list-devices)
+ (jao-def-exwm-runner jao-exwm-paradox 0 "*Packages*" paradox-list-packages nil)
+ (jao-def-exwm-runner jao-exwm-packages 0 "*Packages*" list-packages nil)
+ (jao-def-exwm-runner jao-exwm-proced 0 "*Proced*" proced)
(defun jao-exwm-kill-xmobar ()
(interactive)
@@ -292,9 +286,9 @@
(jao-exwm-kill-xmobar)
(start-process "" nil "xmobar-exwm" "-d"))
- (jao-def-runner jao-exwm-open-with-zathura nil nil "zathura" (buffer-file-name))
- (jao-def-runner jao-exwm-open-with-mupdf nil nil "mupdf" (buffer-file-name))
- (jao-def-runner jao-exwm-xterm 0 nil "xterm")
+ (jao-def-exwm-runner jao-exwm-open-with-zathura nil nil "zathura" (buffer-file-name))
+ (jao-def-exwm-runner jao-exwm-open-with-mupdf nil nil "mupdf" (buffer-file-name))
+ (jao-def-exwm-runner jao-exwm-xterm 0 nil "xterm")
(defun jao-exwm-import-screen (&optional area)
(interactive "P")
diff --git a/init.org b/init.org
index f5db464..0bf7da3 100644
--- a/init.org
+++ b/init.org
@@ -2444,7 +2444,6 @@
geiser-repl-startup-time 20000
geiser-debug-auto-display-images-p t
geiser-log-verbose-p t
- geiser-repl-current-project-function 'project-current
geiser-active-implementations '(guile)
geiser-default-implementation 'guile))
@@ -2958,7 +2957,7 @@
(defun jao-spt-on-p () jao-spt-on)
(jao-spt-setup-aliases)
- (jao-def-runner jao-term-spt 0 "spt" "xterm" "-e" "spt")
+ (jao-def-exec-in-term "spt" "spt" (jao-afio--goto-scratch-1))
(defun jao-spotify-toggle-player ()
(interactive)
@@ -3063,7 +3062,7 @@
("l" "playing list" jao-spotify-list)
("L" "lyrics" jao-spotify-lyrics)
("w" "currently playing" jao-spotify-current)
- ("t" "toggle player" jao-spotify-toggle-player)]
+ ("T" "toggle player" jao-spotify-toggle-player)]
["Act" :if jao-spt-on-p
("k" "like" jao-spt-like)
("K" "dislike" jao-spt-dislike)
diff --git a/lib/eos/jao-afio.el b/lib/eos/jao-afio.el
index e6fce03..978dbc8 100644
--- a/lib/eos/jao-afio.el
+++ b/lib/eos/jao-afio.el
@@ -1,6 +1,6 @@
;;; jao-afio.el --- workspaces in just one frame -*- lexical-binding: t; -*-
-;; Copyright (C) 2020, 2021 jao
+;; Copyright (C) 2020, 2021, 2022 jao
;; Author: jao <mail@jao.io>
;; Keywords: frames
@@ -225,6 +225,16 @@
(?w "3")))
;;;###autoload
+(defun jao-afio-goto-nth (n)
+ (cl-case n
+ ((1) (jao-afio--goto-main))
+ ((2) (jao-afio--goto-mail))
+ ((3) (jao-afio--goto-www))
+ ((4) (jao-afio--goto-docs))
+ ((5) (jao-afio--goto-scratch-1))
+ ((0) (jao-afio--goto-scratch))))
+
+;;;###autoload
(defun jao-afio-setup (&optional fallback-fun init-p)
(global-set-key "\C-cf" 'jao-afio--goto-main)
(global-set-key "\C-cg" 'jao-afio--goto-mail)