Merge remote-tracking branch 'origin/windows' into windows

.gitmodules

@@ -4,3 +4,6 @@
 [submodule "pack/nvim-fabi/start/nvim-jdtls"]
 	path = pack/nvim-fabi/start/nvim-jdtls
 	url = https://github.com/mfussenegger/nvim-jdtls.git
+[submodule "pack/nvim-fabi/start/ansible-vim"]
+	path = pack/nvim-fabi/start/ansible-vim
+	url = https://github.com/pearofducks/ansible-vim

init.vim

@@ -9,6 +9,12 @@ set fcs=eob:\  list lcs=tab:\│\ ,trail:⎵
 nmap <C-z> <Nop>
 let g:mapleader = " "
 set mouse=a
+set number
+autocmd FileType yaml setlocal ts=2 sw=2
+autocmd FileType yaml.ansible setlocal ts=2 sw=2
+autocmd FileType ps1 LspStart
+" enable Escape key to return to normal mode in terminal window
+tnoremap <Esc> <C-\><C-n>
 
 function s:InitLSP()
 lua <<EOF
@@ -34,6 +40,8 @@ lua <<EOF
 	nn("<Leader>e", "<cmd>lua vim.diagnostic.open_float()<CR>")
 	nn("<Leader>p", "<cmd>lua vim.diagnostic.goto_prev()<CR>")
 	nn("<Leader>n", "<cmd>lua vim.diagnostic.goto_next()<CR>")
+	nn("<F6>", "<cmd>tabp<CR>")
+	nn("<F7>", "<cmd>tabn<CR>")
 
 	local function onattach(client, buf)
 		local function nn(from, to)
@@ -50,7 +58,7 @@ lua <<EOF
 		nn("<Leader>R", "<cmd>lua vim.lsp.buf.references()<CR>")
 		nn("<Leader>f", "<cmd>lua vim.lsp.buf.formatting()<CR>")
 	end
-	local servers = {"clangd"} -- add others here if you use them!
+	local servers = {"clangd", "ansiblels"} -- add others here if you use them!
 	for _, lsp in pairs(servers) do
 		lspconfig[lsp].setup {
 			capabilities = caps,
@@ -58,6 +66,12 @@ lua <<EOF
 			flags = {debounce_text_changes = 500}
 		}
 	end
+	lspconfig['powershell_es'].setup {
+		bundle_path = 'C:/Powershell_ES/PowerShellEditorServices',
+		capabilities = caps,
+		on_attach = onattach,
+		flags = {debounce_text_changes = 500}
+	}
 EOF
 endfunction
 

pack/nvim-fabi/start/ansible-vim

@@ -0,0 +1 @@
+Subproject commit 93798e8c89c441d29d4678da0c0d5e1429eb43b0