diff --git a/modules/lib-tmux.el b/modules/lib-tmux.el index c31375bbd..9ab9f7398 100644 --- a/modules/lib-tmux.el +++ b/modules/lib-tmux.el @@ -66,30 +66,5 @@ ;; (defun narf/window (direction) ;; ) -;;;###autoload (autoload 'narf/evil-window-or-tmux "lib-tmux" nil t) -(evil-define-command narf/evil-window-or-tmux (count direction) - :repeat nil - (interactive "p") - (let ((start-window (selected-window))) - (ignore-errors (funcall (intern (format "evil-window-%s" direction)) count)) - (when (eq start-window (selected-window)) - (os-switch-to-term)))) - -;;;###autoload (autoload 'narf/evil-window-left "lib-tmux" nil t) -(evil-define-command narf/evil-window-left (count) - :repeat nil (interactive "p") (narf/evil-window-or-tmux count 'left)) - -;;;###autoload (autoload 'narf/evil-window-right "lib-tmux" nil t) -(evil-define-command narf/evil-window-right (count) - :repeat nil (interactive "p") (narf/evil-window-or-tmux count 'right)) - -;;;###autoload (autoload 'narf/evil-window-up "lib-tmux" nil t) -(evil-define-command narf/evil-window-up (count) - :repeat nil (interactive "p") (narf/evil-window-or-tmux count 'up)) - -;;;###autoload (autoload 'narf/evil-window-down "lib-tmux" nil t) -(evil-define-command narf/evil-window-down (count) - :repeat nil (interactive "p") (narf/evil-window-or-tmux count 'down)) - (provide 'lib-tmux) ;;; lib-tmux.el ends here diff --git a/private/my-bindings.el b/private/my-bindings.el index 7c30e9f6a..8554b7d3f 100644 --- a/private/my-bindings.el +++ b/private/my-bindings.el @@ -44,7 +44,7 @@ "C-j" 'evil-window-down "C-k" 'evil-window-up "C-h" 'evil-window-left - "C-l" 'narf/evil-window-right ; switch to tmux if fails + "C-l" 'evil-window-right ; switch to tmux if fails "C-" 'evil-emacs-state :e "C-" 'evil-normal-state @@ -299,9 +299,7 @@ "C-h" 'evil-window-left "C-j" 'evil-window-down "C-k" 'evil-window-up - - "l" 'narf/evil-window-right ; Switch to tmux if no window - "C-l" 'narf/evil-window-right ; Switch to tmux if no window + "C-l" 'evil-window-right "C-w" 'ace-window "C-S-w" (λ! (ace-window 4)) ; swap windows