From b2cd30bfd418bf85c7fb705841368cdd2028c678 Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Sun, 5 Jan 2020 01:13:00 +0000 Subject: [PATCH] chore(emacs.d): Remove edwina configuration Sounds good, doesn't work. (Okay, it does - but not like I want it to and with too many caveats at the moment - maybe later) --- tools/emacs/config/desktop.el | 7 ------- tools/emacs/config/init.el | 25 ------------------------- tools/emacs/default.nix | 1 - 3 files changed, 33 deletions(-) diff --git a/tools/emacs/config/desktop.el b/tools/emacs/config/desktop.el index fb927b12e..d923ab584 100644 --- a/tools/emacs/config/desktop.el +++ b/tools/emacs/config/desktop.el @@ -210,11 +210,4 @@ (exwm-input-set-key (kbd "s-m h") #'randr-layout-hdmi1-extend) (exwm-input-set-key (kbd "s-m s") #'randr-layout-single) -;; Use edwina for window management shortcuts -;; -;; Its initialisation process is oddly stateful, hence configuration -;; happens here before toggling its minor mode. -(setq edwina-keymap-prefix (kbd "s-w")) -(edwina-mode 1) - (provide 'desktop) diff --git a/tools/emacs/config/init.el b/tools/emacs/config/init.el index 0410289b6..eac109f98 100644 --- a/tools/emacs/config/init.el +++ b/tools/emacs/config/init.el @@ -49,31 +49,6 @@ :after (notmuch telega) :config (dottime-display-mode t)) -(use-package edwina - :after (ace-window ivy) - :init - (defun edwina-split-to-buffer () - (interactive) - (ivy-read "Switch to buffer: " #'internal-complete-buffer - :keymap ivy-switch-buffer-map - :preselect (buffer-name (other-buffer (current-buffer))) - :action (lambda (buffer) - (interactive) - (split-window-below) - (switch-to-buffer buffer nil 'force-same-window) - (edwina-arrange)) - :matcher #'ivy--switch-buffer-matcher - :caller 'ivy-switch-buffer)) - ;; Using an advice for this functionality breaks various internal - ;; things in split-window, hence a new interactive function. - (defun edwina-split-arrange () - (interactive) - (split-window-below) - (edwina-arrange)) - :bind (("C-x 2" . edwina-split-arrange) - :map edwina-mode-map - ("s-w b" . #'edwina-split-to-buffer))) - (use-package gruber-darker-theme) (use-package ht) (use-package hydra) diff --git a/tools/emacs/default.nix b/tools/emacs/default.nix index e50d6cc0b..d36673e36 100644 --- a/tools/emacs/default.nix +++ b/tools/emacs/default.nix @@ -35,7 +35,6 @@ let dash-functional direnv dockerfile-mode - edwina elixir-mode elm-mode erlang