Merge branch 'color-theme' - change color theme and eshell

[dotfiles.git] / emacs.d / config / init-base.el

diff --git a/emacs.d/config/init-base.el b/emacs.d/config/init-base.el
index 5a4d64a..7ee68e4 100644 (file)
--- a/emacs.d/config/init-base.el
+++ b/emacs.d/config/init-base.el
@@ -2,11 +2,12 @@
 
 (scroll-bar-mode -1)
 (tool-bar-mode -1)
-;(menu-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" ))
+;(add-to-list 'default-frame-alist '(font . "Source Code Pro for Powerline-12" ))
+
 (setq inhibit-startup-message t)
 
 (put 'set-goal-column 'disabled nil)
@@ -28,8 +29,27 @@
 
 (set-face-attribute 'vertical-border nil  :foreground "gray")
 
+(defalias 'yes-or-no-p 'y-or-n-p)
+
+(setq scroll-margin 5)
+(setq scroll-conservatively 10000)
+(show-paren-mode t)
+
+
+(add-hook 'help-mode-hook
+         (lambda ()
+           (linum-mode -1)))
 
+;; Dired mode
+(require 'dired+)
+;; create new file  key map
+(define-key dired-mode-map "c" 'find-file)
+;; ^ goto-up directory
+(define-key dired-mode-map (kbd "C-c C-u") 'dired-up-directory)
 
+(setq diredp-hide-details-initially-flag t)
+(setq diredp-hide-details-propagate-flag t)
 
+(setq term-buffer-maximum-size 10000)
 
 (provide 'init-base)