colonelpanic/dotfiles
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

get rid of project root. back to monokai.

Browse Source
This commit is contained in:
Ivan Malison 2014-10-28 18:39:40 -07:00
parent aadfc00525
commit 395b9ce1c8
1 changed files with 7 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
init.el
View File

@ -48,7 +48,7 @@
paredit inf-ruby undo-tree rainbow-delimiters paredit inf-ruby undo-tree rainbow-delimiters
solarized-theme tern-auto-complete scala-mode2 solarized-theme tern-auto-complete scala-mode2
gitconfig-mode starter-kit-ruby mo-git-blame gitconfig-mode starter-kit-ruby mo-git-blame
auto-complete project-root popup web-beautify auto-complete popup web-beautify
js2-mode js3-mode sphinx-doc ansi-color pytest js2-mode js3-mode sphinx-doc ansi-color pytest
exec-path-from-shell base16-theme slime flx-ido exec-path-from-shell base16-theme slime flx-ido
string-inflection yasnippet yaml-mode projectile string-inflection yasnippet yaml-mode projectile
@ -158,7 +158,7 @@ Return a list of installed packages or nil for every package not installed."
;; disabled hooks ;; disabled hooks
;; (add-hook 'prog-mode-hook (lambda () (highlight-lines-matching-regexp ;; (add-hook 'prog-mode-hook (lambda () (highlight-lines-matching-regexp
;; ".\\{81\\}" 'hi-blue))) ;; ".\\{81\\}" 'hi-blue)))
;; (add-hook 'prog-mode-hook 'rainbow-delimiters-mode) (add-hook 'prog-mode-hook 'rainbow-delimiters-mode)
(setq flyspell-issue-welcome-flag nil) (setq flyspell-issue-welcome-flag nil)
@ -175,30 +175,6 @@ Return a list of installed packages or nil for every package not installed."
;; This would be great if flx ever supported helm. ;; This would be great if flx ever supported helm.
;; (setq projectile-completion-system 'helm) ;; (setq projectile-completion-system 'helm)
(require 'project-root)
(setq project-roots
`(("ensisme project"
:root-contains-files (".ensime")
:filename-regex ,(regexify-ext-list '(scala sbt))
:exclude-paths ("build" "target" ".ensime_cache" ".git"))
("tox project"
:root-contains-files ("tox.ini")
:filename-regex ,(regexify-ext-list '(py rst))
:exclude-paths ("*.egg*" "build" ".tox" ".git"))
(".emacs.d project"
:root-contains-files ("init.el")
:filename-regex ,(regexify-ext-list '(el))
:exclude-paths (".git"))
("python project"
:root-contains-files (".git" "setup.py")
:filename-regex ,(regexify-ext-list '(py)))
("git project"
:root-contains-files (".git"))
("sbt project"
:root-contains-files ("build.sbt")
:filename-regex ,(regexify-ext-list '(scala sbt))
:exclude-paths ("build" "target"))))
(setq custom-file "~/.emacs.d/custom.el") (setq custom-file "~/.emacs.d/custom.el")
(when (file-exists-p custom-file) (load custom-file)) (when (file-exists-p custom-file) (load custom-file))
@ -210,9 +186,7 @@ Return a list of installed packages or nil for every package not installed."
(defun get-buffer-name() (defun get-buffer-name()
(interactive) (interactive)
(file-relative-name (buffer-file-name) (file-relative-name (buffer-file-name)))
(expand-file-name (with-project-root
(cdr project-details)))))
(defun message-buffer-name() (defun message-buffer-name()
(interactive) (interactive)
@ -282,7 +256,7 @@ Return a list of installed packages or nil for every package not installed."
(defun get-virtual-envs () (defun get-virtual-envs ()
(interactive) (interactive)
(condition-case ex (condition-case ex
(let ((project-root (with-project-root (cdr project-details)))) (let (project-root (projectile-project-root))
(cl-remove-if-not 'file-exists-p (cl-remove-if-not 'file-exists-p
(mapcar (lambda (env-suffix) (mapcar (lambda (env-suffix)
(concat project-root env-suffix)) (concat project-root env-suffix))
@ -392,7 +366,9 @@ Return a list of installed packages or nil for every package not installed."
(progn (load-theme appropriate-theme t) (progn (load-theme appropriate-theme t)
(setq current-theme appropriate-theme))))) (setq current-theme appropriate-theme)))))
(run-at-time "12:00" 3600 'set-solarized-theme) ;; enable to set theme based on time of day.
;; (run-at-time "12:00" 3600 'set-solarized-theme)
(load-theme 'monokai t)
(require 'smart-mode-line) (require 'smart-mode-line)
(sml/setup) (sml/setup)