diff options
| -rw-r--r-- | init-custom.el | 15 | ||||
| -rw-r--r-- | init-modes.el | 3 | ||||
| -rw-r--r-- | init-settings.el | 6 | ||||
| -rw-r--r-- | init.el | 1 |
4 files changed, 12 insertions, 13 deletions
diff --git a/init-custom.el b/init-custom.el index a1333954b078..62510a9e2a8a 100644 --- a/init-custom.el +++ b/init-custom.el @@ -5,22 +5,17 @@ ;; If there is more than one, they won't work right. '(ac-auto-show-menu 0.8) '(ac-delay 0.2) - '(custom-safe-themes - (quote - ("d0ff5ea54497471567ed15eb7279c37aef3465713fb97a50d46d95fe11ab4739" "2fd1c7f994649d9f879521c4634bd8eddae866db9ff50269a9127b9f93b4e582" "2fb6fbdb644441c4ed1d47f25bed9aa7f7136271c2454ba9a29975d3cfba94c0" "466ae54a7b157ad02fd91da72b7871bccfb9bac98fdab95cf7a0d405c8572bd0" "854dc57026d3226addcc46b2b460034a74609edbd9c14e626769ac724b10fcf5" "8eaa3bce3c618cd81a318fcf2d28c1cd21278531f028feb53186f6387547dfb4" "ea0c5df0f067d2e3c0f048c1f8795af7b873f5014837feb0a7c8317f34417b04" "a234f91f9be6ed40f6ce0e94dce5cea1b9f1ccec2b9ccd42bb71c499867a3fcc" "fc5fcb6f1f1c1bc01305694c59a1a861b008c534cae8d0e48e4d5e81ad718bc6" "1e7e097ec8cb1f8c3a912d7e1e0331caeed49fef6cff220be63bd2a6ba4cc365" "d6a00ef5e53adf9b6fe417d2b4404895f26210c52bb8716971be106550cea257" default))) - '(erc-modules - (quote - (autojoin button completion dcc irccontrols list log match menu move-to-prompt netsplit networks noncommands notifications readonly ring scrolltobottom stamp track))) + '(custom-safe-themes (quote ("d0ff5ea54497471567ed15eb7279c37aef3465713fb97a50d46d95fe11ab4739" "2fd1c7f994649d9f879521c4634bd8eddae866db9ff50269a9127b9f93b4e582" "2fb6fbdb644441c4ed1d47f25bed9aa7f7136271c2454ba9a29975d3cfba94c0" "466ae54a7b157ad02fd91da72b7871bccfb9bac98fdab95cf7a0d405c8572bd0" "854dc57026d3226addcc46b2b460034a74609edbd9c14e626769ac724b10fcf5" "8eaa3bce3c618cd81a318fcf2d28c1cd21278531f028feb53186f6387547dfb4" "ea0c5df0f067d2e3c0f048c1f8795af7b873f5014837feb0a7c8317f34417b04" "a234f91f9be6ed40f6ce0e94dce5cea1b9f1ccec2b9ccd42bb71c499867a3fcc" "fc5fcb6f1f1c1bc01305694c59a1a861b008c534cae8d0e48e4d5e81ad718bc6" "1e7e097ec8cb1f8c3a912d7e1e0331caeed49fef6cff220be63bd2a6ba4cc365" "d6a00ef5e53adf9b6fe417d2b4404895f26210c52bb8716971be106550cea257" default))) + '(erc-modules (quote (autojoin button completion dcc irccontrols list log match menu move-to-prompt netsplit networks noncommands notifications readonly ring scrolltobottom stamp track))) '(frame-brackground-mode (quote dark)) '(global-auto-complete-mode t) - '(haskell-mode-hook - (quote - (capitalized-words-mode turn-on-haskell-decl-scan turn-on-haskell-doc turn-on-hi2))) + '(haskell-mode-hook (quote (capitalized-words-mode turn-on-haskell-decl-scan turn-on-haskell-doc turn-on-hi2))) '(it-mode-google-cmd "/usr/local/bin/google") '(mu4e-use-fancy-chars t) '(ns-alternate-modifier (quote none)) '(ns-command-modifier (quote meta)) - '(require-final-newline (quote visit-save))) + '(require-final-newline (quote visit-save)) + '(sml/override-theme nil)) (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/init-modes.el b/init-modes.el index 7117edd96e0f..5c8cb2b21ec1 100644 --- a/init-modes.el +++ b/init-modes.el @@ -64,9 +64,6 @@ ;; Keep track of recent files (recentf-mode) -;; Enable Nyan mode -(nyan-mode 1) - ;; Easily navigate sillycased words (global-subword-mode 1) diff --git a/init-settings.el b/init-settings.el index 4f78a8cc104c..470e79b20e49 100644 --- a/init-settings.el +++ b/init-settings.el @@ -1,4 +1,6 @@ (require 'uniquify) +(require 'smart-mode-line) + ; ## Generic settings ## ; Hide those ugly tool bars @@ -42,6 +44,10 @@ backup-directory-alist `(("." . ,(concat user-emacs-directory "backups"))) diff-switches "-u") +;; Fix mode line +(if after-init-time (sml/setup) + (add-hook 'after-init-hook 'sml/setup)) + (setq smex-save-file (concat user-emacs-directory ".smex-items")) (smex-initialize) (global-set-key (kbd "M-x") 'smex) diff --git a/init.el b/init.el index 90d258dee6be..96c3dde850e0 100644 --- a/init.el +++ b/init.el @@ -36,6 +36,7 @@ rainbow-delimiters rainbow-mode smex + smart-mode-line switch-window undo-tree |