diff --git a/modules/hm/helix.nix b/modules/hm/helix.nix index b91302d..491c8c8 100644 --- a/modules/hm/helix.nix +++ b/modules/hm/helix.nix @@ -36,19 +36,20 @@ yaml-language-server.config.yaml = { keyOrdering = false; schemas = { - kubernetes = "*.yaml"; - "http://json.schemastore.org/github-workflow" = ".github/workflows/*"; - "http://json.schemastore.org/github-action" = ".github/action.{yml,yaml}"; - "http://json.schemastore.org/ansible-stable-2.9" = "roles/tasks/*.{yml,yaml}"; - "http://json.schemastore.org/prettierrc" = ".prettierrc.{yml,yaml}"; - "http://json.schemastore.org/kustomization" = "kustomization.{yml,yaml}"; - "http://json.schemastore.org/ansible-playbook" = "*play*.{yml,yaml}"; - "http://json.schemastore.org/chart" = "Chart.{yml,yaml}"; - "https://json.schemastore.org/dependabot-v2" = ".github/dependabot.{yml,yaml}"; "https://gitlab.com/gitlab-org/gitlab/-/raw/master/app/assets/javascripts/editor/schema/ci.json" = "*gitlab-ci*.{yml,yaml}"; + "https://json.schemastore.org/ansible-playbook" = "*play*.{yml,yaml}"; + "https://json.schemastore.org/ansible-stable-2.9" = "roles/tasks/*.{yml,yaml}"; + "https://json.schemastore.org/chart" = "Chart.{yml,yaml}"; + "https://json.schemastore.org/dependabot-v2" = ".github/dependabot.{yml,yaml}"; + "https://json.schemastore.org/github-action" = ".github/action.{yml,yaml}"; + "https://json.schemastore.org/github-workflow" = ".github/workflows/*"; + "https://json.schemastore.org/hugo" = "hugo.yaml"; + "https://json.schemastore.org/kustomization" = "kustomization.{yml,yaml}"; + "https://json.schemastore.org/prettierrc" = ".prettierrc.{yml,yaml}"; "https://raw.githubusercontent.com/OAI/OpenAPI-Specification/main/schemas/v3.1/schema.json" = "*api*.{yml,yaml}"; - "https://raw.githubusercontent.com/compose-spec/compose-spec/master/schema/compose-spec.json" = "*docker-compose*.{yml,yaml}"; "https://raw.githubusercontent.com/argoproj/argo-workflows/master/api/jsonschema/schema.json" = "*flow*.{yml,yaml}"; + "https://raw.githubusercontent.com/compose-spec/compose-spec/master/schema/compose-spec.json" = "*docker-compose*.{yml,yaml}"; + kubernetes = "*.yaml"; }; }; }; diff --git a/modules/hm/nvim/nvim-lspconfig-config.lua b/modules/hm/nvim/nvim-lspconfig-config.lua index a618e58..db95182 100644 --- a/modules/hm/nvim/nvim-lspconfig-config.lua +++ b/modules/hm/nvim/nvim-lspconfig-config.lua @@ -73,19 +73,20 @@ lspconfig["yamlls"].setup { capabilities = capabilities, on_attach = on_attach, yaml = { keyOrdering = false, schemas = { - ["kubernetes"] = "*.yaml", - ["http://json.schemastore.org/github-workflow"] = ".github/workflows/*", - ["http://json.schemastore.org/github-action"] = ".github/action.{yml,yaml}", - ["http://json.schemastore.org/ansible-stable-2.9"] = "roles/tasks/*.{yml,yaml}", - ["http://json.schemastore.org/prettierrc"] = ".prettierrc.{yml,yaml}", - ["http://json.schemastore.org/kustomization"] = "kustomization.{yml,yaml}", - ["http://json.schemastore.org/ansible-playbook"] = "*play*.{yml,yaml}", - ["http://json.schemastore.org/chart"] = "Chart.{yml,yaml}", - ["https://json.schemastore.org/dependabot-v2"] = ".github/dependabot.{yml,yaml}", ["https://gitlab.com/gitlab-org/gitlab/-/raw/master/app/assets/javascripts/editor/schema/ci.json"] = "*gitlab-ci*.{yml,yaml}", + ["https://json.schemastore.org/ansible-playbook"] = "*play*.{yml,yaml}", + ["https://json.schemastore.org/ansible-stable-2.9"] = "roles/tasks/*.{yml,yaml}", + ["https://json.schemastore.org/chart"] = "Chart.{yml,yaml}", + ["https://json.schemastore.org/dependabot-v2"] = ".github/dependabot.{yml,yaml}", + ["https://json.schemastore.org/github-action"] = ".github/action.{yml,yaml}", + ["https://json.schemastore.org/github-workflow"] = ".github/workflows/*", + ["https://json.schemastore.org/hugo"] = "hugo.{yml,yaml,toml}", + ["https://json.schemastore.org/kustomization"] = "kustomization.{yml,yaml}", + ["https://json.schemastore.org/prettierrc"] = ".prettierrc.{yml,yaml}", ["https://raw.githubusercontent.com/OAI/OpenAPI-Specification/main/schemas/v3.1/schema.json"] = "*api*.{yml,yaml}", - ["https://raw.githubusercontent.com/compose-spec/compose-spec/master/schema/compose-spec.json"] = "*docker-compose*.{yml,yaml}", ["https://raw.githubusercontent.com/argoproj/argo-workflows/master/api/jsonschema/schema.json"] = "*flow*.{yml,yaml}", + ["https://raw.githubusercontent.com/compose-spec/compose-spec/master/schema/compose-spec.json"] = "*docker-compose*.{yml,yaml}", + ["kubernetes"] = "*.yaml", } } }}