 ;; highlight keywords
 (use-package fic-mode
   :config
-  :init
     (setq fic-highlighted-words `( "TODO" "HACK" "KLUDGE" "FIXME" "TRICKY" "BUG" ))
+  :init
     (me:add-hook-with-delay 'prog-mode-hook 10 #'fic-mode))
 
 (use-package whitespace
   :config
-  :init
-    (setq whitespace-line-column nil                      ; highlight past fill-column
-          whitespace-style '(face trailing tabs tab-mark lines-tail space-before-tab)
-          whitespace-display-mappings '((tab-mark 9 [9657 9] [92 9])))
+  (setq whitespace-line-column nil                      ; highlight past fill-column
+        whitespace-style '(face trailing tabs tab-mark lines-tail space-before-tab)
+        whitespace-display-mappings '((tab-mark 9 [9657 9] [92 9])))
+  :init
     (add-hook 'whitespace-mode-hook 'me:set-extra-font-attributes)
     (me:add-hook-with-delay 'prog-mode-hook 7 #'whitespace-mode)
   :diminish whitespace-mode)

    (load-file file-name))))

(me:load-init-file "system" (symbol-name system-type))
(me:load-init-file "host" system-name)



(use-package ws-butler
  :init
  (add-hook 'prog-mode-hook #'ws-butler-mode)
  (add-hook 'text-mode-hook #'ws-butler-mode)
  :config
  (setq ws-butler-convert-leading-tabs-or-spaces t)       ; convert according to indent-tabs-mode (but not when smart-tabs-mode on)
  :diminish ws-butler-mode "⌫")

(use-package shell-pop
