summaryrefslogtreecommitdiff
path: root/.emacs.d/init.el~
diff options
context:
space:
mode:
Diffstat (limited to '.emacs.d/init.el~')
-rw-r--r--.emacs.d/init.el~7
1 files changed, 4 insertions, 3 deletions
diff --git a/.emacs.d/init.el~ b/.emacs.d/init.el~
index 9085cb4..21e091f 100644
--- a/.emacs.d/init.el~
+++ b/.emacs.d/init.el~
@@ -10,7 +10,7 @@
(scroll-bar-mode -1)
(blink-cursor-mode -1)
;; Line number
-(setq global-linum-mode t)
+(global-linum-mode 1)
;; Highlight current line
(when window-system
(global-hl-line-mode))
@@ -42,7 +42,7 @@
'(inhibit-startup-screen t)
'(package-selected-packages
(quote
- (helm expand-region window-numbering flycheck company oceanic-theme forest-blue-theme org ## evil))))
+ (scala-mode helm expand-region window-numbering flycheck company oceanic-theme forest-blue-theme org ## evil))))
(custom-set-faces
;; custom-set-faces was added by Custom.
;; If you edit it by hand, you could mess it up, so be careful.
@@ -54,7 +54,7 @@
(add-to-list 'load-path (expand-file-name "~/.emacs.d/lisp"))
;; Theme
-(load-theme 'oceanic t)
+;; (load-theme 'oceanic t)
;; Make highlight color differ from the highlight line
(set-face-attribute 'region nil :background "#213")
@@ -65,6 +65,7 @@
(require 'init-company)
(require 'init-flycheck)
(require 'init-expand-region)
+ (require 'init-helm)
(require 'init-window-numbering))
(provide 'init)