diff options
| -rw-r--r-- | .gitignore | 4 | ||||
| -rw-r--r-- | init-evil.el | 23 | ||||
| -rw-r--r-- | init.el | 14 | ||||
| -rw-r--r-- | init/bindings.el (renamed from init-bindings.el) | 2 | ||||
| -rw-r--r-- | init/custom.el (renamed from init-custom.el) | 0 | ||||
| -rw-r--r-- | init/eshell-setup.el (renamed from init-eshell.el) | 2 | ||||
| -rw-r--r-- | init/functions.el (renamed from init-functions.el) | 2 | ||||
| -rw-r--r-- | init/misc.el (renamed from init-misc.el) | 2 | ||||
| -rw-r--r-- | init/modes.el (renamed from init-modes.el) | 2 | ||||
| -rw-r--r-- | init/settings.el (renamed from init-settings.el) | 2 |
10 files changed, 14 insertions, 39 deletions
diff --git a/.gitignore b/.gitignore index 620c180555..0f9b0bae46 100644 --- a/.gitignore +++ b/.gitignore @@ -3,8 +3,8 @@ auto-save-list/ clones/ elpa/ -init-irc.el -init-local.el +irc.el +local.el other/ scripts/ themes/ diff --git a/init-evil.el b/init-evil.el deleted file mode 100644 index ae2e9fd031..0000000000 --- a/init-evil.el +++ /dev/null @@ -1,23 +0,0 @@ -; Basic vim emulation - -(evil-mode t) -; (global-evil-tabs-mode 1) - -(evil-ex-define-cmd "Exp[lore]" 'dired-jump) -(evil-ex-define-cmd "color[scheme]" 'customize-themes) - -(evil-define-key 'normal global-map - "\\\\w" 'evil-ace-jump-word-mode) - -(evil-define-key 'normal clojure-mode-map - "\M-q" 'paredit-reindent-defun - "gK" 'nrepl-src - "K" 'ac-nrepl-popup-doc) - -(setq evil-default-cursor '("#ffdd33")) - -;;; Uncomment these key-chord lines if you like that "remap 'jk' to ESC" trick. -;; (key-chord-mode t) -;; (key-chord-define evil-insert-state-map "jk" 'evil-normal-state) - -(provide 'init-evil) diff --git a/init.el b/init.el index 90fc92c09c..d91f536e15 100644 --- a/init.el +++ b/init.el @@ -85,18 +85,16 @@ (add-to-list 'load-path user-emacs-directory) -(mapc 'require '(init-functions - init-settings - init-modes - init-bindings - init-eshell)) +(mapc 'require '(functions + settings + modes + bindings + eshell-setup)) (when is-vim-mode (require 'init-evil)) -(add-to-list 'load-path "~/.emacs.d/scripts/") - -(setq custom-file "~/.emacs.d/init-custom.el") +(setq custom-file (concat user-emacs-directory "init/custom.el")) (load custom-file) ;; A file with machine specific settings. diff --git a/init-bindings.el b/init/bindings.el index 9a4157ba19..d29081d172 100644 --- a/init-bindings.el +++ b/init/bindings.el @@ -72,4 +72,4 @@ ;; Org-mode agenda keys (global-set-key (kbd "C-c a") 'org-agenda) -(provide 'init-bindings) +(provide 'bindings) diff --git a/init-custom.el b/init/custom.el index 18af68c890..18af68c890 100644 --- a/init-custom.el +++ b/init/custom.el diff --git a/init-eshell.el b/init/eshell-setup.el index 69c7104865..43b1c16b33 100644 --- a/init-eshell.el +++ b/init/eshell-setup.el @@ -89,4 +89,4 @@ (let ((inhibit-read-only t)) (erase-buffer))) -(provide 'init-eshell) +(provide 'eshell-setup) diff --git a/init-functions.el b/init/functions.el index 233d40dd8b..e26e1f1bea 100644 --- a/init-functions.el +++ b/init/functions.el @@ -99,4 +99,4 @@ Including indent-buffer, which should not be called automatically on save." (find-file (concat "/sudo:root@localhost:" (ido-read-file-name "File: "))) (find-alternate-file (concat "/sudo:root@localhost:" buffer-file-name)))) -(provide 'init-functions) +(provide 'functions) diff --git a/init-misc.el b/init/misc.el index 87343205b7..9403704930 100644 --- a/init-misc.el +++ b/init/misc.el @@ -6,4 +6,4 @@ ;; Use aspell for spell checking: brew install aspell --lang=en (setq ispell-program-name "/usr/local/bin/aspell") -(provide 'init-misc) +(provide 'misc) diff --git a/init-modes.el b/init/modes.el index 9141404b74..a28ece3e57 100644 --- a/init-modes.el +++ b/init/modes.el @@ -77,4 +77,4 @@ ;; Transparently open compressed files (auto-compression-mode t) -(provide 'init-modes) +(provide 'modes) diff --git a/init-settings.el b/init/settings.el index 9601752ec6..8d1b7fbace 100644 --- a/init-settings.el +++ b/init/settings.el @@ -240,4 +240,4 @@ (setq lpr-command "xpp") -(provide 'init-settings) +(provide 'settings) |