Permalink
Browse files

update personal

  • Loading branch information...
WaYdotNET committed Sep 19, 2012
1 parent e6a344d commit f51d991e7239cdf69dbf6c67d1b3064fede2fb44
View
@@ -1,9 +0,0 @@
-[submodule "powerline"]
- path = vendor/powerline
- url = git://github.com/yuanotes/powerline.git
-[submodule "themes/color-theme-molokai"]
- path = themes/color-theme-molokai
- url = git://github.com/saimn/color-theme-molokai.git
-[submodule "vendor/slim"]
- path = vendor/slim
- url = git://github.com/minad/emacs-slim.git
View
@@ -0,0 +1,16 @@
+(custom-set-variables
+ ;; custom-set-variables was added by Custom.
+ ;; If you edit it by hand, you could mess it up, so be careful.
+ ;; Your init file should contain only one such instance.
+ ;; If there is more than one, they won't work right.
+ '(ansi-color-names-vector ["#002b36" "#dc322f" "#859900" "#b58900" "#268bd2" "#d33682" "#2aa198" "#839496"])
+ '(ansi-term-color-vector [unspecific "#586e75" "#dc322f" "#859900" "#b58900" "#268bd2" "#d33682" "#2aa198" "#002b36"])
+ '(custom-safe-themes (quote ("6cfe5b2f818c7b52723f3e121d1157cf9d95ed8923dbc1b47f392da80ef7495d" "8aebf25556399b58091e533e455dd50a6a9cba958cc4ebb0aab175863c25b9a4" "6615e5aefae7d222a0c252c81aac52c4efb2218d35dfbb93c023c4b94d3fa0db" default)))
+ '(fci-rule-color "#073642")
+ '(safe-local-variable-values (quote ((encoding . utf-8-unix)))))
+(custom-set-faces
+ ;; custom-set-faces was added by Custom.
+ ;; If you edit it by hand, you could mess it up, so be careful.
+ ;; Your init file should contain only one such instance.
+ ;; If there is more than one, they won't work right.
+ '(whitespace-space ((t (:background "#1B1D1E")))))
@@ -22,7 +22,7 @@
(global-set-key (kbd "C-x C-h") 'view-url)
;; auto-complete-mode
-(global-set-key (kbd "M-q") 'auto-complete-mode)
+(global-set-key (kbd "M-q") 'auto-complete-m)
;; sr-speedbar
(global-set-key (kbd "M-1") 'sr-speedbar-toggle)
@@ -42,4 +42,6 @@
;; deft
(global-set-key [f8] 'deft)
+;; whitespace
+(global-set-key (kbd "C-*") 'whitespace-mode)
(provide 'personal-bindings)
@@ -1,7 +1,11 @@
(defvar prelude-personal-packages
- '(csv-mode less-css-mode smex textile-mode find-file-in-project full-ack popup auto-complete deft
- prelude-css prelude-lisp prelude-programming prelude-ruby prelude-scheme prelude-scss prelude-xml sass-mode scss-mode rvm auto-complete powerline molokai-theme pomodoro htmlize
+ '(csv-mode less-css-mode smex textile-mode find-file-in-project full-ack
+ popup auto-complete deft prelude-css prelude-lisp
+ prelude-programming prelude-ruby prelude-scheme prelude-scss
+ prelude-xml sass-mode scss-mode rvm auto-complete
+ powerline molokai-theme pomodoro htmlize slim-mode
)
+
"A list of packages to ensure are installed at launch.")
(defun personal-packages-installed-p ()
View
@@ -27,6 +27,10 @@
(windmove-default-keybindings 'meta)
+;; indent hint
+;; https://github.com/ran9er/init.emacs/blob/master/20_indent-hint.el
+;;(require 'indent-hint)
+
;; use Chromium Browser as default browser
(setq browse-url-browser-function 'browse-url-generic
browse-url-generic-program "/usr/bin/chromium-browser")
@@ -36,6 +40,11 @@
(require 'molokai-theme)
(custom-theme-set-faces 'molokai)
+(require 'highlight-indentation)
+(setq highlight-indentation-offset 2)
+(set-face-background 'highlight-indentation-face "#e3e3d3")
+(set-face-background 'highlight-indentation-current-column-face "#c3b3b3")
+
(custom-set-faces
'(whitespace-space ((t (:background "#1B1D1E"))))
)
@@ -47,6 +56,11 @@
;; recognize from the normal marking (selection)
(global-hl-line-mode t) ; turn it on for all modes by default
+;; (require 'highlight-indentation)
+;; (set-face-background 'highlight-indentation-face "#e3e3d3")
+;; (set-face-background 'highlight-indentation-current-column-face "#c3b3b3")
+;; (require 'stylus-mode)
+
;; full-ack.el
(autoload 'ack-same "full-ack" nil t)
(autoload 'ack "full-ack" nil t)
Oops, something went wrong.

0 comments on commit f51d991

Please sign in to comment.