X-Git-Url: http://47.100.26.94:8080/?a=blobdiff_plain;f=emacs.d%2Finit.el;h=c0cc477d800995d3b653d1247ad9deb584be7721;hb=716c2a73961c719c1ed490ee594689357a647632;hp=5aab4aa1ad2da90e56bb6c18667ab44f1a1ccd10;hpb=8aa65e057bbd5a94ebe7f5d2636d07d184c98343;p=dotfiles.git diff --git a/emacs.d/init.el b/emacs.d/init.el index 5aab4aa..c0cc477 100644 --- a/emacs.d/init.el +++ b/emacs.d/init.el @@ -7,9 +7,7 @@ (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" )) -;(load-theme 'tango-dark) -(display-time-mode t) (put 'set-goal-column 'disabled nil) (setq vc-follow-symlinks t) @@ -17,69 +15,28 @@ (setq ring-bell-function 'ignore) (setq resize-mini-windows t) -(setq ns-use-srgb-colorspace nil) + (add-to-list 'auto-mode-alist '("emacs\\'" . emacs-lisp-mode)) (fringe-mode 0) -; + + ;;; Set symbol for the border (set-display-table-slot standard-display-table 'vertical-border (make-glyph-code ?┃)) -;;--------------------------------------------------------------------------------------- -;; package -;; http://y.tsutsumi.io/emacs-from-scratch-part-2-package-management.html -;; -(require 'package) -(add-to-list 'package-archives - '("melpa" . "http://melpa.milkbox.net/packages/") t) -(package-initialize) - -(defvar required-packages - '( - 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 - elscreen - moe-theme - monokai-theme - molokai-theme -; tangotango-theme - cyberpunk-theme - ) "a list of packages to ensure are installed at launch.") - -(require 'cl) -(defun packages-installed-p () - (loop for p in required-packages - when (not (package-installed-p p)) do (return nil) - finally (return t))) - -(unless (packages-installed-p) - (message "%s" "Emacs is now refreshing its package database...") - (package-refresh-contents) - (message "%s" " done.") - (dolist (p required-packages) - (when (not (package-installed-p p)) - (package-install p)))) +(set-face-attribute 'vertical-border nil :foreground "gray") + + +(add-to-list 'load-path "~/.emacs.d/config") +(require 'my-packages) + +;; elscreen should be placed begin of https://github.com/knu/elscreen/issues/6 +(elscreen-start) +(require 'init-elscreen) +(require 'init-color-theme) + ;--------------------------------------------------------------------------------------- ;; Ido @@ -136,26 +93,13 @@ ;;Enter an emacs mode in a given state http://wikemacs.org/wiki/Evil (loop for (mode . state) in '( ; (inferior-emacs-lisp-mode . emacs) -; (nrepl-mode . insert) -; (pylookup-mode . emacs) -; (comint-mode . normal) -; (shell-mode . emacs) -; (git-commit-mode . insert) -; (git-rebase-mode . emacs) -; (term-mode . emacs) -; (help-mode . emacs) -; (helm-grep-mode . emacs) -; (grep-mode . emacs) -; (bc-menu-mode . emacs) -; (magit-branch-manager-mode . emacs) -; (rdictcc-buffer-mode . emacs) -; (dired-mode . emacs) ; (wdired-mode . normal) (eshell-mode . emacs)) do (evil-set-initial-state mode state)) -;(evil-mode 1) +;(global-evil-tabs-mode t) +;(evil-mode 1) ;;--------------------------------------------------------------------------------------- ;; Fiplr ;; @@ -173,115 +117,39 @@ (global-set-key (kbd "C-x C-k") 'windmove-up) (global-set-key (kbd "C-x C-j") 'windmove-down) - -;;--------------------------------------------------------------------------------------- -;; Wind-move -;; -(set-face-attribute 'vertical-border nil :foreground "gray") - -;(add-to-list 'load-path "~/.emacs.d/config") -;(require 'init-color-theme) - - -;;;(defun color-theme-inkpot () -;;; "Color theme based on the Inkpot theme. Ported and tweaked by Per Vognsen." -;;; (interactive) -;;; (color-theme-install -;;; '(color-theme-inkpot -;;; ((foreground-color . "#cfbfad") -;;; (background-color . "#1e1e27") -;;; (border-color . "#3e3e5e") -;;; (cursor-color . "#404040") -;;; (background-mode . dark)) -;;; (region ((t (:background "#404040")))) -;;; (highlight ((t (:background "#404040")))) -;;; (fringe ((t (:background "#16161b")))) -;;; (show-paren-match-face ((t (:background "#606060")))) -;;; (isearch ((t (:bold t :foreground "#303030" :background "#cd8b60")))) -;;; (modeline ((t (:bold t :foreground "#b9b9b9" :background "#3e3e5e")))) -;;; (modeline-inactive ((t (:foreground "#708090" :background "#3e3e5e")))) -;;; (modeline-buffer-id ((t (:bold t :foreground "#b9b9b9" :background "#3e3e5e")))) -;;; (minibuffer-prompt ((t (:bold t :foreground "#708090")))) -;;; (font-lock-builtin-face ((t (:foreground "#c080d0")))) -;;; (font-lock-comment-face ((t (:foreground "#708090")))) ; original inkpot: #cd8b00 -;;; (font-lock-constant-face ((t (:foreground "#506dbd")))) -;;; (font-lock-doc-face ((t (:foreground "#cd8b00")))) -;;; (font-lock-function-name-face ((t (:foreground "#87cefa")))) -;;; (font-lock-keyword-face ((t (:bold t :foreground "#c080d0")))) -;;; (font-lock-preprocessor-face ((t (:foreground "309090")))) -;;; (font-lock-reference-face ((t (:bold t :foreground "#808bed")))) -;;; (font-lock-string-face ((t (:foreground "#ffcd8b" :background "#404040")))) -;;; (font-lock-type-face ((t (:foreground "#ff8bff")))) -;;; (font-lock-variable-name-face ((t nil))) -;;; (font-lock-warning-face ((t (:foreground "#ffffff" :background "#ff0000")))))) - - -(require 'color-theme) - - ;;--------------------------------------------------------------------------------------- -;; El-get -;; https://github.com/dimitri/el-get +;; sr-speedbar ;; +;(require 'sr-speedbar) +;(setq speedbar-use-images nil) +;(setq speedbar-show-unknown-files t) -(add-to-list 'load-path "~/.emacs.d/el-get/el-get") -(unless (require 'el-get nil 'noerror) - (with-current-buffer - (url-retrieve-synchronously - "https://raw.githubusercontent.com/dimitri/el-get/master/el-get-install.el") - (goto-char (point-max)) - (eval-print-last-sexp))) +(toggle-frame-fullscreen) -(add-to-list 'el-get-recipe-path "~/.emacs.d/el-get-user/recipes") +(require 'projectile) +(projectile-global-mode) +(setq projectile-enable-caching t) +(require 'projectile-speedbar) -(el-get-bundle seudut/color-theme-tangotango -; :features color-theme-tangotango -; (color-theme-tangotango) - ) +(require 'cc-mode) +(require 'ecb) - +(setq ecb-layout-name "leftright3") -;(require 'color-theme-tangotango) -;(color-theme-tangotango) +;(setq mac-command-modifier 'super) ; make cmd key do Meta +(global-set-key (kbd "") 'toggle-frame-fullscreen) -;;--------------------------------------------------------------------------------------- -;; color theme -;; -;;(require 'color-theme) -;;; this color theme no bold style -;(load-theme 'sanityinc-tomorrow-night t) -;(load-theme 'sanityinc-tomorrow-bright t) -;; this theme no italic for comment -;(load-theme 'tangotango t) -;(load-theme 'cyberpunk t) - -;(require 'moe-theme) -;(moe-dark) - -(add-to-list 'custom-theme-load-path "~/.emacs.d/el-get/color-theme-tangotango") -(load-theme 'tangotango t) +(global-set-key (kbd "M-g M-v") 'split-window-right) +(global-set-key (kbd "M-g M-s") 'split-window-below) +(global-set-key (kbd "M-g M-o") 'delete-other-windows) +(global-set-key (kbd "M-g M-w") 'other-window) -;(require 'powerline) -;(powerline-default-theme) - - -;(add-to-list 'load-path "~/.emacs.d/vendor/emacs-powerline") -;(require 'powerline) -;(powerline-default-theme) - - - - -(add-to-list 'load-path "~/.emacs.d/config") -(require 'init-color-theme) -;(color-theme-inkpot) +;;;; show default directory on mode-line -;(require 'color-theme-tangotango) -;(color-theme-tangotango)