diff options
| -rw-r--r-- | init.el | 10 | ||||
| -rw-r--r-- | init/clojure.el | 4 | ||||
| -rw-r--r-- | init/custom.el | 10 | ||||
| -rw-r--r-- | init/settings.el | 17 |
4 files changed, 19 insertions, 22 deletions
diff --git a/init.el b/init.el index d1bd702da8..9358bb6c01 100644 --- a/init.el +++ b/init.el @@ -6,7 +6,7 @@ ;; ... and melpa. Melpa packages that exist on marmalade will have ;; precendence. -; (add-to-list 'package-archives '("melpa" . "http://melpa.milkbox.net/packages/")) +(add-to-list 'package-archives '("melpa" . "http://melpa.milkbox.net/packages/")) ;; And load things! (package-refresh-contents) @@ -14,7 +14,6 @@ (defvar my-pkgs '(;; All packages - ac-cider-compliment ace-jump-mode ag browse-kill-ring @@ -36,8 +35,6 @@ markdown-mode+ multiple-cursors multi-term - mvn - nyan-mode paredit password-store pkgbuild-mode @@ -85,6 +82,9 @@ (setq custom-file (concat user-emacs-directory "init/custom.el")) (load custom-file) +;; Local configuration +(load-file-if-exists "~/.emacs.d/init/local.el") + ;; Load magnars' string manipulation library (require 's) @@ -92,5 +92,5 @@ (random t) ;; SML should respect theme colours -;; (setq sml/theme 'black) +;; (setq sml/theme 'powerline) (sml/setup) diff --git a/init/clojure.el b/init/clojure.el index 5ec4848b8f..c88c86f4e3 100644 --- a/init/clojure.el +++ b/init/clojure.el @@ -1,11 +1,11 @@ (require 'cider) -(require 'ac-cider-compliment) +;(require 'ac-cider-compliment) ;; Configure CIDER (Clojure REPL) and clojure-mode (defun cider-mode-setup () "Activates paredit, rainbow delimiters and ac-nrepl" - (ac-cider-compliment-setup) + ; (ac-cider-compliment-setup) (ac-flyspell-workaround) (paredit-mode)) diff --git a/init/custom.el b/init/custom.el index 68a4bed78a..ba1ac791b7 100644 --- a/init/custom.el +++ b/init/custom.el @@ -7,13 +7,17 @@ '(ac-delay 0.2) '(custom-safe-themes (quote - ("3c83b3676d796422704082049fc38b6966bcad960f896669dfc21a7a37a748fa" "72e42ba8f32bbf4a0b30c4c25f378289058efb1790dbd9a3e7c3d9666cc7fee4" "0e7da2c7c64fb5d4764250ffa4b8b33c0946577108d1d6444f1020d0dabba784" "6a37be365d1d95fad2f4d185e51928c789ef7a4ccf17e7ca13ad63a8bf5b922f" "6e92ca53a22d9b0577ad0b16e07e2e020c8b621197e39fec454048e51b7954cb" default))) + ("c74e83f8aa4c78a121b52146eadb792c9facc5b1f02c917e3dbb454fca931223" "26614652a4b3515b4bbbb9828d71e206cc249b67c9142c06239ed3418eff95e2" "3c83b3676d796422704082049fc38b6966bcad960f896669dfc21a7a37a748fa" "72e42ba8f32bbf4a0b30c4c25f378289058efb1790dbd9a3e7c3d9666cc7fee4" "0e7da2c7c64fb5d4764250ffa4b8b33c0946577108d1d6444f1020d0dabba784" "6a37be365d1d95fad2f4d185e51928c789ef7a4ccf17e7ca13ad63a8bf5b922f" "6e92ca53a22d9b0577ad0b16e07e2e020c8b621197e39fec454048e51b7954cb" default))) '(frame-brackground-mode (quote dark)) '(global-auto-complete-mode t) + '(ido-use-filename-at-point nil) '(magit-log-show-gpg-status t) + '(nil nil t) '(ns-alternate-modifier (quote none)) - '(ns-command-modifier (quote meta)) + '(ns-command-modifier (quote control)) + '(ns-right-command-modifier (quote meta)) '(require-final-newline (quote visit-save)) + '(sml/theme (quote dark))) (custom-set-faces ;; custom-set-faces was added by Custom. ;; If you edit it by hand, you could mess it up, so be careful. @@ -27,4 +31,4 @@ '(rainbow-delimiters-depth-6-face ((t (:foreground "#268bd2")))) '(rainbow-delimiters-depth-7-face ((t (:foreground "#cb4b16")))) '(rainbow-delimiters-depth-8-face ((t (:foreground "#d33682")))) - '(rainbow-delimiters-depth-9-face ((t (:foreground "#839496")))))) + '(rainbow-delimiters-depth-9-face ((t (:foreground "#839496"))))) diff --git a/init/settings.el b/init/settings.el index f58063a5dc..4aa5da15dc 100644 --- a/init/settings.el +++ b/init/settings.el @@ -1,5 +1,5 @@ (require 'uniquify) -(require 'smart-mode-line) +; (require 'smart-mode-line) ; ## Generic settings ## @@ -38,7 +38,8 @@ (add-to-list 'exec-path "/usr/local/bin") (add-to-list 'exec-path (expand-file-name "~/bin")) - +;; Stack installs here: +(add-to-list 'exec-path (expand-file-name "~/.local/bin")) (when window-system (setq frame-title-format '(buffer-file-name "%f" ("%b"))) @@ -148,16 +149,6 @@ line) 'face 'linum))) -(eval-after-load 'diff-mode - '(progn - (set-face-foreground 'diff-added "green4") - (set-face-foreground 'diff-removed "red3"))) - -(eval-after-load 'magit - '(progn - (set-face-foreground 'magit-diff-add "green4") - (set-face-foreground 'magit-diff-del "red3"))) - ;; ## Mac specific settings ## ;; Enable mouse support on OS X @@ -248,5 +239,7 @@ ;; Use CUPS (setq lpr-command "xpp") +;; Allow same window in two frames +(setq ido-default-buffer-method 'selected-window) (provide 'settings) |