X-Git-Url: http://47.100.26.94:8080/?a=blobdiff_plain;f=emacs.d%2Finit.el;h=332d13c5c1cc099f046369f847d3757315097172;hb=5122a638e63b8f04a7ef40079ca99455b2d00f93;hp=386fe2be85b7f25ae2c46db8fb82de357f124ac6;hpb=2f55e58187367ad15c2f6253acb7abedbc447bcc;p=dotfiles.git diff --git a/emacs.d/init.el b/emacs.d/init.el index 386fe2b..332d13c 100644 --- a/emacs.d/init.el +++ b/emacs.d/init.el @@ -1,3 +1,12 @@ +;;;(if (eq system-type 'darwin) +;;; (setenv "PATH" +;;;) (concat (getenv "path") ":/usr/local/bin:~/bin/") +;;; ) + + +(setenv "PATH" (concat (getenv "PATH") ":/usr/local/bin")) +(setq exec-path (append exec-path '("/usr/local/bin"))) + (setq debug-on-error t) (scroll-bar-mode -1) @@ -19,65 +28,24 @@ (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 @@ -106,53 +74,13 @@ ;; (require 'magit) (setq magit-last-seen-setup-instructions "1.4.0") +(global-set-key (kbd "C-x g") 'magit-status) ;(setq magit-auto-revert-mode nil) +;(require 'init-evil) -;;--------------------------------------------------------------------------------------- -;; evil -;; -(global-evil-leader-mode) -(evil-leader/set-leader ";") -(evil-leader/set-key "e" 'find-file) -(evil-leader/set-key "b" 'switch-to-buffer) -(evil-leader/set-key "w" 'evil-write) -(require 'evil) -;(setq key-chord-two-keys-delay 0.5) -(key-chord-define evil-insert-state-map "jj" 'evil-normal-state) -(key-chord-mode 1) - -;; cursor shape -(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)) -;;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) ;;--------------------------------------------------------------------------------------- ;; Fiplr @@ -171,45 +99,57 @@ (global-set-key (kbd "C-x C-k") 'windmove-up) (global-set-key (kbd "C-x C-j") 'windmove-down) - ;;--------------------------------------------------------------------------------------- -;; Wind-move +;; sr-speedbar ;; -(set-face-attribute 'vertical-border nil :foreground "gray") +;(require 'sr-speedbar) +;(setq speedbar-use-images nil) +;(setq speedbar-show-unknown-files t) -;;--------------------------------------------------------------------------------------- -;; El-get -;; https://github.com/dimitri/el-get -;; -(add-to-list 'load-path "~/.emacs.d/el-get/el-get") +(toggle-frame-fullscreen) -(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))) -(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) +;(require 'cc-mode) +;(require 'ecb) -(el-get-bundle seudut/color-theme-tangotango -; :features color-theme-tangotango -; (color-theme-tangotango) - ) +;(setq ecb-layout-name "leftright3") -;;--------------------------------------------------------------------------------------- -;; Config folder -;; -(add-to-list 'load-path "~/.emacs.d/config") -(require 'init-color-theme) -;(require 'my-powerline) -;(require 'init-my-theme-2) +;(setq mac-command-modifier 'super) ; make cmd key do Meta +(global-set-key (kbd "") 'toggle-frame-fullscreen) -(toggle-frame-fullscreen) +(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) + +;; gnu global support +;(require 'semantic/db) +;(global-semanticdb-minor-mode 1) + +(require 'init-ggtags) + +(global-unset-key "\C-o") +(global-set-key (kbd "C-o C-f") 'ido-find-file) +(global-set-key (kbd "C-o C-b") 'ido-switch-buffer) + +(global-set-key (kbd "C-o g") 'ggtags-find-file) +(global-set-key (kbd "C-o t") 'ggtags-find-tag-dwim) + +(global-set-key (kbd "M-g M-g") 'magit-status) + + +(setq scroll-margin 5) +(setq scroll-conservatively 10000) +(show-paren-mode t)