X-Git-Url: http://47.100.26.94:8080/?a=blobdiff_plain;f=emacs.d%2Finit.el;h=fc7fee96c4a1603914ad327b9a7c52ad63285472;hb=1508bdd3e5e0117394d06787e4d8b9c9febacf73;hp=db66bf74291ed1e56dae64adfbe65d81ded9d4c0;hpb=3c1631f21494d88e50fc25f7bc1c23f0ec434982;p=dotfiles.git diff --git a/emacs.d/init.el b/emacs.d/init.el index db66bf7..fc7fee9 100644 --- a/emacs.d/init.el +++ b/emacs.d/init.el @@ -9,118 +9,25 @@ (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" )) -(setq inhibit-startup-message t) - -(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) -(blink-cursor-mode 0) - - -(add-to-list 'auto-mode-alist '("emacs\\'" . emacs-lisp-mode)) - - - -;;; Set symbol for the border -(set-display-table-slot standard-display-table - 'vertical-border - (make-glyph-code ?┃)) - -(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 'elscreen) -;(custom-set-faces -; '(elscreen-tab-current-screen-face ((t (:background "Yellow" :foreground "black")))) -; '(elscreen-tab-other-screen-face ((t (:background "gray22" :foreground "black"))))) +(require 'init-base) +(require 'my-packages) (require 'init-color-theme) +(require 'init-ido) -;--------------------------------------------------------------------------------------- -;; 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 org-completion-use-ido t) -(setq magit-completing-read-function 'magit-ido-completing-read) - -(require 'ido-ubiquitous) -(ido-ubiquitous-mode 1) - -;; 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-last-seen-setup-instructions "1.4.0") -(global-set-key (kbd "C-x g") 'magit-status) -;(setq magit-auto-revert-mode nil) - +(require 'init-magit) (require 'init-evil) +(require 'init-project) - -;;--------------------------------------------------------------------------------------- -;; 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) - - -;;--------------------------------------------------------------------------------------- -;; sr-speedbar -;; -;(require 'sr-speedbar) -;(setq speedbar-use-images nil) -;(setq speedbar-show-unknown-files t) - - - - -(require 'projectile) -(projectile-global-mode) -(setq projectile-enable-caching t) (require 'projectile-speedbar) -;(require 'cc-mode) -;(require 'ecb) - -;(setq ecb-layout-name "leftright3") - -;; gnu global support -;(require 'semantic/db) -;(global-semanticdb-minor-mode 1) (require 'init-ggtags) @@ -148,30 +55,6 @@ -;(require 'minibuffer-tray) -;(require 'eyebrowse) -;(eyebrowse-mode t) - - - -;;(require 'minibuffer-line) -;(minibuffer-line-mode 1) - - -;(add-to-list 'load-path "~/.emacs.d/vendor") -;(require 'minibuffer-tray) -;(minibuffer-tray-mode 1) -;(require 'xwem-minibuffer) - -; (run-at-time -; nil 30 -; (lambda () -; (with-current-buffer " *Minibuf-0*" -; (erase-buffer) -; (dotimes (spaces (- (frame-width) 20)) -; (insert " ")) -; (insert (format-time-string "%m-%d %I:%M %p %a "))))) - @@ -192,7 +75,7 @@ -(require 'evil-escape) +;;;;;(require 'escape) ;(setq-default evil-escape-delay 0.2) ;(setq evil-escape-excluded-major-modes '(dired-mode)) ;(setq-default evil-escape-key-sequence "jj") @@ -222,17 +105,71 @@ ;; --------------------------------- ;; linum-relative -(require 'linum-relative) (custom-set-variables - '(fringe-mode (quote (4 . 0)) nil (fringe))) + ;; 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. + '(fringe-mode (quote (4 . 0)) nil (fringe)) + '(ggtags-split-window-function (quote split-window-vertically)) + '(hes-mode-alist + (quote + ((c-mode . "\\(\\\\\\([0-7]\\{1,3\\}\\|x[[:xdigit:]]+\\|u[[:xdigit:]]\\{4\\}\\|U[[:xdigit:]]\\{8\\}\\|[\"'?\\abfnrtv]\\)\\)") + (cperl-mode . "\\(\\\\\\([0-7]\\{1,3\\}\\|x[[:xdigit:]]+\\|u[[:xdigit:]]\\{4\\}\\|U[[:xdigit:]]\\{8\\}\\|[\"'?\\abfnrtv]\\)\\)") + (c++-mode . "\\(\\\\\\([0-7]\\{1,3\\}\\|x[[:xdigit:]]+\\|u[[:xdigit:]]\\{4\\}\\|U[[:xdigit:]]\\{8\\}\\|[\"'?\\abfnrtv]\\)\\)") + (objc-mode . "\\(\\\\\\([0-7]\\{1,3\\}\\|x[[:xdigit:]]+\\|u[[:xdigit:]]\\{4\\}\\|U[[:xdigit:]]\\{8\\}\\|[\"'?\\abfnrtv]\\)\\)") + (java-mode . "\\(\\\\\\([0-7]\\{1,3\\}\\|u[[:xdigit:]]\\{4\\}\\|[\"'\\bfnrt]\\)\\)") + (js-mode . "\\(\\\\\\([0-7]\\{1,3\\}\\|x[[:xdigit:]]\\{2\\}\\|u[[:xdigit:]]\\{4\\}\\|.\\)\\)") + (js2-mode . "\\(\\\\\\([0-7]\\{1,3\\}\\|x[[:xdigit:]]\\{2\\}\\|u[[:xdigit:]]\\{4\\}\\|.\\)\\)") + (ruby-mode + ("\\(\\\\\\([0-7]\\{1,3\\}\\|x[[:xdigit:]]\\{1,2\\}\\|u\\(?:[[:xdigit:]]\\{4\\}\\|{[[:xdigit:]]\\{1,6\\}\\(?:[[:space:]]+[[:xdigit:]]\\{1,6\\}\\)*}\\)\\|.\\)\\)" + (0 + (let* + ((state + (syntax-ppss)) + (term + (nth 3 state))) + (when + (or + (and + (eq term 39) + (member + (match-string 2) + (quote + ("\\" "'")))) + (if + (fboundp + (quote ruby-syntax-expansion-allowed-p)) + (ruby-syntax-expansion-allowed-p state) + (memq term + (quote + (34 47 10 96 t))))) + (add-face-text-property + (match-beginning 1) + (match-end 1) + (quote hes-escape-backslash-face)) + (add-face-text-property + (match-beginning 2) + (match-end 2) + (quote hes-escape-sequence-face)) + nil)) + prepend)))))) + '(org-agenda-files (quote ("~/Private/org/diary.org" "~/temp/org-note.org"))) + '(powerline-text-scale-factor 0.85)) ;; maybe better to fix the size of line number rather scaled 0.8 ;; https://github.com/howardabrams/dot-files/blob/master/emacs.org (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. '(highlight-current-line-face ((t (:background "gray22")))) '(linum ((t (:background "#000000" :foreground "gray40" :height 0.8 :slant italic :weigth light)))) - '(linum-relative-current-face ((t (:inherit linum :foreground "Yellow" :weight light :height 0.8))))) + '(linum-relative-current-face ((t (:inherit linum :foreground "Yellow" :weight light :height 0.8)))) + '(mode-line ((t (:foreground "#030303" :background "#bdbdbd" :box nil :family "Source Code Pro for Powerline" :height 100)))) + '(mode-line-inactive ((t (:foreground "#f9f9f9" :background "#666666" :box nil :family "Source Code Pro for Powerline" :height 100))))) ;; enable linum-relative in programming mode @@ -246,19 +183,6 @@ -;(defun pl-fringe-mode () -; "jfoewoif" -; (if linum-mode -; (fringe-mode '(4 . 0)) -; (fringe-mode '(0 . 0)))) - - -;(add-hook 'eshell-mode-hook 'pl-fringe-mode) -;(add-hook 'prog-mode-hook 'pl-fringe-mode) - - - - (require 'workgroups2) @@ -272,3 +196,20 @@ wg-mode-line-decor-divider ":") ;(workgroups-mode 1) +(defalias 'perl-mode 'cperl-mode) +;(setq cperl-invalid-face nil) + (setq cperl-invalid-face (quote off)) +;(add-hook 'prog-mode-hook '(lambda () +; (highlight-regexp "%[[:alpha:]]\\|\\\\[[:alpha:]]"))) + +(require 'highlight-escape-sequences) +(hes-mode) +;(setq cperl-font-lock t) +(put 'hes-escape-backslash-face 'face-alias 'font-lock-builtin-face) +(put 'hes-escape-sequence-face 'face-alias 'font-lock-builtin-face) + + +;(add-to-list 'load-path "~/.emacs.d/Emacs-PDE-0.2.16/lisp/") +;(load "pde-load") ; + +(require 'init-linum)