Compare commits

..

No commits in common. "7363de859a36b8d02b1a06877a5c11423141b0d5" and "aa8ac561c5bb22828d060541f0450a96e6ead243" have entirely different histories.

5 changed files with 16 additions and 12 deletions

View file

@ -1,8 +1,19 @@
return {
settings = {
nixd = {
nixpkgs = {
expr = "import (builtins.getFlake(toString ./.)).inputs.nixpkgs { }",
},
formatting = {
command = { "alejandra" },
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",
},
},
},
},

View file

@ -31,11 +31,3 @@ 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,
})

View file

@ -20,7 +20,7 @@ vim.opt.laststatus = 3
-- setup tabs and indenting
vim.opt.expandtab = true
vim.opt.smartindent = false
vim.opt.smartindent = true
vim.opt.autoindent = true
vim.opt.tabstop = 2
vim.opt.shiftwidth = 2
@ -76,6 +76,7 @@ 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

View file

@ -1,6 +1,7 @@
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

View file

@ -27,7 +27,6 @@ vim.lsp.enable({
"ruff",
"basedpyright",
"yamlls",
"bashls",
})
-- diagnostic settings