tmp update

6 files changed, 31 insertions, 20 deletions

diff --git a/.emacs.d/custom.el b/.emacs.d/custom.el
index 29b92da..bbbc261 100644
--- a/.emacs.d/custom.el
+++ b/.emacs.d/custom.el
@@ -9,16 +9,10 @@
  ;; 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.
- '(browse-url-firefox-arguments nil)
- '(browse-url-firefox-new-window-is-tab nil)
- '(browse-url-firefox-program "firefox-esr")
- '(custom-safe-themes
-   (quote
-	("4486ade2acbf630e78658cd6235a5c6801090c2694469a2a2b4b0e12227a64b9" "66881e95c0eda61d34aa7f08ebacf03319d37fe202d68ecf6a1dbfd49d664bc3" default)))
  '(inhibit-startup-screen t)
  '(package-selected-packages
    (quote
-	(scala-mode helm expand-region window-numbering flycheck company oceanic-theme forest-blue-theme org ## evil))))
+	(evil window-numbering scala-mode oceanic-theme neotree helm flycheck expand-region evil-leader company))))
 (custom-set-faces
  ;; custom-set-faces was added by Custom.
  ;; If you edit it by hand, you could mess it up, so be careful.
diff --git a/.emacs.d/custom.el~ b/.emacs.d/custom.el~
index 29b92da..bbbc261 100644
--- a/.emacs.d/custom.el~
+++ b/.emacs.d/custom.el~
@@ -9,16 +9,10 @@
  ;; 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.
- '(browse-url-firefox-arguments nil)
- '(browse-url-firefox-new-window-is-tab nil)
- '(browse-url-firefox-program "firefox-esr")
- '(custom-safe-themes
-   (quote
-	("4486ade2acbf630e78658cd6235a5c6801090c2694469a2a2b4b0e12227a64b9" "66881e95c0eda61d34aa7f08ebacf03319d37fe202d68ecf6a1dbfd49d664bc3" default)))
  '(inhibit-startup-screen t)
  '(package-selected-packages
    (quote
-	(scala-mode helm expand-region window-numbering flycheck company oceanic-theme forest-blue-theme org ## evil))))
+	(evil window-numbering scala-mode oceanic-theme neotree helm flycheck expand-region evil-leader company))))
 (custom-set-faces
  ;; custom-set-faces was added by Custom.
  ;; If you edit it by hand, you could mess it up, so be careful.
diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index c63707d..f0f0a01 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -52,6 +52,7 @@
   (require 'init-flycheck)
   (require 'init-expand-region)
   (require 'init-helm)
+  (require 'init-neotree)
   (require 'init-window-numbering))
 
 ;; Theme
diff --git a/.emacs.d/init.el~ b/.emacs.d/init.el~
index 7399dac..c63707d 100644
--- a/.emacs.d/init.el~
+++ b/.emacs.d/init.el~
@@ -41,15 +41,10 @@
 ;; Bootstrap
 (setq custom-file (expand-file-name "custom.el" user-emacs-directory))
 
-(require 'init-elpa)
 ;; (setq emacs-load-start-time (current-time))
 
-;; Theme
-(load-theme 'misterioso t)
-;; Make highlight color differ from the highlight line
-;; (set-face-attribute 'region nil :background "#213")
-
 (let ((file-name-handler-alist nil))
+  (require 'init-elpa)
   (require 'init-evil)
   (require 'init-org)
   (require 'init-program-basic)
@@ -59,6 +54,11 @@
   (require 'init-helm)
   (require 'init-window-numbering))
 
+;; Theme
+(load-theme 'misterioso t)
+;; Make highlight color differ from the highlight line
+(set-face-attribute 'region nil :background "#213")
+
 ;;----------------------------------------------------------------------------
 ;; Variables configured via the interactive 'customize' interface
 ;;----------------------------------------------------------------------------
diff --git a/.emacs.d/lisp/init-neotree.el b/.emacs.d/lisp/init-neotree.el
new file mode 100644
index 0000000..d25e13f
--- /dev/null
+++ b/.emacs.d/lisp/init-neotree.el
@@ -0,0 +1,11 @@
+;;; neotree --- Configuration
+
+;;; Commentary:
+
+;;; Code:
+
+(global-unset-key (kbd "C-e"))
+(global-set-key (kbd "C-x x") 'neotree-toggle)
+
+(provide 'init-neotree)
+;;; init-neotree ends here
diff --git a/.emacs.d/lisp/init-neotree.el~ b/.emacs.d/lisp/init-neotree.el~
new file mode 100644
index 0000000..c035d14
--- /dev/null
+++ b/.emacs.d/lisp/init-neotree.el~
@@ -0,0 +1,11 @@
+;;; neotree --- Configuration
+
+;;; Commentary:
+
+;;; Code:
+
+(global-unset-key (kbd "C-e"))
+(global-set-key (kbd "C-e") 'neotree-toggle)
+
+(provide 'init-neotree)
+;;; init-neotree ends here