Compare commits
No commits in common. "214725ef364950e5b086f0cd3f7978f38655a58b" and "012748be4f7011416261ec2d60adde19bf17d010" have entirely different histories.
214725ef36
...
012748be4f
5 changed files with 47 additions and 41 deletions
12
flake.lock
12
flake.lock
|
@ -22,11 +22,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1722141560,
|
"lastModified": 1720368505,
|
||||||
"narHash": "sha256-Ul3rIdesWaiW56PS/Ak3UlJdkwBrD4UcagCmXZR9Z7Y=",
|
"narHash": "sha256-5r0pInVo5d6Enti0YwUSQK4TebITypB42bWy5su3MrQ=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "038fb464fcfa79b4f08131b07f2d8c9a6bcc4160",
|
"rev": "ab82a9612aa45284d4adf69ee81871a389669a9e",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -66,11 +66,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1721769617,
|
"lastModified": 1720374026,
|
||||||
"narHash": "sha256-6Pqa0bi5nV74IZcENKYRToRNM5obo1EQ+3ihtunJ014=",
|
"narHash": "sha256-ludjqxhR/5lXwJ1H6zHmZqp+4e8dFPHE9FIZ2eBh2G4=",
|
||||||
"owner": "numtide",
|
"owner": "numtide",
|
||||||
"repo": "treefmt-nix",
|
"repo": "treefmt-nix",
|
||||||
"rev": "8db8970be1fb8be9c845af7ebec53b699fe7e009",
|
"rev": "e1d7bd5ec6fc389eb3a90e232c4150338bf6a508",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
15
lua/plugins/barbar.lua
Normal file
15
lua/plugins/barbar.lua
Normal file
|
@ -0,0 +1,15 @@
|
||||||
|
return {
|
||||||
|
"romgrk/barbar.nvim",
|
||||||
|
dependencies = {
|
||||||
|
"lewis6991/gitsigns.nvim", -- OPTIONAL: for git status
|
||||||
|
"nvim-tree/nvim-web-devicons", -- OPTIONAL: for file icons
|
||||||
|
},
|
||||||
|
init = function()
|
||||||
|
vim.g.barbar_auto_setup = false
|
||||||
|
end,
|
||||||
|
opts = {
|
||||||
|
auto_hide = 1,
|
||||||
|
},
|
||||||
|
|
||||||
|
enabled = false,
|
||||||
|
}
|
|
@ -16,12 +16,20 @@ return {
|
||||||
capabilities = capabilities,
|
capabilities = capabilities,
|
||||||
})
|
})
|
||||||
|
|
||||||
require("lspconfig").pyright.setup({
|
|
||||||
capabilities = capabilities,
|
|
||||||
})
|
|
||||||
|
|
||||||
require("lspconfig").nil_ls.setup({
|
require("lspconfig").nil_ls.setup({
|
||||||
capabilities = capabilities,
|
capabilities = capabilities,
|
||||||
|
settings = {
|
||||||
|
["nil"] = {
|
||||||
|
formatting = {
|
||||||
|
command = { "alejandra" },
|
||||||
|
},
|
||||||
|
nix = {
|
||||||
|
flake = {
|
||||||
|
autoArchive = true,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
})
|
})
|
||||||
end,
|
end,
|
||||||
}
|
}
|
||||||
|
|
14
lua/plugins/neoformat.lua
Normal file
14
lua/plugins/neoformat.lua
Normal file
|
@ -0,0 +1,14 @@
|
||||||
|
return {
|
||||||
|
"sbdchd/neoformat",
|
||||||
|
init = function()
|
||||||
|
-- Basic formatting
|
||||||
|
vim.g.neoformat_basic_format_retab = 1
|
||||||
|
vim.g.neoformat_basic_format_trim = 1
|
||||||
|
|
||||||
|
-- Prefer Alejandra for Nix files
|
||||||
|
vim.g.neoformat_enabled_nix = { "alejandra" }
|
||||||
|
end,
|
||||||
|
keys = {
|
||||||
|
{ "<leader>lf", "<cmd>Neoformat<CR>", desc = "Format file" },
|
||||||
|
},
|
||||||
|
}
|
|
@ -1,31 +0,0 @@
|
||||||
return {
|
|
||||||
"nvimtools/none-ls.nvim",
|
|
||||||
dependencies = { "nvim-lua/plenary.nvim" },
|
|
||||||
opts = function()
|
|
||||||
local null_ls = require("null-ls")
|
|
||||||
|
|
||||||
null_ls.setup({
|
|
||||||
sources = {
|
|
||||||
null_ls.builtins.formatting.alejandra,
|
|
||||||
null_ls.builtins.formatting.stylua,
|
|
||||||
null_ls.builtins.formatting.black,
|
|
||||||
},
|
|
||||||
})
|
|
||||||
end,
|
|
||||||
keys = {
|
|
||||||
{
|
|
||||||
"<leader>lf",
|
|
||||||
function()
|
|
||||||
vim.lsp.buf.format()
|
|
||||||
end,
|
|
||||||
desc = "Format file",
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"<leader>a",
|
|
||||||
function()
|
|
||||||
vim.lsp.buf.code_action()
|
|
||||||
end,
|
|
||||||
desc = "Code action",
|
|
||||||
},
|
|
||||||
},
|
|
||||||
}
|
|
Loading…
Reference in a new issue