X-Git-Url: http://47.100.26.94:8080/?a=blobdiff_plain;f=emacs.d%2Finit.el;h=642bbb7d50dfa1af5a62d7228cd3499143d36202;hb=6150cd9d9e10c10dfef605ab236f54fed633d600;hp=a549bfd9dd631988a43a485af27e1ecd5bd7ad8d;hpb=6fc14f6c0a348011b7523d6070711aad3eb5f0db;p=dotfiles.git

diff --git a/emacs.d/init.el b/emacs.d/init.el
index a549bfd..642bbb7 100644
--- a/emacs.d/init.el
+++ b/emacs.d/init.el
@@ -15,14 +15,15 @@
 (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" ))
-
+(add-to-list 'default-frame-alist '(font . "Source Code Pro for Powerline-14" ))
+(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))
@@ -42,8 +43,8 @@
 (require 'my-packages)
 
 ;; elscreen should be placed begin of https://github.com/knu/elscreen/issues/6
-(elscreen-start)
-(require 'init-elscreen)
+;(elscreen-start)
+;(require 'init-elscreen)
 (require 'init-color-theme)
 
 
@@ -78,7 +79,7 @@
 ;(setq magit-auto-revert-mode nil)
 
 
-;(require 'init-evil)
+(require 'init-evil)
 
 
 
@@ -91,13 +92,6 @@
 
 (global-set-key (kbd "C-x f") 'fiplr-find-file)
 
-;;---------------------------------------------------------------------------------------
-;; Wind-move
-;;
-(global-set-key (kbd "C-x C-l") 'windmove-right)
-(global-set-key (kbd "C-x C-h") 'windmove-left)
-(global-set-key (kbd "C-x C-k") 'windmove-up)
-(global-set-key (kbd "C-x C-j") 'windmove-down)
 
 ;;---------------------------------------------------------------------------------------
 ;; sr-speedbar
@@ -107,7 +101,6 @@
 ;(setq speedbar-show-unknown-files t)
 
 
-;(toggle-frame-fullscreen)
 
 
 (require 'projectile)
@@ -120,38 +113,12 @@
 
 ;(setq ecb-layout-name "leftright3")
 
-
-;(setq mac-command-modifier 'super) ; make cmd key do Meta
-(global-set-key (kbd "<s-return>") '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-o") 'keyboard-quit);; same as C-g to quit
-(global-set-key (kbd "C-o C-f") 'ido-find-file)
-(global-set-key (kbd "C-o C-r") 'recentf-ido-find-file)
-(global-set-key (kbd "C-o C-b") 'ido-switch-buffer)
-(global-set-key (kbd "C-o C-j") 'ido-find-file)
-
-
-(global-set-key (kbd "C-o C-g") 'ggtags-find-file)
-(global-set-key (kbd "C-o C-t") 'ggtags-find-tag-dwim)
-
-(global-set-key (kbd "M-g M-g") 'magit-status)
-
 
 (setq scroll-margin 5)
 (setq scroll-conservatively 10000)
@@ -163,11 +130,43 @@
 (require 'recentf)
 (recentf-mode 1)
 (setq recentf-max-menu-items 100)
-(defun recentf-ido-find-file ()
-  "Find a recent file using Ido."
-  (interactive)
-  (let ((file (ido-completing-read "Choose recent file: " recentf-list nil t)))
-    (when file
-      (find-file file))))
+
 
 (require 'recentf-ext)
+
+(require 'init-key-binding)
+
+(require 'linum-relative)
+(winner-mode 1)
+
+(global-set-key (kbd "C-c C-l") 'winner-redo)
+(global-set-key (kbd "C-c C-h") 'winner-undo)
+
+
+
+;(require 'minibuffer-tray)
+;(require 'eyebrowse)
+;(eyebrowse-mode t)
+
+(require 'workgroups2)
+;;;;(workgroups-mode 1)
+
+
+;;(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 ")))))
+