neovim, caddy: add json-schema, use tabs in

Caddyfiles, add vim-caddyfile

modules/terminal-life/nvim/default.nix

@@ -25,6 +25,16 @@ let
     };
   };
 
+  vim-caddyfile = pkgs.vimUtils.buildVimPlugin {
+    name = "vim-caddyfile";
+    src = pkgs.fetchFromGitHub {
+      owner = "isobit";
+      repo = "vim-caddyfile";
+      rev = "24fe0720551883e407cb70ae1d7c03f162d1d5a0";
+      sha256 = "sha256-rRYv3vnt31g7hNTxttTD6BWdv5JJ+ko3rPNyDUEOZ9o=";
+    };
+  };
+
   workspace = pkgs.vimUtils.buildVimPlugin {
     name = "vim-workspace";
     src = pkgs.fetchFromGitHub {
@@ -133,6 +143,7 @@ in
     ansible-vim
     emmet-vim
     rust-vim
+    vim-caddyfile
     vim-go
     vim-javascript
     vim-json

modules/terminal-life/nvim/lsp.vim

@@ -107,7 +107,18 @@ lua <<EOF
         ['jsonls'] = { -------------------------- JSON
             ['settings'] = {
                 ['json'] = {
-                    ['schemas' ] = require('schemastore').json.schemas()
+                    ['schemas' ] = vim.list_extend(
+                      {
+                        {
+                          ['description'] = 'JSON schema for Caddy v2',
+                          ['fileMatch'] = { '*caddy*.json' },
+                          ['name'] = 'caddy_schema.json',
+                          ['url'] = vim.fn.stdpath('data')..'/json-schemas/caddy_schema.json',
+                        },
+                      },
+                      require('schemastore').json.schemas()
+                    ),
+                    ['validate'] = { ['enable'] = true }
                 }
             }
         },

modules/terminal-life/nvim/plugins.vim

@@ -17,6 +17,9 @@ autocmd FileType go nmap gD :GoDecls<CR>
 " Go formatting
 autocmd FileType go setlocal noexpandtab shiftwidth=4 tabstop=4 softtabstop=4 nolist
 
+" Caddyfile indentation
+autocmd FileType caddyfile setlocal noexpandtab shiftwidth=8 tabstop=8 softtabstop=8 nolist
+
 " vim-go disable text-objects
 let g:go_textobj_enabled = 0
 

profiles/base-user/home.nix

@@ -67,6 +67,10 @@ in
     # Ensure nvim backup directory gets created
     # Workaround for E510: Can't make backup file (add ! to override)
     xdg.dataFile."nvim/backup/.keep".text = "";
+    xdg.dataFile."nvim/json-schemas/.keep".text = "";
+    # Generated with:
+    # docker run -it --name caddy-json-schema registry.greenbaum.cloud/gc/caddy-l4:2.5.2 caddy json-schema -output /srv/caddy_schema.json
+    xdg.dataFile."nvim/json-schemas/caddy_schema.json".source = .local/share/nvim/json-schemas/caddy_schema.json;
     xdg.dataFile."nvim/templates/.keep".text = "";
     xdg.dataFile."shell.nix.tmpl" = {
       text = ''