teutat3s/os
2
0
Fork 0
forked from pub-solar/os
Code Pull requests Activity

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

Browse source 
Caddyfiles, add vim-caddyfile
This commit is contained in:
teutat3s 2022-08-02 15:28:45 +02:00
parent d5ed22c6a3
commit 3142c58cf4
Signed by: teutat3s
GPG key ID: 4FA1D3FA524F22C1
5 changed files with 8117 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
modules/terminal-life/nvim/default.nix
View file

@ -15,6 +15,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 {
@ -123,6 +133,7 @@ in
ansible-vim
emmet-vim
rust-vim
vim-caddyfile
vim-go
vim-javascript
vim-json

13
modules/terminal-life/nvim/lsp.vim
View file

@ -105,7 +105,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 }
}
}
},

3
modules/terminal-life/nvim/plugins.vim
View file

@ -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

8087
profiles/base-user/.local/share/nvim/json-schemas/caddy_schema.json Normal file
View file

File diff suppressed because one or more lines are too long

4
profiles/base-user/home.nix
View file

@ -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 = ''