summaryrefslogtreecommitdiff
path: root/.emacs
diff options
context:
space:
mode:
authorArnaud Bailly <arnaud.oqube@gmail.com>2019-09-24 08:59:22 +0200
committerArnaud Bailly <arnaud.oqube@gmail.com>2019-09-24 08:59:22 +0200
commit16480b35a837f254baf875e5e067acfca1560503 (patch)
tree9237020baeb17344989e9f7312f8203e036c6b3c /.emacs
parentaf7c3461f960abe46e76a2d3462c230f93d12685 (diff)
downloaddotfiles-16480b35a837f254baf875e5e067acfca1560503.tar.gz
added git prompt and completion
Diffstat (limited to '.emacs')
-rw-r--r--.emacs7
1 files changed, 3 insertions, 4 deletions
diff --git a/.emacs b/.emacs
index 834abc0..7d94413 100644
--- a/.emacs
+++ b/.emacs
@@ -2,8 +2,6 @@
;; package installation
(require 'package)
-;; (add-to-list 'package-archives
-;; '("marmalade" . "http://marmalade-repo.org/packages/"))
(add-to-list 'package-archives
'("melpa" . "http://melpa.org/packages/"))
@@ -221,10 +219,11 @@
;; If there is more than one, they won't work right.
'(package-selected-packages
(quote
- (magit expand-region company-go go-autocomplete go-complete go-mode go company-coq helm-core helm helm-ag-r helm-company helm-git helm-google helm-hoogle helm-idris helm-ls-git markdown-mode multiple-cursors magit-gh-pulls intero flx-isearch flx-ido)))
+ (ag magit expand-region company-go go-autocomplete go-complete go-mode go company-coq helm-core helm helm-ag-r helm-company helm-git helm-google helm-hoogle helm-idris helm-ls-git markdown-mode multiple-cursors magit-gh-pulls intero flx-isearch flx-ido)))
'(safe-local-variable-values
(quote
- ((haskell-indentation-where-pre-offset . 4)
+ ((intero-targets "haskell-sqlite:lib" "haskell-sqlite:exe:haskell-sqlite-exe" "haskell-sqlite:test:haskell-sqlite-test")
+ (haskell-indentation-where-pre-offset . 4)
(haskell-indentation-starter-offset . 4)
(haskell-indentation-left-offset . 4)
(haskell-indentation-layout-offset . 4)