diff --git a/.gitignore b/.gitignore
index b9c1460..63212a2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,9 @@ package-lock.json
 
 # stt model
 ggml-*.bin
+
+# xdg config, only useful for test runs
+mimeapps.list
+
+# htmlhint config, not a part of nvim config
+.htmlhintrc
diff --git a/makefile b/makefile
index 4d15c44..4e993fa 100644
--- a/makefile
+++ b/makefile
@@ -49,8 +49,11 @@ remove_cfg:
 		rm $(CONFIG_FILES_FILE); \
 	fi
 
+update:
+	@ndzu --headless '+Lazy! update' '+Lazy! sync' '+MasonToolsUpdateSync' +qa
+
 # PACMAN_DEPS: deno tree-sitter-cli nix luarocks jdk21-openjdk 
 # CARGO_BINS: nu nu_plugin_polars
-install: install_bin install_cfg
+install: install_bin install_cfg update
 
 remove: remove_bin remove_cfg
diff --git a/nvim/lua/dzu/keymaps.lua b/nvim/lua/dzu/keymaps.lua
index bdf0b82..f036d34 100644
--- a/nvim/lua/dzu/keymaps.lua
+++ b/nvim/lua/dzu/keymaps.lua
@@ -49,6 +49,9 @@ keymap(vm, "p", '"_dP', opts)
 keymap(nm, "s", "<Nop>", opts)
 keymap(nm, "sw", ":lua require('dzu.macro').toggle_whitespace_helpers()<CR>", opts)
 
+-- toggle line wrapping
+keymap(nm, '<leader>w', ":lua require('dzu.macro').toggle_wrapping()<CR>", opts)
+
 -- open file browser
 keymap(nm, '<leader>a', ':NvimTreeToggle<CR>', opts) -- open file explorer in the current folder, shirnk it a bit, and move to the left-most
 
diff --git a/nvim/lua/dzu/lsp/lua_ls.lua b/nvim/lua/dzu/lsp/lua_ls.lua
index 74ec078..a67daa5 100644
--- a/nvim/lua/dzu/lsp/lua_ls.lua
+++ b/nvim/lua/dzu/lsp/lua_ls.lua
@@ -17,6 +17,13 @@ return {
             telemetry = {
                 enable = false,
             },
-        }
-    }
+            format = {
+                enable = true,
+                defaultConfig = {
+                    indent_style = "space",
+                    indent_size = "4",
+                },
+            },
+        },
+    },
 }
diff --git a/nvim/lua/dzu/lsp/mason.lua b/nvim/lua/dzu/lsp/mason.lua
index a4fb402..1336ae2 100644
--- a/nvim/lua/dzu/lsp/mason.lua
+++ b/nvim/lua/dzu/lsp/mason.lua
@@ -14,30 +14,38 @@ require("mason").setup(settings)
 
 local servers = {
     { "rust_analyzer", "rust_analyzer" },
-    { "pyright",       "pyright", },
+    { "pyright",       "pyright" },
     { "ts_ls",         nil },
     { "biome",         nil },
-    { "clangd",        nil },
+    { "clangd",        "clangd" },
     { "lua_ls",        "lua_ls" },
-    -- { "hls",                    "hls" },
-    { "nil_ls",        nil },
     { "tinymist",      "tinymist" },
     { "jdtls",         nil },
-    -- { "nushell",                nil }, -- TODO what IS the lspconfig name?
     { "html",          nil },
     { "dockerls",      nil },
 }
-local lspconfig_servers = {}
+local ensure_installed = {}
+local i = 1
 for _, s in pairs(servers) do
     local s0 = s[1]
     if s0 ~= nil then
-        table.insert(lspconfig_servers, s0)
+        table.insert(ensure_installed, i, s0)
+        i = i + 1
         vim.lsp.enable(s0, true)
     end
 end
+for tool, _ in pairs(ADDITIONAL_MASON_TOOLS) do
+    table.insert(ensure_installed, i, tool)
+    i = i + 1
+end
+
+require("mason-tool-installer").setup({
+    ensure_installed = ensure_installed,
+    auto_update = true,
+    run_on_start = true,
+})
 
 require("mason-lspconfig").setup({
-    ensure_installed = lspconfig_servers,
     automatic_enable = true,
     automatic_installation = true,
 })
@@ -50,7 +58,6 @@ for _, s in pairs(servers) do
     end
 end
 
-
 local is_ok, handlers = pcall(require, "dzu.lsp.handlers")
 if not is_ok then
     vim.notify("failed to initialize LSP handlers")
diff --git a/nvim/lua/dzu/macro.lua b/nvim/lua/dzu/macro.lua
index 63c0a87..73f3cbe 100644
--- a/nvim/lua/dzu/macro.lua
+++ b/nvim/lua/dzu/macro.lua
@@ -14,6 +14,12 @@ function M.toggle_whitespace_helpers()
     end
 end
 
+-- add wrapping toggle
+function M.toggle_wrapping()
+    local wrap = vim.opt.wrap._value
+    vim.opt.wrap = not wrap
+end
+
 -- limiting line must be disable in readonly windows
 vim.api.nvim_create_autocmd("BufEnter", {
     callback = function(event_data)
diff --git a/nvim/lua/dzu/options.lua b/nvim/lua/dzu/options.lua
index e15c347..dff4314 100644
--- a/nvim/lua/dzu/options.lua
+++ b/nvim/lua/dzu/options.lua
@@ -16,13 +16,8 @@ local options = {
     },
     -- visualbell = true, -- FLASHES THE SCREEN
     -- binary - check out binary file viewing and editing
-    linebreak = true,
-    breakat = " ^I!@*-+;:,./?", -- where line breaks are allowed
-    -- breakindent = true, -- line breaks continue where the line starts
-    breakindentopt = {
-        'shift:0', -- indent by no char
-        'sbr', -- show line break symbol
-    },
+    linebreak = false,
+    wrap = true,
     showbreak = '↪ ', -- line break symbol itself
     cdhome = false, -- do not cd to home on :cd (won't work?)
     cedit = '', -- no kinding to open CL window (?)
@@ -42,15 +37,11 @@ local options = {
     errorbells = true, -- sound on errors
     exrc = true, -- execute possible local config
     fillchars = 'diff:<',
-    foldlevelstart = 0, -- at start, close all folds...
-    foldminlines = 50, -- but only fold really large things...
-    foldmethod = 'indent', -- and identify them by indent
     -- look into lang* (langmenu)
     lazyredraw = true, -- might be a bad idea, IDK
-    mouse = 'nvi', -- enable mouse at insert and visual
-    mousehide = true, -- hide mouse when something is being typed
-    -- mousefocus = true, -- focus on window where mouse is
-    mousescroll = 'ver:2,hor:3',
+    mouse = '',
+    mousehide = true,
+    mousescroll = 'ver:0,hor:0',
     -- mouses = 'n:arrow,v:crosshair,i:beam', -- how mouse looks like in different modes
     number = true, -- print numbers at the start
     ruler = true, -- show row&column
diff --git a/nvim/lua/dzu/plugins/diffview.lua b/nvim/lua/dzu/plugins/diffview.lua
index 8718cb3..73abc70 100644
--- a/nvim/lua/dzu/plugins/diffview.lua
+++ b/nvim/lua/dzu/plugins/diffview.lua
@@ -89,7 +89,11 @@ local function config()
             DiffviewOpen = {},
             DiffviewFileHistory = {},
         },
-        hooks = {},                   -- See |diffview-config-hooks|
+        hooks = {
+            diff_buf_win_enter = function()
+                vim.opt_local.foldenable = false
+            end,
+        },                            -- See |diffview-config-hooks|
         keymaps = {
             disable_defaults = false, -- Disable the default keymaps
             view = {
diff --git a/nvim/lua/dzu/plugins/formatting.lua b/nvim/lua/dzu/plugins/formatting.lua
index 9564951..ed81ac1 100644
--- a/nvim/lua/dzu/plugins/formatting.lua
+++ b/nvim/lua/dzu/plugins/formatting.lua
@@ -6,9 +6,8 @@ local function config()
     end
 
     -- js/ts fomatters
-    local web_fmt = { "biome" };
+    local web_fmt = { "biome" }
     local fomatters_by_ft = {
-        lua = { "stylua" },
         python = { "black" },
         javascript = web_fmt,
         javascriptreact = web_fmt,
diff --git a/nvim/lua/dzu/plugins/lsp.lua b/nvim/lua/dzu/plugins/lsp.lua
index a34cbdc..acef290 100644
--- a/nvim/lua/dzu/plugins/lsp.lua
+++ b/nvim/lua/dzu/plugins/lsp.lua
@@ -1,20 +1,10 @@
-local function config()
-    local is_ok, _ = pcall(require, 'dzu.lsp')
-    if not is_ok then
-        vim.notify("failed to setup lsp")
-        return
-    end
-end
-
 return {
     "mason-org/mason-lspconfig.nvim",
-    opts = {},
     dependencies = {
         "mason-org/mason.nvim",
         "neovim/nvim-lspconfig",
         -- lsp completions
         "hrsh7th/cmp-nvim-lsp",
     },
-    config = config,
     lazy = false,
 }
diff --git a/nvim/lua/dzu/plugins/mason-tools.lua b/nvim/lua/dzu/plugins/mason-tools.lua
new file mode 100644
index 0000000..cced0fc
--- /dev/null
+++ b/nvim/lua/dzu/plugins/mason-tools.lua
@@ -0,0 +1,29 @@
+local function config()
+    local is_ok, _ = pcall(require, "mason-tool-installer")
+    if not is_ok then
+        vim.notify("Failed to setup mason tools")
+        return
+    end
+
+    local is_ok, _ = pcall(require, "dzu.lsp")
+    if not is_ok then
+        vim.notify("failed to setup lsp")
+        return
+    end
+end
+
+return {
+    "WhoIsSethDaniel/mason-tool-installer.nvim",
+    dependencies = {
+        "mason-org/mason-lspconfig.nvim",
+    },
+    config = config,
+    lazy = false,
+    opts = {
+        integrations = {
+            ["mason-lspconfig"] = true,
+            ["mason-null-ls"] = false,
+            ["mason-nvim-dap"] = false,
+        },
+    },
+}
diff --git a/nvim/lua/dzu/plugins/tree-sitter.lua b/nvim/lua/dzu/plugins/tree-sitter.lua
index c1e9739..68f1c78 100644
--- a/nvim/lua/dzu/plugins/tree-sitter.lua
+++ b/nvim/lua/dzu/plugins/tree-sitter.lua
@@ -1,49 +1,48 @@
 local function config()
-    local is_ok, configs = pcall(require, "nvim-treesitter.configs")
+    local is_ok, tree_sitter = pcall(require, "nvim-treesitter")
     if not is_ok then
-        vim.notify("couldn't find tree sitter config")
+        vim.notify("couldn't find tree sitter")
         return
     end
 
-    local config_opts = {
-        ensure_installed = {
-            "bash",
-            "c",
-            "comment",
-            "cpp",
-            "csv",
-            -- "cuda", -- not yet; might enable in the future
-            "djot",
-            "dockerfile", -- oh yeah. I should probably figure docker out...
-            "fish",
-            "gitignore",
-            "diff",
-            "git_rebase",
-            "gitcommit",
-            "haskell",
-            "html",
-            "javascript",
-            "typescript",
-            -- "jsx",
-            "tsx",
-            "json",
-            "latex",
-            "lua",
-            "luadoc",
-            "make",
-            "markdown",
-            "markdown_inline",
-            "python",
-            "rust",
-            "sql",
-            "toml",
-            "vim",
-            "vimdoc",
-            "xml",
-            "nu",
-            "java",
-        },
-        sync_install = false,
+    local langs = {
+        "bash",
+        "c",
+        "comment",
+        "cpp",
+        "csv",
+        "djot",
+        "dockerfile",
+        "fish",
+        "gitignore",
+        "diff",
+        "git_rebase",
+        "gitcommit",
+        "haskell",
+        "html",
+        "javascript",
+        "typescript",
+        "tsx",
+        "json",
+        "latex",
+        "lua",
+        "luadoc",
+        "make",
+        "markdown",
+        "markdown_inline",
+        "python",
+        "rust",
+        "sql",
+        "toml",
+        "vim",
+        "vimdoc",
+        "xml",
+        "nu",
+        "java",
+    }
+    local opts = {
+        ensure_installed = langs,
+        sync_install = true,
         ignore_install = {}, -- List of parsers to ignore installing
         highlight = {
             enable = true,   -- false will disable the whole extension
@@ -53,7 +52,7 @@ local function config()
         },
         indent = { enable = true, disable = {} },
     }
-    configs.setup(config_opts)
+    tree_sitter.setup(opts)
 
     vim.cmd.TSUpdate()
 end