mirror of
https://github.com/zoriya/flake.git
synced 2026-08-15 18:43:42 +00:00
Update things
This commit is contained in:
@@ -263,13 +263,14 @@ return {
|
||||
{
|
||||
"<leader>e",
|
||||
function()
|
||||
require("conform").format({ async = true, lsp_fallback = true --[["always"--]] })
|
||||
require("conform").format()
|
||||
end,
|
||||
desc = "Format",
|
||||
mode = { "n", "v" },
|
||||
},
|
||||
},
|
||||
opts = {
|
||||
default_format_opts = { async = true, lsp_format = "fallback" },
|
||||
formatters_by_ft = {
|
||||
python = function(bufnr)
|
||||
if require("conform").get_formatter_info("ruff_format", bufnr).available then
|
||||
@@ -288,6 +289,7 @@ return {
|
||||
sql = { "pg_format" },
|
||||
cs = { "csharpier" },
|
||||
nix = { "alejandra" },
|
||||
-- ["_"] = { "injected", lsp_format = "last" },
|
||||
["*"] = { "injected" }
|
||||
},
|
||||
formatters = {
|
||||
|
||||
@@ -2,9 +2,15 @@ return {
|
||||
{
|
||||
"stevearc/oil.nvim",
|
||||
lazy = false,
|
||||
dependencies = { "nvim-tree/nvim-web-devicons" },
|
||||
dependencies = { {
|
||||
"echasnovski/mini.icons",
|
||||
config = function(_, opts)
|
||||
require("mini.icons").setup(opts);
|
||||
MiniIcons.mock_nvim_web_devicons()
|
||||
end
|
||||
} },
|
||||
keys = {
|
||||
{ "-", "<CMD>Oil<CR>", desc = "Open parent directory" },
|
||||
{ "-", "<CMD>Oil<CR>", desc = "Open parent directory" },
|
||||
{ "<BS>", "<CMD>Oil<CR>", desc = "Open parent directory" },
|
||||
},
|
||||
opts = {
|
||||
|
||||
@@ -139,23 +139,8 @@ return {
|
||||
opts = {
|
||||
plugins = { spelling = true },
|
||||
},
|
||||
config = function(_, opts)
|
||||
init = function()
|
||||
vim.opt["timeoutlen"] = 500
|
||||
|
||||
local wk = require("which-key")
|
||||
wk.setup(opts)
|
||||
|
||||
wk.register({
|
||||
gx = { name = "+Git conflict" },
|
||||
})
|
||||
wk.register({
|
||||
mode = { "n", "v" },
|
||||
["g"] = { name = "+goto" },
|
||||
["]"] = { name = "+next" },
|
||||
["["] = { name = "+prev" },
|
||||
["<leader>g"] = { name = "+git" },
|
||||
["<leader>l"] = { name = "+lsp" },
|
||||
})
|
||||
end,
|
||||
},
|
||||
|
||||
@@ -203,7 +188,7 @@ return {
|
||||
"folke/trouble.nvim",
|
||||
keys = {
|
||||
{ "<leader>lw", "<cmd>Trouble cascade<cr>", desc = "Diagnostics" },
|
||||
{ "<leader>lt", "<cmd>TroubleToggle<CR>", desc = "Toogle trouble window" },
|
||||
{ "<leader>lt", "<cmd>TroubleToggle<CR>", desc = "Toogle trouble window" },
|
||||
},
|
||||
opts = {
|
||||
auto_close = true,
|
||||
|
||||
Reference in New Issue
Block a user