Merge branch 'main' into feature/tests

modules/terminal-life/nvim/default.nix

@@ -5,13 +5,13 @@ let
 
   preview-file = pkgs.writeShellScriptBin "preview-file" (import ./preview-file.nix pkgs);
 
-  vimagit-next = pkgs.vimUtils.buildVimPlugin {
+  vimagit-master = pkgs.vimUtils.buildVimPlugin {
-    name = "vimagit-next";
+    name = "vimagit-master";
     src = pkgs.fetchFromGitHub {
       owner = "jreybert";
       repo = "vimagit";
-      rev = "34eaa17ba3f5330fbcf685e48530fb572b11de32";
+      rev = "308650ddc1e9a94e49fae0ea04bbc1c45f23d4c4";
-      sha256 = "sha256-7ZvZx6ye5talX3t4dVGGyZihU6RY20HqVksuU+hC4jI=";
+      sha256 = "sha256-fhazQQqyFaO0fdoeNI9nBshwTDhKNHH262H/QThtuO0=";
     };
   };
 
@@ -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 {
@@ -118,7 +128,7 @@ in
     fugitive
     vim-gitgutter
     vim-rhubarb
-    vimagit-next
+    vimagit-master
 
     fzf-vim
     fzfWrapper
@@ -133,12 +143,14 @@ in
     ansible-vim
     emmet-vim
     rust-vim
+    vim-caddyfile
     vim-go
     vim-javascript
     vim-json
     SchemaStore-nvim
     vim-markdown
     vim-nix
+    vim-nixhash
     vim-ruby
     vim-toml
     vim-vue

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 }
                 }
             }
         },
@@ -117,10 +128,10 @@ lua <<EOF
         'solargraph', --------------------------- Ruby
         'rust_analyzer', ------------------------ Rust
         ['sqlls'] = {
-            ['cmd'] = {"$XDG_DATA_HOME/nvm/versions/node/v12.19.0/bin/sql-language-server", "up", "--method", "stdio"}
+            ['cmd'] = {vim.fn.stdpath('data')..'/nvm/versions/node/v12.19.0/bin/sql-language-server', 'up', '--method', 'stdio'}
         },
         ['terraformls'] = { --------------------- Terraform
-            ['filetypes'] = { "terraform", "hcl", "tf" }
+            ['filetypes'] = { 'terraform', 'hcl', 'tf' }
         },
 
         -- The TS/JS server is chosen depending on an environment variable,

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

@@ -55,6 +55,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 = ''