Merge pull request 'Various neovim cherry-picks' (#96) from fix/neovim-cherry-picks into main
Reviewed-on: https://git.b12f.io/pub-solar/os/pulls/96 Reviewed-by: Benjamin Bädorf <b12f@noreply.example.org>
This commit is contained in:
commit
524845a460
|
@ -5,6 +5,16 @@ let
|
||||||
|
|
||||||
preview-file = pkgs.writeShellScriptBin "preview-file" (import ./preview-file.nix pkgs);
|
preview-file = pkgs.writeShellScriptBin "preview-file" (import ./preview-file.nix pkgs);
|
||||||
|
|
||||||
|
vimagit-master = pkgs.vimUtils.buildVimPlugin {
|
||||||
|
name = "vimagit-master";
|
||||||
|
src = pkgs.fetchFromGitHub {
|
||||||
|
owner = "jreybert";
|
||||||
|
repo = "vimagit";
|
||||||
|
rev = "308650ddc1e9a94e49fae0ea04bbc1c45f23d4c4";
|
||||||
|
sha256 = "sha256-fhazQQqyFaO0fdoeNI9nBshwTDhKNHH262H/QThtuO0=";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
instant-nvim = pkgs.vimUtils.buildVimPlugin {
|
instant-nvim = pkgs.vimUtils.buildVimPlugin {
|
||||||
name = "instant";
|
name = "instant";
|
||||||
src = pkgs.fetchFromGitHub {
|
src = pkgs.fetchFromGitHub {
|
||||||
|
@ -15,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 {
|
workspace = pkgs.vimUtils.buildVimPlugin {
|
||||||
name = "vim-workspace";
|
name = "vim-workspace";
|
||||||
src = pkgs.fetchFromGitHub {
|
src = pkgs.fetchFromGitHub {
|
||||||
|
@ -108,7 +128,7 @@ in
|
||||||
fugitive
|
fugitive
|
||||||
vim-gitgutter
|
vim-gitgutter
|
||||||
vim-rhubarb
|
vim-rhubarb
|
||||||
vimagit
|
vimagit-master
|
||||||
|
|
||||||
fzf-vim
|
fzf-vim
|
||||||
fzfWrapper
|
fzfWrapper
|
||||||
|
@ -123,12 +143,14 @@ in
|
||||||
ansible-vim
|
ansible-vim
|
||||||
emmet-vim
|
emmet-vim
|
||||||
rust-vim
|
rust-vim
|
||||||
|
vim-caddyfile
|
||||||
vim-go
|
vim-go
|
||||||
vim-javascript
|
vim-javascript
|
||||||
vim-json
|
vim-json
|
||||||
SchemaStore-nvim
|
SchemaStore-nvim
|
||||||
vim-markdown
|
vim-markdown
|
||||||
vim-nix
|
vim-nix
|
||||||
|
vim-nixhash
|
||||||
vim-ruby
|
vim-ruby
|
||||||
vim-toml
|
vim-toml
|
||||||
vim-vue
|
vim-vue
|
||||||
|
|
|
@ -107,7 +107,18 @@ lua <<EOF
|
||||||
['jsonls'] = { -------------------------- JSON
|
['jsonls'] = { -------------------------- JSON
|
||||||
['settings'] = {
|
['settings'] = {
|
||||||
['json'] = {
|
['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
|
'solargraph', --------------------------- Ruby
|
||||||
'rust_analyzer', ------------------------ Rust
|
'rust_analyzer', ------------------------ Rust
|
||||||
['sqlls'] = {
|
['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
|
['terraformls'] = { --------------------- Terraform
|
||||||
['filetypes'] = { "terraform", "hcl", "tf" }
|
['filetypes'] = { 'terraform', 'hcl', 'tf' }
|
||||||
},
|
},
|
||||||
|
|
||||||
-- The TS/JS server is chosen depending on an environment variable,
|
-- The TS/JS server is chosen depending on an environment variable,
|
||||||
|
|
|
@ -17,6 +17,9 @@ autocmd FileType go nmap gD :GoDecls<CR>
|
||||||
" Go formatting
|
" Go formatting
|
||||||
autocmd FileType go setlocal noexpandtab shiftwidth=4 tabstop=4 softtabstop=4 nolist
|
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
|
" vim-go disable text-objects
|
||||||
let g:go_textobj_enabled = 0
|
let g:go_textobj_enabled = 0
|
||||||
|
|
||||||
|
|
8087
profiles/base-user/.local/share/nvim/json-schemas/caddy_schema.json
Normal file
8087
profiles/base-user/.local/share/nvim/json-schemas/caddy_schema.json
Normal file
File diff suppressed because one or more lines are too long
|
@ -55,6 +55,10 @@ in
|
||||||
# Ensure nvim backup directory gets created
|
# Ensure nvim backup directory gets created
|
||||||
# Workaround for E510: Can't make backup file (add ! to override)
|
# Workaround for E510: Can't make backup file (add ! to override)
|
||||||
xdg.dataFile."nvim/backup/.keep".text = "";
|
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."nvim/templates/.keep".text = "";
|
||||||
xdg.dataFile."shell.nix.tmpl" = {
|
xdg.dataFile."shell.nix.tmpl" = {
|
||||||
text = ''
|
text = ''
|
||||||
|
|
Loading…
Reference in a new issue