Clean up packages

1 files changed, 27 insertions, 30 deletions

diff --git a/emacs.d/init.el b/emacs.d/init.el
index 5c60dbe..b5bd88f 100644
--- a/emacs.d/init.el
+++ b/emacs.d/init.el
@@ -33,30 +33,31 @@
 
 (require 'use-package)
 
-(use-package ace-window :ensure t)
-(use-package bind-key :ensure t)
-(use-package clang-format :ensure t)
-(use-package counsel :ensure t :after (ivy) :config (counsel-mode))
-(use-package counsel-gtags :ensure t)
-(use-package counsel-projectile :ensure t :after (counsel projectile))
-(use-package diminish :ensure t)
-(use-package dired+ :ensure t)
-(use-package dired-rainbow :ensure t :after (dired+))
-(use-package flyspell-correct-ivy :ensure t :after (ivy))
-(use-package ggtags :ensure t)
-(use-package ivy :ensure t :config (ivy-mode))
-(use-package llvm-mode :ensure t)
-(use-package magit :ensure t)
-(use-package markdown-mode :ensure t)
-(use-package pdf-tools :ensure t)
-(use-package projectile :ensure t :config (projectile-global-mode))
-(use-package rainbow-delimiters :ensure t)
-(use-package smart-tabs-mode :ensure t)
-(use-package spaceline :ensure t)
-(use-package spaceline-config :after (spaceline) :config (spaceline-spacemacs-theme))
-(use-package swift-mode :ensure t)
-(use-package swiper :ensure t)
-(use-package tramp :ensure t)
+(setq use-package-always-ensure t)
+(use-package ace-window)
+(use-package clang-format :commands (c-mode c++-mode))
+(use-package counsel :after (ivy) :config (counsel-mode))
+(use-package counsel-gtags :commands ggtags-mode)
+(use-package counsel-projectile :after (counsel projectile))
+(use-package diminish)
+(use-package dired+)
+(use-package dired-rainbow :after (dired+))
+(use-package flyspell :commands flyspell-mode)
+(use-package flyspell-correct-ivy :after (flyspell ivy) :commands flyspell-mode)
+(use-package ggtags :commands ggtags-mode)
+(use-package ivy :config (ivy-mode))
+(use-package llvm-mode :commands llvm-mode)
+(use-package magit :commands magit-status :bind ("C-c m" . magit-status) :config (define-key magit-mode-map (kbd "C-<tab>") nil))
+(use-package markdown-mode :commands markdown-mode)
+(use-package pdf-tools :magic ("%PDF" . pdf-view-mode) :config (pdf-tools-install))
+(use-package projectile :config (projectile-global-mode))
+(use-package rainbow-delimiters :commands prog-mode)
+(use-package smart-tabs-mode :commands (c-mode c++-mode))
+(use-package spaceline)
+(use-package swiper :commands swiper)
+(use-package tramp)
+
+(require 'spaceline-config)
 
 ;;; Basic editor configuration
 
@@ -196,7 +197,7 @@
  '(ns-use-srgb-colorspace nil)
  '(package-selected-packages
    (quote
-    (rainbow-delimiters auctex clang-format counsel-gtags counsel-projectile dired+ dired-rainbow flyspell-correct-ivy ggtags glsl-mode ivy magit markdown-mode n3-mode pdf-tools projectile spaceline swift-mode use-package)))
+    (rainbow-delimiters auctex clang-format counsel-gtags counsel-projectile dired+ dired-rainbow flyspell-correct-ivy ggtags ivy magit markdown-mode n3-mode pdf-tools projectile spaceline use-package)))
  '(pdf-view-midnight-colors (quote ("#C3D1D1" . "#141414")))
  '(powerline-default-separator (quote arrow))
  '(projectile-completion-system (quote ivy))
@@ -272,8 +273,6 @@
 
 ;;; Key bindings
 
-(define-key magit-mode-map (kbd "C-<tab>") 'magit-section-cycle)
-
 (global-set-key (kbd "C-<left>")  'previous-buffer)
 (global-set-key (kbd "C-<right>") 'next-buffer)
 (global-set-key (kbd "C-<tab>")   'ace-window)
@@ -393,8 +392,6 @@
 
 ;; PDF
 
-(pdf-tools-install)
-
 (defun my-doc-view-hook ()
   (auto-revert-mode)
   (blink-cursor-mode -1))
@@ -424,5 +421,5 @@
 
 ;;; Launch
 
-(spaceline-compile)
+(spaceline-spacemacs-theme)
 (server-start)