about summary refs log tree commit diff
path: root/tools
diff options
context:
space:
mode:
authorVincent Ambo <tazjin@google.com>2019-12-15T22·54+0000
committerVincent Ambo <tazjin@google.com>2019-12-15T22·55+0000
commit458163910b4ab08c885e076e5f3b9ecf1b3521af (patch)
tree8f9573801796c6524ad253bed9a19401b6b336e7 /tools
parentf34c82f7654ad2c751524095b389c39343ab828b (diff)
chore(emacs.d): Use local term-switcher package
Diffstat (limited to 'tools')
-rw-r--r--tools/emacs/config/desktop.el2
-rw-r--r--tools/emacs/config/init.el2
-rw-r--r--tools/emacs/default.nix2
3 files changed, 3 insertions, 3 deletions
diff --git a/tools/emacs/config/desktop.el b/tools/emacs/config/desktop.el
index dcc3538337..a19b3f6745 100644
--- a/tools/emacs/config/desktop.el
+++ b/tools/emacs/config/desktop.el
@@ -148,7 +148,7 @@
 (exwm-input-set-key (kbd "s-p") #'ivy-password-store)
 
 ;; Add X11 terminal selector to a key
-(exwm-input-set-key (kbd "C-x t") #'counsel-switch-to-terminal)
+(exwm-input-set-key (kbd "C-x t") #'ts/switch-to-terminal)
 
 ;; Toggle between line-mode / char-mode
 (exwm-input-set-key (kbd "C-c C-t C-t") #'exwm-input-toggle-keyboard)
diff --git a/tools/emacs/config/init.el b/tools/emacs/config/init.el
index 253cea7e7c..7d40813d83 100644
--- a/tools/emacs/config/init.el
+++ b/tools/emacs/config/init.el
@@ -56,6 +56,7 @@
 (use-package s)
 (use-package string-edit)
 (use-package telephone-line) ;; configuration happens outside of use-package
+(use-package term-switcher)
 (use-package undo-tree :config (global-undo-tree-mode))
 (use-package uuidgen)
 (use-package which-key :config (which-key-mode t))
@@ -151,7 +152,6 @@
                  settings
                  modes
                  bindings
-                 term-setup
                  eshell-setup))
 (telephone-line-setup)
 (ace-window-display-mode)
diff --git a/tools/emacs/default.nix b/tools/emacs/default.nix
index d061bbfaab..02ffb36605 100644
--- a/tools/emacs/default.nix
+++ b/tools/emacs/default.nix
@@ -81,7 +81,7 @@ let
   ]) ++
 
   # Custom packages
-  [ carp-mode localPackages.dottime ]
+  [ carp-mode localPackages.dottime localPackages.term-switcher ]
   ));
 in third_party.writeShellScriptBin "tazjins-emacs" ''
   exec ${tazjinsEmacs}/bin/emacs \