README.md

@@ -11,7 +11,6 @@ My emacs setup. Focused on:
 
 # Setup
 
-0. Install [cask](https://github.com/cask/cask)
 1. Fork this repo
 2. Clone to `~/.emacs.d`
-3. run `make`
+3. Start Emacs, `use-package` will take over

init.el

@@ -72,11 +72,6 @@
 (show-paren-mode t)
 (setq show-paren-delay 0)
 
-(use-package transpose-frame)
-
-;; load custom abbreviations
-(require 'lk/abbrevs)
-
 ;; language customizations
 (require 'lk/lang)
 

settings/lk/customizations.el

@@ -55,19 +55,17 @@
 	     :bind (( "C-c m s" . magit-status)))
 
 
+;; Editing and general syntax highlighting
+(use-package move-text)
+(use-package rainbow-delimiters)
 
 ;; Window and buffer management
 
 (global-set-key (kbd "C-x |") 'split-window-horizontally)
 (global-set-key (kbd "C-x -") 'split-window-vertically)
 
-;; better window movements
-(global-set-key (kbd "C-c <left>") 'windmove-left)
-(global-set-key (kbd "C-c <right>") 'windmove-right)
-(global-set-key (kbd "C-c <up>") 'windmove-up)
-(global-set-key (kbd "C-c <down>") 'windmove-down)
-
-(global-set-key (kbd "C-c t") 'transpose-frame)
+(use-package transpose-frame
+  :bind (( "C-c t" . transpose-frame)))
 
 ;; bind awkard M-[ & M-] to something better
 (global-set-key (kbd "M-n") 'forward-paragraph)

settings/lk/lang.el

@@ -4,7 +4,6 @@
 ;;; space, they will be moved to separate files
 
 ;;; Code:
-(use-package move-text)
 
 (use-package gitignore-mode
   :init
@@ -31,7 +30,6 @@
 (use-package sql-indent)
 (use-package terraform-mode)
 (use-package ansible)
-(use-package rainbow-delimiters)
 
 (use-package scss-mode
   :init
@@ -47,22 +45,23 @@
   (add-to-list 'auto-mode-alist '("\\.yml$". yaml-mode))
   (add-to-list 'auto-mode-alist '("\\.yaml$". yaml-mode)))
 
-                                        ; Javascripts
+;; Javascripts
 (use-package rjsx-mode
   :init
   (add-to-list 'auto-mode-alist '("\\.js$" . rjsx-mode))
-  (setq js-indent-level 2))
+  (setq js-indent-level 2)
 
-;; settings for js2 mode
-(add-hook 'js2-mode-hook (lambda () (abbrev-mode)))
-(setq-default js-switch-indent-offset 4)
-(setq-default js2-basic-offset 2)
-(setq-default js2-indent-switch-body t)
+  ;; settings for js2 mode
+  (add-hook 'js2-mode-hook (lambda () (abbrev-mode)))
+  (setq-default js-switch-indent-offset 4)
+  (setq-default js2-basic-offset 2)
+  (setq-default js2-indent-switch-body t)
+  ;; es6 is ok with trailing commas
+  (setq-default js2-strict-trailing-comma-warning nil))
 
-;; es6 is ok with trailing commas
-(setq-default js2-strict-trailing-comma-warning nil)
-
-(add-to-list 'auto-mode-alist '("\\.json$" . json-mode))
+(use-package json-mode
+  :init
+  (add-to-list 'auto-mode-alist '("\\.json$" . json-mode)))
 
 ; web-mode stuff
 (use-package web-mode
@@ -75,6 +74,7 @@
 ;; sh mode
 (setq sh-indentation 2)
 (setq sh-basic-offset 2)
+
 ;; better sql indentation
 (eval-after-load "sql"
   '(load-library "sql-indent"))

settings/lk/ruby.el

@@ -1,20 +1,15 @@
 ;;; lk/ruby --- ruby related customizations
 ;;;; Commentary:
 ;;; Code:
-(add-to-list 'auto-mode-alist '("\\.rb$" . ruby-mode))
-(add-to-list 'auto-mode-alist '("\\.rake$" . ruby-mode))
-(add-to-list 'auto-mode-alist '("Vagrantfile" . ruby-mode))
-(add-to-list 'auto-mode-alist '("Gemfile" . ruby-mode))
-(add-to-list 'auto-mode-alist '("Rakefile" . ruby-mode))
-(add-to-list 'auto-mode-alist '("Guardfile" . ruby-mode))
-
-
-(add-hook 'ruby-mode-hook (lambda ()
-                            (in-ruby-minor-mode)
-                            (local-set-key (kbd "C-c r")
-                                           'rubocop-autocorrect-current-file)))
-
-(setq-default ruby-indent-level 2)
+(use-package ruby-mode
+  :init
+  (add-to-list 'auto-mode-alist '("\\.rb$" . ruby-mode))
+  (add-to-list 'auto-mode-alist '("\\.rake$" . ruby-mode))
+  (add-to-list 'auto-mode-alist '("Vagrantfile" . ruby-mode))
+  (add-to-list 'auto-mode-alist '("Gemfile" . ruby-mode))
+  (add-to-list 'auto-mode-alist '("Rakefile" . ruby-mode))
+  (add-to-list 'auto-mode-alist '("Guardfile" . ruby-mode))
+  (setq-default ruby-indent-level 2))
 
 (provide 'lk/ruby)
 ;;; ruby.el ends here

settings/lk/theme.el

@@ -10,9 +10,8 @@
 
 (use-package color-theme)
 (use-package solarized-theme
-  :after (color-theme)
   :after (color-theme)
   :init
-  (load-theme 'solarized-dark 't))
+  (load-theme 'solarized-light 't))
 
 (provide 'lk/theme)