From b03835b4c4e77f26f8195f432343c9f1360e7fbe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kier=C3=A1n=20Meinhardt?= <kieran.meinhardt@gmail.com>
Date: Tue, 12 Mar 2019 19:21:15 +0100
Subject: [PATCH] ghcid

---
 dot/ghci.nix |  1 +
 dot/vim.nix  | 13 +++++++++++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/dot/ghci.nix b/dot/ghci.nix
index 594fcf6..569f8b3 100644
--- a/dot/ghci.nix
+++ b/dot/ghci.nix
@@ -6,5 +6,6 @@
 :def pl \x -> return $ ":!${pkgs.haskellPackages.pointfree}/bin/pointfree -v \"" ++ x ++ "\""
 :def unpl \x -> return $ ":!${pkgs.haskellPackages.pointful}/bin/pointful \"" ++ x ++ "\""
 :set prompt "\o033[1m%s\o033[1;34m λ\o033[0m "
+:set -Wall
 ''
 # :def djinn \x -> return $ ":!echo \"" ++ x ++ "\" | ${pkgs.haskell.packages.ghc7102.djinn}/bin/djinn /dev/stdin"
diff --git a/dot/vim.nix b/dot/vim.nix
index 9870778..2d36027 100644
--- a/dot/vim.nix
+++ b/dot/vim.nix
@@ -59,6 +59,15 @@ with import ../helpers.nix;
         sha256 = "1y4nnz38zal1ffs5n751dn9p9apk8q7pq3cw79r5z6fsdp942ai6";
       };
     })
+    (pkgs.vimUtils.buildVimPluginFrom2Nix {
+      name = "ghcid";
+      src = "${(pkgs.fetchFromGitHub {
+        owner = "ndmitchell";
+        repo = "ghcid";
+        rev = "5288801e7f046c42972527cd94171ce893ba91cf";
+        sha256 = "0dgxsl1dci6w3x662c7z1zw8yvfnch4ymhsvx29n7jkgqmcy1lki";
+      }).out}/plugins/nvim";
+    })
   ];
   vimrc = ''
     " if tabular
@@ -152,13 +161,13 @@ with import ../helpers.nix;
       autocmd bufnewfile,bufread *.md set filetype=markdown.pandoc | set nospell
       autocmd bufnewfile,bufread *.nix :packadd vim-nix | set filetype=nix
       autocmd bufnewfile,bufread *.rust :packadd rust-vim deoplete-rust
-      autocmd bufnewfile,bufread *.csv :packadd csv
+      autocmd bufnewfile,bufread *.csv :packadd csv-vim
       autocmd bufnewfile,bufread *.tex :packadd vimtex | set filetype=tex
       autocmd bufnewfile,bufread *.ts :packadd vim-typescript
       autocmd bufnewfile,bufread *.journal :packadd vim-ledger | set filetype=ledger shiftwidth=4
       autocmd bufnewfile,bufread config set filetype=conf
       autocmd bufnewfile,bufread *.elm :packadd elm-vim | set filetype=elm shiftwidth=4
-      autocmd filetype haskell :packadd haskell-vim | :packadd vim-hindent | set formatprg=hindent
+      autocmd filetype haskell :packadd haskell-vim | :packadd vim-hindent | set formatprg=hindent | :packadd ghcid
       autocmd filetype python set formatprg=black
       autocmd filetype javascript *.js :packadd vim-javascript
       autocmd filetype make setlocal noexpandtab