From: Ramakrishnan Muthukrishnan Date: Tue, 21 Apr 2015 09:28:17 +0000 (+0530) Subject: cursor, hl mode, haskell-mode X-Git-Url: https://git.rkrishnan.org/components/com_hotproperty/flags/status?a=commitdiff_plain;h=a65250f10e5420d5c0a19b39ac49a05cbd3e2ad0;p=.emacs.d.git cursor, hl mode, haskell-mode --- diff --git a/angel-light-theme.el b/angel-light-theme.el deleted file mode 100644 index 9265cc7..0000000 --- a/angel-light-theme.el +++ /dev/null @@ -1,17 +0,0 @@ -(deftheme angel-light - "A light theme based on angry fruit salad.") - -(custom-theme-set-variables - 'angel-light - '(magit-use-overlays t) - '(fci-rule-color "#DFDFDF") - '(fci-rule-width 1) - '(cursor-type (quote (bar . 2)))) - -(custom-theme-set-faces - 'angel-light - '(fringe ((t (:background "White")))) - '(magit-item-highlight ((t nil))) - '(default ((t (:inherit nil :background "White" :foreground "#333" :foundry "nil"))))) - -(provide-theme 'angel-light) diff --git a/init.el b/init.el index d59136a..e0718b2 100644 --- a/init.el +++ b/init.el @@ -7,6 +7,9 @@ (setq initial-scratch-message "") (setq inhibit-startup-message t) +;; cursor bar +(setq-default cursor-type '(bar . 2)) + ;; column number (column-number-mode 1) @@ -38,7 +41,7 @@ (package-refresh-contents)) ;; make sure my list of packages are installed -(setq package-list '(go-mode rust-mode haskell-mode clojure-mode ghc restclient tangotango-theme cider fill-column-indicator)) +(setq package-list '(go-mode rust-mode haskell-mode clojure-mode ghc restclient tangotango-theme cider fill-column-indicator paredit)) ; install the missing packages (dolist (package package-list) @@ -46,9 +49,7 @@ (package-install package))) ;; tangotango -; (load-theme 'tangotango t) - -(load-theme 'angel-light t) +(load-theme 'tangotango t) ;; erc (require 'erc) @@ -87,6 +88,35 @@ ;(add-hook 'haskell-mode-hook 'turn-on-haskell-indent) (add-hook 'haskell-mode-hook 'turn-on-haskell-indentation) +;; haskell mode +(custom-set-variables + '(haskell-process-suggest-remove-import-lines t) + '(haskell-process-auto-import-loaded-modules t) + '(haskell-process-log t)) +(eval-after-load 'haskell-mode '(progn + (define-key haskell-mode-map (kbd "C-c C-l") 'haskell-process-load-or-reload) + (define-key haskell-mode-map (kbd "C-c C-z") 'haskell-interactive-switch) + (define-key haskell-mode-map (kbd "C-c C-n C-t") 'haskell-process-do-type) + (define-key haskell-mode-map (kbd "C-c C-n C-i") 'haskell-process-do-info) + (define-key haskell-mode-map (kbd "C-c C-n C-c") 'haskell-process-cabal-build) + (define-key haskell-mode-map (kbd "C-c C-n c") 'haskell-process-cabal) + (define-key haskell-mode-map (kbd "SPC") 'haskell-mode-contextual-space))) +(eval-after-load 'haskell-cabal '(progn + (define-key haskell-cabal-mode-map (kbd "C-c C-z") 'haskell-interactive-switch) + (define-key haskell-cabal-mode-map (kbd "C-c C-k") 'haskell-interactive-mode-clear) + (define-key haskell-cabal-mode-map (kbd "C-c C-c") 'haskell-process-cabal-build) + (define-key haskell-cabal-mode-map (kbd "C-c c") 'haskell-process-cabal))) + +(eval-after-load 'haskell-mode + '(define-key haskell-mode-map (kbd "C-c C-o") 'haskell-compile)) +(eval-after-load 'haskell-cabal + '(define-key haskell-cabal-mode-map (kbd "C-c C-o") 'haskell-compile)) + +(eval-after-load 'haskell-mode + '(define-key haskell-mode-map [f8] 'haskell-navigate-imports)) + +(custom-set-variables '(haskell-process-type 'cabal-repl)) + ;; ghc-mod (autoload 'ghc-init "ghc" nil t) (autoload 'ghc-debug "ghc" nil t) @@ -140,6 +170,7 @@ ;; line-number-mode (global-linum-mode t) (global-hl-line-mode t) +(set-face-background hl-line-face "#525252") ;; fci -- fill-column-indicator (setq fci-rule-column 81)