From a3131b4bd3c2d693238ad543efa17f5151e8b9fd Mon Sep 17 00:00:00 2001
From: Gabriel Fontes <eu@misterio.me>
Date: Mon, 26 Sep 2022 13:10:14 -0300
Subject: [PATCH] home/nvim: add qc/lc binds, replace rg with ug

---
 home/misterio/cli/default.nix      |  2 +-
 home/misterio/cli/fish.nix         |  2 --
 home/misterio/cli/nvim/default.nix | 28 +++++++++++++++++++++++++---
 home/misterio/cli/nvim/lsp.nix     |  3 ++-
 4 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/home/misterio/cli/default.nix b/home/misterio/cli/default.nix
index b3d6c25c..67db3d53 100644
--- a/home/misterio/cli/default.nix
+++ b/home/misterio/cli/default.nix
@@ -24,7 +24,7 @@
     bottom # System viewer
     ncdu # TUI disk usage
     exa # Better ls
-    ripgrep # Better grep
+    ugrep # Better grep
     fd # Better find
     httpie # Better curl
     jq # JSON pretty printer and manipulator
diff --git a/home/misterio/cli/fish.nix b/home/misterio/cli/fish.nix
index 047fafc9..ef68548b 100644
--- a/home/misterio/cli/fish.nix
+++ b/home/misterio/cli/fish.nix
@@ -4,8 +4,6 @@
     enable = true;
     shellAbbrs = {
       ls = "exa";
-      cat = "bat";
-      top = "btm";
 
       jqless = "jq -C | less -r";
 
diff --git a/home/misterio/cli/nvim/default.nix b/home/misterio/cli/nvim/default.nix
index f4c91bcd..e82c0907 100644
--- a/home/misterio/cli/nvim/default.nix
+++ b/home/misterio/cli/nvim/default.nix
@@ -52,14 +52,36 @@
       nmap <C-j> <C-e>
       nmap <C-k> <C-y>
 
-      nmap <space>q <cmd>cwindow<cr>
-      nmap <space>l <cmd>lwindow<cr>
-
+      "Buffers
       set wildcharm=<C-Z>
       nmap <space>b :buffer <C-Z>
       nmap <C-l> :bnext<CR>
       nmap <C-h> :bprev<CR>
       nmap <C-q> :bdel<CR>
+
+      "Loclist
+      nmap <space>l :lwindow<cr>
+      nmap [l :lprev<cr>
+      nmap ]l :lnext<cr>
+
+      nmap <space>L :lhistory<cr>
+      nmap [L :lolder<cr>
+      nmap ]L :lnewer<cr>
+
+      "Quickfix
+      nmap <space>q :cwindow<cr>
+      nmap [q :cprev<cr>
+      nmap ]q :cnext<cr>
+
+      nmap <space>Q :chistory<cr>
+      nmap [Q :colder<cr>
+      nmap ]Q :cnewer<cr>
+
+      "Use ugrep as :grep
+      if executable('ugrep')
+          set grepprg=ugrep\ -RInk\ -j\ -u\ --tabs=1\ --ignore-files
+          set grepformat=%f:%l:%c:%m,%f+%l+%c+%m,%-G%f\\\|%l\\\|%c\\\|%m
+      endif
     '';
 
     plugins = with pkgs.vimPlugins; [
diff --git a/home/misterio/cli/nvim/lsp.nix b/home/misterio/cli/nvim/lsp.nix
index cb4a1382..d6ed5a5c 100644
--- a/home/misterio/cli/nvim/lsp.nix
+++ b/home/misterio/cli/nvim/lsp.nix
@@ -15,7 +15,8 @@
       vim.keymap.set("n", "<space>e", vim.diagnostic.open_float, { desc = "Floating diagnostic" })
       vim.keymap.set("n", "[d", vim.diagnostic.goto_prev, { desc = "Previous diagnostic" })
       vim.keymap.set("n", "]d", vim.diagnostic.goto_next, { desc = "Next diagnostic" })
-      vim.keymap.set("n", "]d", vim.diagnostic.goto_next, { desc = "Next diagnostic" })
+      vim.keymap.set("n", "gl", vim.diagnostic.setloclist, { desc = "Diagnostics on loclist" })
+      vim.keymap.set("n", "gq", vim.diagnostic.setqflist, { desc = "Diagnostics on quickfix" })
 
       function add_sign(name, text)
         vim.fn.sign_define(name, { text = text, texthl = name, numhl = name})