summaryrefslogtreecommitdiff
path: root/.config
diff options
context:
space:
mode:
authorSean Whitton <spwhitton@spwhitton.name>2022-04-15 18:08:51 -0700
committerSean Whitton <spwhitton@spwhitton.name>2022-04-15 18:12:39 -0700
commitb45434316738d02ad7b660b0609420cde19aa2a6 (patch)
treefde01dfa690eb7c74441054a81ba84f159a3ef7a /.config
parent9dd6d67f0fc6ddf766ab6ac783b10f9cc52eeb87 (diff)
downloaddotfiles-b45434316738d02ad7b660b0609420cde19aa2a6.tar.gz
combine s/d/emacsclient & update-emacs-daemon-environment
Diffstat (limited to '.config')
-rw-r--r--.config/i3/config20
-rw-r--r--.config/sway/config20
2 files changed, 18 insertions, 22 deletions
diff --git a/.config/i3/config b/.config/i3/config
index aab9bbac..53c12f57 100644
--- a/.config/i3/config
+++ b/.config/i3/config
@@ -48,21 +48,19 @@ mode "C-i-" {
# make a fresh Emacs frame -- typically this gets invoked only on
# empty workspaces, as otherwise I use commands under `C-x 5` to get
# more Emacs frames
- bindsym e exec ~/src/dotfiles/scripts/desktop/emacsclient, mode "default"
+ bindsym e exec emacsclient -nc, mode "default"
# override the script's usual logic to start a fresh, non-debug daemon
- bindsym Shift+e \
- exec ~/src/dotfiles/scripts/desktop/emacsclient --installed, \
- mode "default"
+ bindsym Shift+e exec emacsclient -nc --spw/installed, mode "default"
# Fresh Emacs frame and get a shell in HOME. Without this it's
# C-i e C-c e h which is too many keys esp. compared to C-i DEL
- bindsym Return exec ~/src/dotfiles/scripts/desktop/emacsclient -- -nce \
- "(let ((default-directory (expand-file-name "'"'~/'"'")) \
- (display-buffer-overriding-action \
- '(display-buffer-same-window \
- . ((inhibit-same-window . nil))))) \
- (transient-cycles-cmd-spw/eshell-jump-from-here))", \
+ bindsym Return exec emacsclient -- -nce \
+ "(let ((default-directory (expand-file-name "'"'~/'"'")) \
+ (display-buffer-overriding-action \
+ '(display-buffer-same-window \
+ . ((inhibit-same-window . nil))))) \
+ (transient-cycles-cmd-spw/eshell-jump-from-here))", \
mode "default"
# start a terminal emulator
@@ -338,7 +336,7 @@ bindsym XF86AudioRaiseVolume exec --no-startup-id pactl set-sink-volume @DEFAULT
bindsym XF86AudioLowerVolume exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ -10%
bindsym XF86AudioMute exec --no-startup-id pactl set-sink-mute @DEFAULT_SINK@ toggle
-exec --no-startup-id update-emacs-daemon-environment
+exec --no-startup-id emacsclient --spw/update-environment
exec --no-startup-id xss-lock --transfer-sleep-lock -- \
i3lock --nofork --ignore-empty-password --color=FFFFF6
diff --git a/.config/sway/config b/.config/sway/config
index 0c0e29ed..9a0cfd29 100644
--- a/.config/sway/config
+++ b/.config/sway/config
@@ -33,21 +33,19 @@ mode "C-i-" {
# make a fresh Emacs frame -- typically this gets invoked only on
# empty workspaces, as otherwise I use commands under `C-x 5` to get
# more Emacs frames
- bindsym e exec ~/src/dotfiles/scripts/desktop/emacsclient, mode "default"
+ bindsym e exec emacsclient -nc, mode "default"
# override the script's usual logic to start a fresh, non-debug daemon
- bindsym Shift+e \
- exec ~/src/dotfiles/scripts/desktop/emacsclient --installed, \
- mode "default"
+ bindsym Shift+e exec emacsclient -nc --spw/installed, mode "default"
# Fresh Emacs frame and get a shell in HOME. Without this it's
# C-i e C-c e h which is too many keys esp. compared to C-i DEL
- bindsym Return exec ~/src/dotfiles/scripts/desktop/emacsclient -- -nce \
- "(let ((default-directory (expand-file-name "'"'~/'"'")) \
- (display-buffer-overriding-action \
- '(display-buffer-same-window \
- . ((inhibit-same-window . nil))))) \
- (transient-cycles-cmd-spw/eshell-jump-from-here))", \
+ bindsym Return exec emacsclient -nce \
+ "(let ((default-directory (expand-file-name "'"'~/'"'")) \
+ (display-buffer-overriding-action \
+ '(display-buffer-same-window \
+ . ((inhibit-same-window . nil))))) \
+ (transient-cycles-cmd-spw/eshell-jump-from-here))", \
mode "default"
# start a terminal emulator
@@ -364,7 +362,7 @@ input type:keyboard repeat_delay 380
seat * hide_cursor 5000
exec mako
-exec update-emacs-daemon-environment
+exec emacsclient --spw/update-environment
exec_always fcitx5 -d --replace