From 07f5623c09fe8a33a4d25b7a438a54ed2e69214b Mon Sep 17 00:00:00 2001
From: Taylor Bockman <taylor.bockman@originate.com>
Date: Mon, 5 Aug 2019 11:04:54 -0700
Subject: [PATCH] Emacs - Autopair and some adjustments

---
 dotfiles/emacs.d/init.el    | 13 ++++++++-----
 dotfiles/emacs.d/package.el |  4 ++++
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/dotfiles/emacs.d/init.el b/dotfiles/emacs.d/init.el
index 670e96b..7cc2a3c 100644
--- a/dotfiles/emacs.d/init.el
+++ b/dotfiles/emacs.d/init.el
@@ -379,6 +379,12 @@
 (add-hook 'java-mode-hook 'my-java-mode-hook)
 
 ;;-------------------------------------------------------------------------------------
+;; General Editor Utility
+;;-------------------------------------------------------------------------------------
+
+(autopair-global-mode)
+
+;;-------------------------------------------------------------------------------------
 ;; Key Bindings
 ;;-------------------------------------------------------------------------------------
 
@@ -388,7 +394,7 @@
 ;; Neotree
 (global-set-key [f8] 'neotree-toggle)
 
-(global-set-key (kbd "C-d") nil)
+(global-set-key (kbd "C-d") 'delete-char)
 (global-set-key (kbd "C-m") nil)
 (global-set-key (kbd "RET") nil)
 
@@ -411,9 +417,6 @@
 (global-set-key (kbd "M-k") 'windmove-up)
 (global-set-key (kbd "M-l") 'windmove-right)
 
-;; Delete surrounding
-(global-set-key (kbd "C-d s") 'delete-pair)
-
 ;; Git utility
 (global-set-key (kbd "C-x g s") 'magit-status)
 (global-set-key (kbd "C-x g b") 'magit-blame-popup)
@@ -485,7 +488,7 @@
  ;; If there is more than one, they won't work right.
  '(package-selected-packages
    (quote
-    (counsel zenburn-theme wrap-region swiper stylus-mode smex slim-mode scss-mode sass-mode rust-mode rspec-mode robe rainbow-delimiters projectile powerline paredit neotree magit livescript-mode linum-relative less-css-mode jsx-mode js2-mode jade-mode grizzl golden-ratio gitignore-mode flymake-ruby flycheck-rust flycheck-pos-tip flycheck-haskell flycheck-clojure fill-column-indicator feature-mode expand-region esh-help enh-ruby-mode coffee-mode circe ag ac-inf-ruby))))
+    (counsel material-theme wrap-region swiper stylus-mode smex slim-mode scss-mode sass-mode rust-mode rspec-mode robe rainbow-delimiters projectile powerline paredit neotree magit livescript-mode linum-relative less-css-mode jsx-mode js2-mode jade-mode grizzl golden-ratio gitignore-mode flymake-ruby flycheck-rust flycheck-pos-tip flycheck-haskell flycheck-clojure fill-column-indicator feature-mode expand-region esh-help enh-ruby-mode coffee-mode circe ag ac-inf-ruby))))
 (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/dotfiles/emacs.d/package.el b/dotfiles/emacs.d/package.el
index ba562a7..0ea5987 100644
--- a/dotfiles/emacs.d/package.el
+++ b/dotfiles/emacs.d/package.el
@@ -31,6 +31,10 @@
                       ;; Cleanup
                       ws-butler
                       ;;;;;;;;;;
+
+                      ;; Editing Utility
+                      autopair
+                      ;;;;;;;;;;;;;;;;;;
                       
                       ;; UI
                       fill-column-indicator