From 55f0484f93421bb2b1bbb55edb0613cb5d8bce44 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kier=C3=A1n=20Meinhardt?= <kmein@posteo.de>
Date: Fri, 6 Oct 2023 10:50:16 +0200
Subject: [PATCH] feat: install dhall

---
 configs/packages.nix | 6 ++++++
 lib/vim/init.lua     | 1 +
 lib/vim/init.vim     | 1 +
 packages/vim.nix     | 1 +
 4 files changed, 9 insertions(+)

diff --git a/configs/packages.nix b/configs/packages.nix
index 20136b7..7b71892 100644
--- a/configs/packages.nix
+++ b/configs/packages.nix
@@ -259,6 +259,12 @@ in {
     lua-language-server
     nodePackages.vscode-langservers-extracted
 
+    dhall-lsp-server
+    dhall-nix
+    dhall-bash
+    dhall-json
+    dhall
+
     html-tidy
     nodePackages.csslint
     nodePackages.jsonlint
diff --git a/lib/vim/init.lua b/lib/vim/init.lua
index 3f4fbf7..9a03669 100644
--- a/lib/vim/init.lua
+++ b/lib/vim/init.lua
@@ -113,6 +113,7 @@ local language_servers = {
   html = {}, -- vscode-langservers-extracted
   jsonls = {}, -- vscode-langservers-extracted
   nil_ls = {}, -- github:oxalica/nil
+  dhall_lsp_server = {}, -- dhall-lsp-server
   -- rnix = {}, -- rnix-lsp
   jqls = {}, -- jq-lsp
   rust_analyzer = { ["rust-analyzer"] = {} },
diff --git a/lib/vim/init.vim b/lib/vim/init.vim
index 5963054..c0ac263 100644
--- a/lib/vim/init.vim
+++ b/lib/vim/init.vim
@@ -100,6 +100,7 @@ augroup filetypes
   autocmd bufnewfile,bufread *.typ packadd typst.vim | set filetype=typst
   autocmd bufnewfile,bufread *.ics packadd icalendar.vim | set filetype=icalendar
   autocmd bufnewfile,bufread *.ts packadd typescript-vim | set filetype=typescript
+  autocmd bufnewfile,bufread *.dhall packadd dhall-vim | set filetype=dhall
   autocmd bufnewfile,bufread *.jq packadd jq.vim | set filetype=jq
   autocmd bufnewfile,bufread *.journal packadd vim-ledger | set filetype=ledger shiftwidth=4
   autocmd bufnewfile,bufread urls,config set filetype=conf
diff --git a/packages/vim.nix b/packages/vim.nix
index c01c79f..7f5535e 100644
--- a/packages/vim.nix
+++ b/packages/vim.nix
@@ -55,6 +55,7 @@
       ];
       opt = [
         csv
+        dhall-vim
         elm-vim
         emmet-vim
         haskell-vim