diff --git a/lsp/nixd.lua b/lsp/nixd.lua index 6e2d589..31d4768 100644 --- a/lsp/nixd.lua +++ b/lsp/nixd.lua @@ -1,19 +1,8 @@ return { settings = { nixd = { - nixpkgs = { - expr = "import (builtins.getFlake(toString ./.)).inputs.nixpkgs { }", - }, formatting = { - command = {"alejandra"}, - }, - options = { - nixos = { - expr = "let flake = builtins.getFlake(toString ./.); in flake.nixosConfigurations.skadi.options", - }, - home_manager = { - expr = "let flake = builtins.getFlake(toString ./.); in flake.homeConfigurations.skadi.options", - }, + command = { "alejandra" }, }, }, }, diff --git a/lua/config/autocommands.lua b/lua/config/autocommands.lua index 8fe38c6..14fa473 100644 --- a/lua/config/autocommands.lua +++ b/lua/config/autocommands.lua @@ -31,3 +31,11 @@ vim.api.nvim_create_autocmd("BufWritePre", { end, }) +-- disable autocommenting lines +vim.api.nvim_create_autocmd("FileType", { + group = augroup, + pattern = "*", + callback = function() + vim.opt_local.formatoptions:remove({ "r", "o" }) + end, +}) diff --git a/lua/config/settings.lua b/lua/config/settings.lua index 23a16f2..00fca50 100644 --- a/lua/config/settings.lua +++ b/lua/config/settings.lua @@ -20,7 +20,7 @@ vim.opt.laststatus = 3 -- setup tabs and indenting vim.opt.expandtab = true -vim.opt.smartindent = true +vim.opt.smartindent = false vim.opt.autoindent = true vim.opt.tabstop = 2 vim.opt.shiftwidth = 2 @@ -76,7 +76,6 @@ vim.opt.ttimeoutlen = 0 vim.opt.hidden = true vim.opt.errorbells = false vim.opt.backspace = "indent,eol,start" -vim.opt.autochdir = false vim.opt.iskeyword:append("-") -- treat dash as part of the word vim.opt.path:append("**") -- include subdirectories in search vim.opt.modifiable = true diff --git a/lua/plugins/conform.lua b/lua/plugins/conform.lua index be4fe0d..1656918 100644 --- a/lua/plugins/conform.lua +++ b/lua/plugins/conform.lua @@ -1,7 +1,6 @@ vim.pack.add({ - {src = "https://github.com/stevearc/conform.nvim"}, + { src = "https://github.com/stevearc/conform.nvim" }, }) - vim.api.nvim_create_user_command("Format", function(args) local range = nil if args.count ~= -1 then diff --git a/lua/plugins/lsp.lua b/lua/plugins/lsp.lua index 562856b..4e8d4b4 100644 --- a/lua/plugins/lsp.lua +++ b/lua/plugins/lsp.lua @@ -27,6 +27,7 @@ vim.lsp.enable({ "ruff", "basedpyright", "yamlls", + "bashls", }) -- diagnostic settings