diff --git a/nvim/.config/nvim/lua/lsp.lua b/nvim/.config/nvim/lua/lsp.lua
index c01d0da..1d0f732 100644
--- a/nvim/.config/nvim/lua/lsp.lua
+++ b/nvim/.config/nvim/lua/lsp.lua
@@ -8,8 +8,43 @@ vim.api.nvim_create_autocmd('LspAttach', {
     end,
 })
 
+vim.filetype.add({
+    pattern = {
+        ["compose.*%.ya?ml"] = "yaml.docker-compose",
+        ["docker%-compose.*%.ya?ml"] = "yaml.docker-compose",
+    },
+})
+
+-- Language server install commands:
+-- lua_ls:                 brew install lua-language-server
+-- pyright:                npm install --global pyright
+-- gopls:                  go install golang.org/x/tools/gopls@latest
+-- clangd:                 brew install llvm
+-- helm_ls:                brew install helm helm-ls
+-- bashls:                 npm install --global bash-language-server
+-- angularls:              npm install --global @angular/language-server
+-- djls:                   brew install joshuadavidthomas/homebrew/django-language-server
+-- docker_language_server: go install github.com/docker/docker-language-server/cmd/docker-language-server@latest
+-- html:                   npm install --global vscode-langservers-extracted
+-- cssls:                  npm install --global vscode-langservers-extracted
+-- ts_ls:                  npm install --prefix "$HOME/.local/share/typescript-lsp" typescript typescript-language-server
+-- jsonls:                 npm install --global vscode-langservers-extracted
+-- emmet_ls:               npm install --global emmet-ls
+-- yamlls:                 npm install --global yaml-language-server
+-- Kubernetes:             provided by the yamlls schema configuration below
+
 -- Enable language servers
-local servers = { 'lua_ls', 'pyright', 'gopls', 'clangd', 'helm_ls', 'bashls', 'angularls', 'djls' }
+local servers = {
+    'lua_ls',
+    'pyright',
+    'gopls',
+    'clangd',
+    'helm_ls',
+    'bashls',
+    'angularls',
+    'djls',
+    'docker_language_server',
+}
 for _, lsp in ipairs(servers) do
     vim.lsp.enable(lsp)
 end
@@ -70,6 +105,7 @@ vim.lsp.enable('emmet_ls')
 
 -- YAML LSP
 vim.lsp.config('yamlls', {
+    filetypes = { "yaml", "yaml.gitlab", "yaml.helm-values" },
     capabilities = capabilities,
     settings = {
         yaml = {
diff --git a/nvim/.config/nvim/lua/settings.lua b/nvim/.config/nvim/lua/settings.lua
index 3526503..0a952a3 100644
--- a/nvim/.config/nvim/lua/settings.lua
+++ b/nvim/.config/nvim/lua/settings.lua
@@ -3,6 +3,12 @@ vim.o.shiftwidth = 4
 vim.o.tabstop = 4
 vim.o.expandtab = true
 vim.o.autoindent = true
+vim.g.python_indent = {
+    open_paren = "shiftwidth()",
+    nested_paren = "shiftwidth()",
+    continue = "shiftwidth()",
+    closed_paren_align_last_line = false,
+}
 vim.o.foldmethod = "indent"
 vim.o.foldlevel = 99
 vim.o.wrap = false