From 38b1a3972f768a2f87341c838a4dc5351aa2bb54 Mon Sep 17 00:00:00 2001
From: Alison Watson <marrub.xz@gmail.com>
Date: Fri, 17 Jan 2020 01:32:35 -0500
Subject: [PATCH] emacs: use evil-collection

---
 emacs/auto/-packages.el |  7 +++++++
 emacs/auto/-pkgdb.el    |  6 ------
 emacs/custom.el         | 28 ++++++++++++++--------------
 emacs/init.el           |  3 +--
 4 files changed, 22 insertions(+), 22 deletions(-)
 delete mode 100644 emacs/auto/-pkgdb.el

diff --git a/emacs/auto/-packages.el b/emacs/auto/-packages.el
index f711e35..ce819dc 100644
--- a/emacs/auto/-packages.el
+++ b/emacs/auto/-packages.el
@@ -1,9 +1,16 @@
+(setq evil-want-keybinding nil)
+
+(require 'package)
+(add-to-list 'package-archives '("melpa" . "https://melpa.org/packages/") t)
+(package-initialize)
+
 (require 'paradox)
 (paradox-enable)
 
 (require 'rust-mode)
 
 (require 'evil)
+(evil-collection-init 'ibuffer)
 
 (require 'powerline)
 (powerline-center-evil-theme)
diff --git a/emacs/auto/-pkgdb.el b/emacs/auto/-pkgdb.el
deleted file mode 100644
index 3e31b44..0000000
--- a/emacs/auto/-pkgdb.el
+++ /dev/null
@@ -1,6 +0,0 @@
-(require 'package)
-
-(add-to-list 'package-archives '("melpa" . "https://melpa.org/packages/") t)
-(package-initialize)
-
-;; EOF
diff --git a/emacs/custom.el b/emacs/custom.el
index a6ea872..ab91012 100644
--- a/emacs/custom.el
+++ b/emacs/custom.el
@@ -10,8 +10,8 @@
  '(current-language-environment "UTF-8")
  '(custom-enabled-themes (quote (base16-atelier-cave)))
  '(custom-safe-themes
-	(quote
-	 ("1d079355c721b517fdc9891f0fda927fe3f87288f2e6cc3b8566655a64ca5453" default)))
+   (quote
+    ("1d079355c721b517fdc9891f0fda927fe3f87288f2e6cc3b8566655a64ca5453" default)))
  '(dired-listing-switches "-alhp --si")
  '(dired-mode-hook (quote (all-the-icons-dired-mode)))
  '(diredfl-global-mode t nil (diredfl))
@@ -43,23 +43,23 @@
  '(org-hide-leading-stars t)
  '(org-hide-macro-markers t)
  '(org-link-frame-setup
-	(quote
-	 ((vm . vm-visit-folder)
-	  (vm-imap . vm-visit-imap-folder)
-	  (gnus . gnus)
-	  (file . find-file)
-	  (wl . wl))))
+   (quote
+    ((vm . vm-visit-folder)
+     (vm-imap . vm-visit-imap-folder)
+     (gnus . gnus)
+     (file . find-file)
+     (wl . wl))))
  '(org-log-done (quote note))
  '(org-pretty-entities t)
  '(org-return-follows-link t)
  '(org-startup-folded nil)
  '(package-enable-at-startup nil)
  '(package-selected-packages
-	(quote
-	 (ranger deadgrep smart-tabs-mode evil-lion dired-sidebar diredfl rainbow-delimiters all-the-icons-dired org-bullets markdown-mode all-the-icons rust-mode base16-theme powerline evil ## undo-tree paradox)))
+   (quote
+    (evil-collection ranger deadgrep smart-tabs-mode evil-lion dired-sidebar diredfl rainbow-delimiters all-the-icons-dired org-bullets markdown-mode all-the-icons rust-mode base16-theme powerline evil ## undo-tree paradox)))
  '(prog-mode-hook
-	(quote
-	 (flyspell-prog-mode prettify-symbols-mode subword-mode rainbow-delimiters-mode whitespace-mode)))
+   (quote
+    (flyspell-prog-mode prettify-symbols-mode subword-mode rainbow-delimiters-mode whitespace-mode)))
  '(repeat-too-dangerous nil)
  '(require-final-newline t)
  '(ruby-insert-encoding-magic-comment nil)
@@ -77,8 +77,8 @@
  '(transient-mark-mode t)
  '(vc-follow-symlinks t)
  '(whitespace-style
-	(quote
-	 (face trailing tabs spaces space-before-tab space-mark tab-mark))))
+   (quote
+    (face trailing tabs spaces space-before-tab space-mark tab-mark))))
 (custom-set-faces
  ;; custom-set-faces was added by Custom.
  ;; If you edit it by hand, you could mess it up, so be careful.
diff --git a/emacs/init.el b/emacs/init.el
index 29765ca..5b6c49d 100644
--- a/emacs/init.el
+++ b/emacs/init.el
@@ -5,10 +5,9 @@
   :prefix "agw-"
   :group 'convenience)
 
-(load "-pkgdb")
+(load "-packages")
 (load "-defaults")
 (load "-custom")
-(load "-packages")
 (load "-macro")
 (load "-keys")