|
@@ -358,20 +358,21 @@
|
|
|
|
|
|
(use-package company
|
|
(use-package company
|
|
:ensure t
|
|
:ensure t
|
|
- :diminish company-mode)
|
|
|
|
|
|
+ :diminish company-mode
|
|
|
|
+ :config
|
|
|
|
+ (add-hook 'prog-mode-hook 'company-mode)
|
|
|
|
+)
|
|
|
|
|
|
(use-package flycheck
|
|
(use-package flycheck
|
|
:ensure t
|
|
:ensure t
|
|
:diminish flycheck-mode
|
|
:diminish flycheck-mode
|
|
:config
|
|
:config
|
|
- (add-hook 'after-init-hook #'global-flycheck-mode)
|
|
|
|
-
|
|
|
|
- (setq flycheck-check-syntax-automatically '(save mode-enabled))
|
|
|
|
- (setq flycheck-checkers (delq 'emacs-lisp-checkdoc flycheck-checkers))
|
|
|
|
- (setq flycheck-checkers (delq 'html-tidy flycheck-checkers))
|
|
|
|
- (setq flycheck-standard-error-navigation nil)
|
|
|
|
-
|
|
|
|
- (global-flycheck-mode t))
|
|
|
|
|
|
+ (add-hook 'prog-mode-hook 'flycheck-mode)
|
|
|
|
+ (setq flycheck-check-syntax-automatically '(idle-change new-line save mode-enabled))
|
|
|
|
+ ;; (setq flycheck-checkers (delq 'emacs-lisp-checkdoc flycheck-checkers))
|
|
|
|
+ ;; (setq flycheck-checkers (delq 'html-tidy flycheck-checkers))
|
|
|
|
+ ;; (setq flycheck-standard-error-navigation nil)
|
|
|
|
+)
|
|
|
|
|
|
(use-package flycheck-pos-tip
|
|
(use-package flycheck-pos-tip
|
|
:ensure t
|
|
:ensure t
|
|
@@ -440,7 +441,7 @@
|
|
(eyebrowse-setup-evil-keys)
|
|
(eyebrowse-setup-evil-keys)
|
|
(setq eyebrowse-new-workspace t))
|
|
(setq eyebrowse-new-workspace t))
|
|
|
|
|
|
-(use-package monokai-theme
|
|
|
|
|
|
+(use-package solarized-theme
|
|
:ensure t)
|
|
:ensure t)
|
|
|
|
|
|
;; OS specific
|
|
;; OS specific
|
|
@@ -512,7 +513,11 @@
|
|
:config
|
|
:config
|
|
(setq haskell-interactive-popup-errors nil)
|
|
(setq haskell-interactive-popup-errors nil)
|
|
(define-key haskell-mode-map (kbd "C-c C-c") 'haskell-process-load-file)
|
|
(define-key haskell-mode-map (kbd "C-c C-c") 'haskell-process-load-file)
|
|
- (define-key haskell-mode-map (kbd "C-c C-p") 'haskell-process-reload))
|
|
|
|
|
|
+ (define-key haskell-mode-map (kbd "C-c C-p") 'haskell-process-reload)
|
|
|
|
+
|
|
|
|
+ (if (eq system-type 'windows-nt)
|
|
|
|
+ (setq haskell-process-type 'stack-ghci)))
|
|
|
|
+
|
|
|
|
|
|
(use-package emojify
|
|
(use-package emojify
|
|
:config
|
|
:config
|