 
 (use-package magit
   :init
-  :config
-  (progn
-    (add-hook 'with-editor-mode-hook (lambda () (setq fill-column 70)))
+  (progn
+    (add-hook 'with-editor-mode-hook (lambda () (setq fill-column 70))))
+  :config
+  (progn
     ;get out of magit blame mode
     (define-key magit-blame-mode-map (kbd "<f7> b") 'magit-blame-quit)
     (use-package evil-magit))

   ("<f7> a" . magit-run-git-gui-blame)))

(use-package neotree
  :config
  (progn
    (when neo-persist-show
        (add-hook 'popwin:before-popup-hook
                  (lambda () (setq neo-persist-show nil)))
        (add-hook 'popwin:after-popup-hook
                  (lambda () (setq neo-persist-show t))))
    (add-hook 'neotree-mode-hook
              (lambda ()
                (define-key evil-normal-state-local-map (kbd "TAB") 'neotree-enter)
                (define-key evil-normal-state-local-map (kbd "SPC") 'neotree-enter)
                (define-key evil-normal-state-local-map (kbd "q") 'neotree-hide)
                (define-key evil-normal-state-local-map (kbd "RET") 'neotree-enter)))
    )
  :bind
  (("<f4> /" . neotree-toggle)
   ("<f7> /" . neotree-projectile-action)))

(use-package cc-mode
  :init
  (progn
    (add-hook 'c-mode-common-hook
              (lambda ()
                (setq c-basic-offset 3)))
    (add-hook 'c++-mode-hook
              (lambda ()
                (c-set-offset 'innamespace [0])))              ; no indentation in namespace
    (setq c-default-style "ellemtel"                           ; similar to allman style
          c-electric-pound-behavior (quote (alignleft))        ; cpp directives aligned to left
          show-paren-mode 0))

  :config
  :mode
  (("\\.c\\'"   . c-mode)
   ("\\.cpp\\'" . c++-mode)
