From 2329a25c4975dfa84a9d6665881d11cf311e3675 Mon Sep 17 00:00:00 2001
From: Dave Gallant <davegallant@gmail.com>
Date: Mon, 20 Sep 2021 09:43:50 -0400
Subject: [PATCH] Add hound.nvim

---
 common/packages.nix    |  2 +-
 home/default.nix       | 13 +++++++------
 home/nvim/lua/init.lua | 18 ++++++++++--------
 3 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/common/packages.nix b/common/packages.nix
index f0e0b3f..9c6f8f0 100644
--- a/common/packages.nix
+++ b/common/packages.nix
@@ -72,7 +72,6 @@ in
 
         # password managers
         _1password
-        bitwarden
         bitwarden-cli
         gopass
 
@@ -197,6 +196,7 @@ in
         vlc
         # Unsupported on darwin but likely should be:
         aws-sam-cli
+        bitwarden
         brave
         datasette
         deluge
diff --git a/home/default.nix b/home/default.nix
index a4e0b2a..db4efbe 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -11,13 +11,14 @@ let
       sha256 = "sha256-FDeyGH5OPAYV7zePCfDujsj+nGd5AFnqySPStJYEY2E=";
     };
   };
-  hound-vim = pkgs.vimUtils.buildVimPlugin {
-    name = "hound-vim";
+  hound-nvim = pkgs.vimUtils.buildVimPlugin {
+    name = "hound-nvim";
+    nativeBuildInputs = with pkgs; [ lua53Packages.luacheck stylua ];
     src = pkgs.fetchFromGitHub {
       owner = "davegallant";
-      repo = "hound.vim";
-      rev = "426a8711b1b5d49f136b8ac21849f34591a960ee";
-      sha256 = "sha256-Vma/cDPNGoExvUf5sP9sQ3dHWUtHpOmrVJbZbHQpdiI=";
+      repo = "hound.nvim";
+      rev = "13dd6061f1614c514feab68200779ae4bd08273d";
+      sha256 = "sha256-VZLbfEjWOYwQtVT1kOycRZKNmAd/IhiYZnCtm4Y/DWY=";
     };
   };
   inherit (pkgs) stdenv;
@@ -319,7 +320,7 @@ in
         gitlinker-nvim
         glow-nvim
         gruvbox-nvim
-        hound-vim
+        hound-nvim
         lualine-nvim
         nvim-lspconfig
         nvim-tree-lua
diff --git a/home/nvim/lua/init.lua b/home/nvim/lua/init.lua
index 99a022e..10e1bbe 100644
--- a/home/nvim/lua/init.lua
+++ b/home/nvim/lua/init.lua
@@ -255,6 +255,16 @@ require("twilight").setup {
   exclude = {}, -- exclude these filetypes
 }
 
+-- hound.nvim
+require("hound").setup {
+  hound_base_url = "http://hound", -- Rely on Tailscale's MagicDNS
+  hound_port = 6080, -- the port hound is running on
+  split = "split", -- split horizontally
+}
+vim.api.nvim_set_keymap("n", "<leader>hs", ":Hound",
+  {silent = true, noremap = true}
+)
+
 -- vim-go
 vim.g.go_auto_sameids = 0
 vim.g.go_fmt_command = "goimports"
@@ -302,14 +312,6 @@ vim.g['prettier#autoformat'] = 1
 -- git-blame
 vim.g.gitblame_enabled = 0
 
--- hound.vim
-vim.g.hound_base_url = "hound"
-vim.g.hound_port = "6080"
-vim.g.hound_results_url = 1
-vim.api.nvim_set_keymap("n", "<leader>hs", ":Hound",
-  {silent = true, noremap = true}
-)
-
 -- telescope
 vim.api.nvim_set_keymap("n", "<leader>ff", "<cmd>Telescope find_files<cr>",
   {silent = true, noremap = true}