lisp/init-shell.el: Delete

3 files changed, 3 insertions, 7 deletions

diff --git a/init.el b/init.el
index 1e2492f..76d0b7e 100644
--- a/init.el
+++ b/init.el
@@ -35,7 +35,6 @@
 (require 'init-god)
 
 (require 'init-elisp)
-(require 'init-shell)
 (require 'init-haskell)
 (require 'init-python)
 (require 'init-ess)
diff --git a/lisp/init-general.el b/lisp/init-general.el
index 1882fb7..cc4efdf 100644
--- a/lisp/init-general.el
+++ b/lisp/init-general.el
@@ -33,6 +33,9 @@
 
 (add-hook 'text-mode-hook 'turn-on-auto-fill)
 
+(add-to-list 'auto-mode-alist '("\\.zsh\\'" . shell-script-mode))
+(add-to-list 'auto-mode-alist '("\\.*rc\\'" . conf-unix-mode))
+
 ;; Taken from
 ;; http://milkbox.net/note/single-file-master-emacs-configuration/.
 (defmacro after (mode &rest body)
diff --git a/lisp/init-shell.el b/lisp/init-shell.el
deleted file mode 100644
index 06a3732..0000000
--- a/lisp/init-shell.el
+++ /dev/null
@@ -1,6 +0,0 @@
-;;; Shell and configuration files
-
-(add-to-list 'auto-mode-alist '("\\.zsh\\'" . shell-script-mode))
-(add-to-list 'auto-mode-alist '("\\.*rc\\'" . conf-unix-mode))
-
-(provide 'init-shell)