From 7ea95e90f51738a68869847008a4fb5283ab82fe Mon Sep 17 00:00:00 2001
From: teutat3s <teutates@mailbox.org>
Date: Sun, 7 Nov 2021 19:17:10 +0100
Subject: [PATCH 1/2] terminal-life: add glow, a tui markdown viewer; sort
 packages

---
 modules/terminal-life/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/modules/terminal-life/default.nix b/modules/terminal-life/default.nix
index 87b2ee4..135766c 100644
--- a/modules/terminal-life/default.nix
+++ b/modules/terminal-life/default.nix
@@ -23,16 +23,17 @@ in
 
     home-manager = with pkgs; pkgs.lib.setAttrByPath [ "users" psCfg.user.name ] {
       home.packages = [
-        ag
         ack
+        ag
         bat
         exa
+        fd
         gh
+        glow
+        nnn
         powerline
         vifm
         watson
-        nnn
-        fd
       ];
 
       programs.neovim = import ./nvim { inherit config; inherit pkgs; };

From d670aee07db3e2425828c30f420ccfe3356b28bd Mon Sep 17 00:00:00 2001
From: teutat3s <teutates@mailbox.org>
Date: Sun, 7 Nov 2021 19:26:30 +0100
Subject: [PATCH 2/2] neovim: fix jsonls, fix cursor jumping into diagnostics
 buffer

---
 modules/terminal-life/nvim/lsp.vim | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/modules/terminal-life/nvim/lsp.vim b/modules/terminal-life/nvim/lsp.vim
index 87c15ce..519330f 100644
--- a/modules/terminal-life/nvim/lsp.vim
+++ b/modules/terminal-life/nvim/lsp.vim
@@ -42,7 +42,9 @@ lua <<EOF
                 ['workspace'] = vim.fn.stdpath('cache')..'/java-workspaces'
             }
         },
-        'jsonls', ------------------------------- JSON
+        ['jsonls'] = { -------------------------- JSON
+            ['cmd'] = {"json-languageserver", "--stdio"}
+        },
         'phpactor', ----------------------------- PHP
         'pyls', --------------------------------- Python
         'rnix', --------------------------------- Nix
@@ -94,7 +96,7 @@ let g:diagnostic_trimmed_virtual_text = '40'
 let g:diagnostic_insert_delay = 1
 
 " Show diagnostic popup on cursor hold
-autocmd CursorHold * lua vim.lsp.diagnostic.show_line_diagnostics()
+autocmd CursorHold * lua vim.lsp.diagnostic.show_line_diagnostics({ focusable = false })
 
 " Goto previous/next diagnostic warning/error
 " nnoremap <silent> g[ <cmd>PrevDiagnosticCycle<cr>