From b11dd055199c74ee8875d818d180764952892916 Mon Sep 17 00:00:00 2001
From: Dave Gallant <davegallant@gmail.com>
Date: Sun, 18 Jul 2021 23:46:57 -0400
Subject: [PATCH] Add trouble-nvim

---
 home/default.nix        | 10 ++++---
 home/nvim/init2.lua     | 63 +++++++++++++++++++++++++++++++++++------
 modules/darwin/brew.nix |  1 +
 3 files changed, 62 insertions(+), 12 deletions(-)

diff --git a/home/default.nix b/home/default.nix
index 710a73a..926990a 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -168,7 +168,7 @@ in
             }
           else
             {
-              normal.family = "Fira Code";
+              normal.family = "FiraCode Nerd Font";
               size = 18;
             };
 
@@ -300,20 +300,22 @@ in
 
       extraConfig = builtins.readFile ./nvim/init.vim;
       plugins = with pkgs.vimPlugins; [
-        completion-nvim
         # gruvbox-nvim # TODO: Not working for some reason?
         # lush-nvim # required by gruvbox-nvim
-        tokyonight-nvim
+        completion-nvim
         lualine-nvim
         nerdtree
         nvim-lspconfig
         nvim-treesitter
         nvim-ts-rainbow
+        nvim-web-devicons
         rust-vim
         supertab
         syntastic
         tabular
         telescope-nvim
+        tokyonight-nvim
+        trouble-nvim
         twilight-nvim
         typescript-vim
         vim-commentary
@@ -325,9 +327,9 @@ in
         vim-nix
         vim-prettier
         vim-repeat
+        vim-signify
         vim-sneak
         vim-surround
-        vim-signify
         vim-terraform
       ];
 
diff --git a/home/nvim/init2.lua b/home/nvim/init2.lua
index 0c2280c..69e46d8 100644
--- a/home/nvim/init2.lua
+++ b/home/nvim/init2.lua
@@ -43,6 +43,61 @@ require('nvim-treesitter.configs').setup({
     },
 })
 
+--folding
+vim.api.nvim_exec([[
+    set foldmethod=expr
+    set foldlevel=20
+    set nofoldenable
+    set foldexpr=nvim_treesitter#foldexpr()
+]], true)
+
+-- trouble
+require("trouble").setup {
+  {
+    position = "bottom", -- position of the list can be: bottom, top, left, right
+    height = 10, -- height of the trouble list when position is top or bottom
+    width = 50, -- width of the list when position is left or right
+    icons = true, -- use devicons for filenames
+    mode = "lsp_workspace_diagnostics", -- "lsp_workspace_diagnostics", "lsp_document_diagnostics", "quickfix", "lsp_references", "loclist"
+    fold_open = "", -- icon used for open folds
+    fold_closed = "", -- icon used for closed folds
+    action_keys = { -- key mappings for actions in the trouble list
+        -- map to {} to remove a mapping, for example:
+        -- close = {},
+        close = "q", -- close the list
+        cancel = "<esc>", -- cancel the preview and get back to your last window / buffer / cursor
+        refresh = "r", -- manually refresh
+        jump = {"<cr>", "<tab>"}, -- jump to the diagnostic or open / close folds
+        open_split = { "<c-x>" }, -- open buffer in new split
+        open_vsplit = { "<c-v>" }, -- open buffer in new vsplit
+        open_tab = { "<c-t>" }, -- open buffer in new tab
+        jump_close = {"o"}, -- jump to the diagnostic and close the list
+        toggle_mode = "m", -- toggle between "workspace" and "document" diagnostics mode
+        toggle_preview = "P", -- toggle auto_preview
+        hover = "K", -- opens a small popup with the full multiline message
+        preview = "p", -- preview the diagnostic location
+        close_folds = {"zM", "zm"}, -- close all folds
+        open_folds = {"zR", "zr"}, -- open all folds
+        toggle_fold = {"zA", "za"}, -- toggle fold of current file
+        previous = "k", -- preview item
+        next = "j" -- next item
+    },
+    indent_lines = true, -- add an indent guide below the fold icons
+    auto_open = false, -- automatically open the list when you have diagnostics
+    auto_close = false, -- automatically close the list when you have no diagnostics
+    auto_preview = true, -- automatically preview the location of the diagnostic. <esc> to close preview and go back to last window
+    auto_fold = false, -- automatically fold a file trouble list at creation
+    signs = {
+    -- icons / text used for a diagnostic
+      error = "",
+      warning = "",
+      hint = "",
+      information = "",
+      other = "﫠"
+    },
+    use_lsp_diagnostic_signs = false -- enabling this will use the signs defined in your lsp client
+  }
+}
 
 -- twilight
 require("twilight").setup {
@@ -61,11 +116,3 @@ require("twilight").setup {
   exclude = {}, -- exclude these filetypes
 }
 vim.cmd[[autocmd BufEnter * :TwilightEnable]]
-
-vim.api.nvim_exec([[
-    set foldmethod=expr
-    set foldlevel=20
-    set nofoldenable
-    set foldexpr=nvim_treesitter#foldexpr()
-]], true)
-
diff --git a/modules/darwin/brew.nix b/modules/darwin/brew.nix
index 9f501ce..ce3afc3 100644
--- a/modules/darwin/brew.nix
+++ b/modules/darwin/brew.nix
@@ -30,6 +30,7 @@ in
     casks = [
       "1password"
       "amethyst"
+      "font-fira-code-nerd-font"
       "font-hack-nerd-font"
       "osxfuse"
       "visual-studio-code"