X-Git-Url: http://47.100.26.94:8080/?a=blobdiff_plain;f=emacs%2Femacs;h=17f35a6cff1f8cd78742985a14ae203b710358dc;hb=8e03f4fe04088aaf105e7a78976651bfd2f6275a;hp=c945a7f8b418367082a3b953fbb2b14fcf4dba51;hpb=d6e884930cf7215434b2b92c170fb8858be0af5c;p=dotfiles.git diff --git a/emacs/emacs b/emacs/emacs index c945a7f..17f35a6 100644 --- a/emacs/emacs +++ b/emacs/emacs @@ -1,10 +1,30 @@ + +(setq debug-on-error t) + (scroll-bar-mode -1) (tool-bar-mode -1) +(menu-bar-mode -1) (add-to-list 'default-frame-alist '(width . 120)) (add-to-list 'default-frame-alist '(height . 40)) -(add-to-list 'default-frame-alist '(font . "Source Code Pro for Powerline-12:weight:light" )) +;(add-to-list 'default-frame-alist '(font . "Source Code Pro for Powerline-12:weight:light" )) +(add-to-list 'default-frame-alist '(font . "Source Code Pro for Powerline-12" )) (load-theme 'tango-dark) + +(put 'set-goal-column 'disabled nil) +(setq vc-follow-symlinks t) +(setq visible-bell 1) +(setq ring-bell-function 'ignore) +(setq resize-mini-windows t) + + +(add-to-list 'auto-mode-alist '("emacs\\'" . emacs-lisp-mode)) +;(set-fringe-mode nil) +(fringe-mode 0) +;(set-fringe-mode 1) + + + ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;http://y.tsutsumi.io/emacs-from-scratch-part-2-package-management.html (require 'package) @@ -14,56 +34,282 @@ (defvar required-packages '( -; magit + magit helm ido-ubiquitous yasnippet + evil + ido-vertical-mode + smex + color-theme + color-theme-sanityinc-tomorrow + key-chord + powerline-evil + powerline + evil-leader + flx-ido + flx + auto-complete + fiplr + w3m + ace-jump-mode + el-get + color-identifiers-mode ) "a list of packages to ensure are installed at launch.") - -; my-packages.el (require 'cl) - -; method to check if all packages are installed (defun packages-installed-p () (loop for p in required-packages when (not (package-installed-p p)) do (return nil) finally (return t))) -; if not all packages are installed, check one by one and install the missing ones. (unless (packages-installed-p) - ; check for new packages (package versions) (message "%s" "Emacs is now refreshing its package database...") (package-refresh-contents) (message "%s" " done.") - ; install the missing packages (dolist (p required-packages) (when (not (package-installed-p p)) (package-install p)))) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + +;;--------------------------------------------------------------------------------------- +;; color theme +;; +(require 'color-theme) +(load-theme 'sanityinc-tomorrow-bright t) + +;;--------------------------------------------------------------------------------------- +;; Ido +;; +(require 'ido-vertical-mode) +(ido-vertical-mode 1) +(require 'flx-ido) +(ido-mode 1) +(ido-everywhere 1) +(flx-ido-mode 1) +(setq ido-use-faces nil) +;(setq ido-enable-flex-matching t) +;(setq ido-use-faces t) +;(setq ido-use-faces nil) +;(set-face-attribute 'ido-vertical-first-match-face nil +; :background "#e5b7c0") +;(set-face-attribute 'ido-vertical-only-match-face nil +; :background "#e52b50" +; :foreground "white") +;(set-face-attribute 'ido-vertical-match-face nil +; :foreground "#b00000") + +;; smex +(require 'smex) +(global-set-key (kbd "M-x") 'smex) +(global-set-key (kbd "M-X") 'smex-major-mode-commands) + +;;--------------------------------------------------------------------------------------- +;; Magit +;; +(require 'magit) +;(setq magit-auto-revert-mode nil) +(setq magit-last-seen-setup-instructions "1.4.0") + +;;--------------------------------------------------------------------------------------- +;; powerline +;; +(require 'powerline) +;(powerline-evil-vim-color-theme) +(powerline-evil-center-color-theme) +(display-time-mode t) + +;;--------------------------------------------------------------------------------------- +;; evil +;; +(global-evil-leader-mode) +(evil-leader/set-leader ";") +(evil-leader/set-key "e" 'find-file) +(evil-leader/set-key "b" 'switch-to-buffer) +(require 'evil) +;(setq key-chord-two-keys-delay 0.5) +;(key-chord-define evil-normal-state-map "jj" 'evil-force-normal-state) +;(key-chord-define evil-visual-state-map "jj" 'evil-change-to-previous-state) +(key-chord-define evil-insert-state-map "jj" 'evil-normal-state) +;(key-chord-define evil-replace-state-map "jj" 'evil-normal-state) +(key-chord-mode 1) + +;; change mode-line color by evil state +(lexical-let ((default-color (cons (face-background 'mode-line) + (face-foreground 'mode-line)))) + (add-hook 'post-command-hook + (lambda () + (let ((color (cond ((minibufferp) default-color) + ((evil-insert-state-p) '("#e80000" . "#ffffff")) + ((evil-emacs-state-p) '("#444488" . "#ffffff")) + ((buffer-modified-p) '("#006fa0" . "#ffffff")) + (t default-color)))) + (set-face-background 'mode-line (car color)) + (set-face-foreground 'mode-line (cdr color)))))) + +(setq evil-emacs-state-cursor '("red" box)) +(setq evil-normal-state-cursor '("green" box)) +(setq evil-visual-state-cursor '("orange" box)) +(setq evil-insert-state-cursor '("red" bar)) +(setq evil-replace-state-cursor '("red" bar)) +(setq evil-operator-state-cursor '("red" hollow)) + +(evil-mode 1) +;(require 'powerline-evil) +;; TODO: enter emacs mode in eshll rather then evil mode + +;;--------------------------------------------------------------------------------------- +;; Fiplr +;; (setq fiplr-root-markers '(".git" ".svn" "*.DS_Store")) (setq fiplr-ignored-globs '((directories (".git" ".svn")) (files ("*.jpg" "*.png" "*.zip" "*~" "*.o" ".obj" "*.swp" "*.hg" ".pyc" ".*" )))) +(global-set-key (kbd "C-x f") 'fiplr-find-file) +;;--------------------------------------------------------------------------------------- + +;(setq mac-right-option-modifier 'control) + + + +;;--------------------------------------------------------------------------------------- +;; Helm +;; +;;;;;;;;;;; helm configuration https://github.com/emacs-helm/helm http://tuhdo.github.io/helm-intro.html +;;(require 'helm-config) +;;(global-set-key (kbd "M-x") 'helm-M-x) +;;(helm-mode 1) +;;(setq helm-M-x-fuzzy-match t) +;;(global-set-key (kbd "C-x b") 'helm-mini) +;;(setq helm-buffers-fuzzy-matching t +;; helm-recentf-fuzzy-match t) +;;(global-set-key (kbd "C-x C-f") 'helm-find-files) +;;(when (executable-find "ack-grep") +;; (setq helm-grep-default-command "ack-grep -Hn --no-group --no-color %e %p %f" +;; helm-grep-default-recurse-command "ack-grep -H --no-group --no-color %e %p %f")) +;;(setq helm-ff-skip-boring-files t) +;;;(require 'helm-config) +;;;(require 'helm-themes) +;;;(set-face-attribute 'helm-selection nil :background "#441100") + +;;--------------------------------------------------------------------------------------- +;; auto-complete +;; +(require 'auto-complete) +(auto-complete-mode 1) + + +;;; ---------------------------------------- el-get ----------------------------------------- +;(require 'el-get) +;(add-to-list 'el-get-recipe-path "~/.emacs.d/el-get-user/recipes") + +;(el-get-bundle packages/sm-package-powerline +; :url "https://github.com/laynor/emacs-conf.git" +; ) + + +;;; ----------------------------------------------------------------------------------------- +;(add-to-list 'load-path "~/.emacs.d/test/powerline") +;(require 'powerline) + -(setq mac-right-option-modifier 'control) -(global-set-key (kbd "C-x f") 'fiplr-find-file) -;(ido-mode 1) -;(ido-everywhere 1) - -;;;;;;;;; helm configuration https://github.com/emacs-helm/helm http://tuhdo.github.io/helm-intro.html -(require 'helm-config) -(global-set-key (kbd "M-x") 'helm-M-x) -(helm-mode 1) -(setq helm-M-x-fuzzy-match t) -(global-set-key (kbd "C-x b") 'helm-mini) -(setq helm-buffers-fuzzy-matching t - helm-recentf-fuzzy-match t) -(global-set-key (kbd "C-x C-f") 'helm-find-files) -(when (executable-find "ack-grep") - (setq helm-grep-default-command "ack-grep -Hn --no-group --no-color %e %p %f" - helm-grep-default-recurse-command "ack-grep -H --no-group --no-color %e %p %f")) +; +;(require 'powerline-evil) +;;;; --------------------------- powerline -------------------------------------- +;(custom-set-faces +; '(mode-line-buffer-id ((t (:foreground "#008000" :bold t)))) +; '(which-func ((t (:foreground "#008000")))) +; '(mode-line ((t (:foreground "#008000" :background "#dddddd" :box nil)))) +; '(mode-line-inactive ((t (:foreground "#008000" :background "#bbbbbb" :box nil))))) +; +; +;(defun powerline-simpler-vc-mode (s) +; (if s +; (replace-regexp-in-string "Git:" "" s) +; s)) +; +;(defun powerline-simpler-minor-display (s) +; (replace-regexp-in-string +; (concat " " +; (mapconcat 'identity '("Undo-Tree" "GitGutter" "Projectile" +; "Abbrev" "ColorIds" "MRev" "ElDoc" "Paredit" +; "+1" "+2" "FlyC" "Fly" ;; ":1/0" +; "Fill" "AC" "FIC") "\\|")) "" s)) +; +;(defun powerline-ha-theme () +; "A powerline theme that removes many minor-modes that don't serve much purpose on the mode-line." +; (interactive) +; (setq-default mode-line-format +; '("%e" +; (:eval +; (let* +; ((active +; (powerline-selected-window-active)) +; (mode-line +; (if active 'mode-line 'mode-line-inactive)) +; (face1 +; (if active 'powerline-active1 'powerline-inactive1)) +; (face2 +; (if active 'powerline-active2 'powerline-inactive2)) +; (separator-left +; (intern +; (format "powerline-%s-%s" powerline-default-separator +; (car powerline-default-separator-dir)))) +; (separator-right +; (intern +; (format "powerline-%s-%s" powerline-default-separator +; (cdr powerline-default-separator-dir)))) +; (lhs +; (list +; (powerline-raw "%*" nil 'l) +; ;; (powerline-buffer-size nil 'l) +; (powerline-buffer-id nil 'l) +; (powerline-raw " ") +; (funcall separator-left mode-line face1) +; (powerline-narrow face1 'l) +; (powerline-simpler-vc-mode (powerline-vc face1)))) +; (rhs +; (list +; (powerline-raw mode-line-misc-info face1 'r) +; (powerline-raw global-mode-string face1 'r) +; (powerline-raw "%4l" face1 'r) +; (powerline-raw ":" face1) +; (powerline-raw "%3c" face1 'r) +; (funcall separator-right face1 mode-line) +; (powerline-raw " ") +; (powerline-raw "%6p" nil 'r) +; (powerline-hud face2 face1))) +; (center +; (list +; (powerline-raw " " face1) +; (funcall separator-left face1 face2) +; (when +; (boundp 'erc-modified-channels-object) +; (powerline-raw erc-modified-channels-object face2 'l)) +; (powerline-major-mode face2 'l) +; (powerline-process face2) +; (powerline-raw " :" face2) +; +; (powerline-simpler-minor-display (powerline-minor-modes face2 'l)) +; +; (powerline-raw " " face2) +; (funcall separator-right face2 face1)))) +; (concat +; (powerline-render lhs) +; (powerline-fill-center face1 +; (/ +; (powerline-width center) +; 2.0)) +; (powerline-render center) +; (powerline-fill face1 +; (powerline-width rhs)) +; (powerline-render rhs))))))) +; +;(powerline-ha-theme) +; +; +;(provide 'init-mode-line)