vscode gone and update
This commit is contained in:
parent
678d445eae
commit
9a6cecf875
42 changed files with 657 additions and 1645 deletions
|
@ -1,24 +1,25 @@
|
|||
{
|
||||
"LuaSnip": { "branch": "master", "commit": "03c8e67eb7293c404845b3982db895d59c0d1538" },
|
||||
"auto-session": { "branch": "main", "commit": "00334ee24b9a05001ad50221c8daffbeedaa0842" },
|
||||
"blink.cmp": { "branch": "main", "commit": "cb5e346d9e0efa7a3eee7fd4da0b690c48d2a98e" },
|
||||
"catppuccin": { "branch": "main", "commit": "1bf070129c0b6f77cc23f6a2212dcdc868308c52" },
|
||||
"LuaSnip": { "branch": "master", "commit": "458560534a73f7f8d7a11a146c801db00b081df0" },
|
||||
"auto-session": { "branch": "main", "commit": "fffb13dcbe8731b8650e5bf1caa749a485d20556" },
|
||||
"blink.cmp": { "branch": "main", "commit": "9bcb14b43852a6f2bfd5ac9ef29cb5cf09b1b39b" },
|
||||
"catppuccin": { "branch": "main", "commit": "fa42eb5e26819ef58884257d5ae95dd0552b9a66" },
|
||||
"diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" },
|
||||
"fidget.nvim": { "branch": "main", "commit": "d9ba6b7bfe29b3119a610892af67602641da778e" },
|
||||
"flutter-tools.nvim": { "branch": "main", "commit": "8fa438f36fa6cb747a93557d67ec30ef63715c20" },
|
||||
"gitsigns.nvim": { "branch": "main", "commit": "ee7e50dfbdf49e3acfa416fd3ad3abbdb658582c" },
|
||||
"flutter-tools.nvim": { "branch": "main", "commit": "d4b0cb9cfcda4cb27e6b68bad20cba0be542b55b" },
|
||||
"gitsigns.nvim": { "branch": "main", "commit": "88205953bd748322b49b26e1dfb0389932520dc9" },
|
||||
"harpoon": { "branch": "harpoon2", "commit": "ed1f853847ffd04b2b61c314865665e1dadf22c7" },
|
||||
"image.nvim": { "branch": "master", "commit": "c40215d7d7d1d8c823ee9a77be1a894d5c8df41b" },
|
||||
"lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" },
|
||||
"lazydev.nvim": { "branch": "main", "commit": "2367a6c0a01eb9edb0464731cc0fb61ed9ab9d2c" },
|
||||
"lualine.nvim": { "branch": "master", "commit": "15884cee63a8c205334ab13ab1c891cd4d27101a" },
|
||||
"mason-lspconfig.nvim": { "branch": "main", "commit": "1a31f824b9cd5bc6f342fc29e9a53b60d74af245" },
|
||||
"mason.nvim": { "branch": "main", "commit": "fc98833b6da5de5a9c5b1446ac541577059555be" },
|
||||
"mini.nvim": { "branch": "main", "commit": "0420076298c4457f200c2de468f65d080597a347" },
|
||||
"lualine.nvim": { "branch": "master", "commit": "a94fc68960665e54408fe37dcf573193c4ce82c9" },
|
||||
"markview.nvim": { "branch": "main", "commit": "02810964cc288065c2919ea7a8d41e72f17ccd8a" },
|
||||
"mason-lspconfig.nvim": { "branch": "main", "commit": "bb30c422329e86fcaa4e4920181f6715d634e516" },
|
||||
"mason.nvim": { "branch": "main", "commit": "8024d64e1330b86044fed4c8494ef3dcd483a67c" },
|
||||
"mini.nvim": { "branch": "main", "commit": "94cae4660a8b2d95dbbd56e1fbc6fcfa2716d152" },
|
||||
"molten-nvim": { "branch": "main", "commit": "a286aa914d9a154bc359131aab788b5a077a5a99" },
|
||||
"nvim-lspconfig": { "branch": "master", "commit": "8b0f47d851ee5343d38fe194a06ad16b9b9bd086" },
|
||||
"nvim-treesitter": { "branch": "master", "commit": "684eeac91ed8e297685a97ef70031d19ac1de25a" },
|
||||
"nvim-web-devicons": { "branch": "master", "commit": "68f70df44652d310d2adedf181b174c33a693665" },
|
||||
"nvim-lspconfig": { "branch": "master", "commit": "99d3a0f26bfe402f45257c1398287aef252cbe2d" },
|
||||
"nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" },
|
||||
"nvim-web-devicons": { "branch": "master", "commit": "1fb58cca9aebbc4fd32b086cb413548ce132c127" },
|
||||
"plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" },
|
||||
"snacks.nvim": { "branch": "main", "commit": "bc0630e43be5699bb94dadc302c0d21615421d93" },
|
||||
"todo-comments.nvim": { "branch": "main", "commit": "304a8d204ee787d2544d8bc23cd38d2f929e7cc5" },
|
||||
|
|
|
@ -12,3 +12,11 @@ vim.api.nvim_create_autocmd('User', {
|
|||
require('snacks').rename.on_rename_file(event.data.from, event.data.to)
|
||||
end,
|
||||
})
|
||||
|
||||
vim.api.nvim_create_autocmd("FileType", {
|
||||
pattern = "man",
|
||||
callback = function()
|
||||
vim.keymap.del("n", "k", { buffer = true })
|
||||
vim.keymap.del("n", "j", { buffer = true })
|
||||
end,
|
||||
})
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
require('config.options')
|
||||
require('config.plugins')
|
||||
require('config.keymaps')
|
||||
require('config.autocmds')
|
||||
require('config.keymaps')
|
||||
|
|
|
@ -35,10 +35,13 @@ vim.keymap.set('i', '<C-BS>', '<C-w>', { desc = 'delete word in insert mode' })
|
|||
vim.keymap.set('n', '<F27>', '<cmd>Floaterminal<CR>', { desc = 'open terminal', nowait = true })
|
||||
vim.keymap.set('t', '<F27>', '<cmd>q<CR>', { desc = 'close terminal window' })
|
||||
|
||||
vim.keymap.set('t', '<C-l>', '<cmd>Floaterminal 1<CR>', { desc = 'terminal 1' })
|
||||
vim.keymap.set('t', '<C-j>', '<cmd>Floaterminal 2<CR>', { desc = 'terminal 2' })
|
||||
vim.keymap.set('t', '<Down>', '<cmd>Floaterminal 3<CR>', { desc = 'terminal 3' })
|
||||
vim.keymap.set('t', '<Up>', '<cmd>Floaterminal 4<CR>', { desc = 'terminal 4' })
|
||||
vim.keymap.set('t', '<C-n>', '<cmd>Floaterminal next<CR>', { desc = 'next terminal' })
|
||||
vim.keymap.set('t', '<C-p>', '<cmd>Floaterminal prev<CR>', { desc = 'prev terminal' })
|
||||
|
||||
-- vim.keymap.set('t', '<C-l>', '<cmd>Floaterminal 1<CR>', { desc = 'terminal 1' })
|
||||
-- vim.keymap.set('t', '<C-j>', '<cmd>Floaterminal 2<CR>', { desc = 'terminal 2' })
|
||||
-- vim.keymap.set('t', '<Down>', '<cmd>Floaterminal 3<CR>', { desc = 'terminal 3' })
|
||||
-- vim.keymap.set('t', '<Up>', '<cmd>Floaterminal 4<CR>', { desc = 'terminal 4' })
|
||||
|
||||
vim.keymap.set('t', '<C-w>', '<C-d>', { desc = 'kill terminal' })
|
||||
|
||||
|
@ -191,17 +194,20 @@ vim.api.nvim_create_autocmd('LspAttach', {
|
|||
})
|
||||
|
||||
-- INFO: Molten
|
||||
vim.keymap.set('n', '<leader>mi', ':MoltenInit<CR>',
|
||||
{ silent = true, desc = 'Initialize the plugin' })
|
||||
vim.keymap.set('n', '<leader>mo', ':MoltenEvaluateOperator<CR>',
|
||||
{ silent = true, desc = 'run operator selection' })
|
||||
vim.keymap.set('n', '<leader>ml', ':MoltenEvaluateLine<CR>',
|
||||
{ silent = true, desc = 'evaluate line' })
|
||||
vim.keymap.set('v', '<leader>mv', ':<C-u>MoltenEvaluateVisual<CR>gv',
|
||||
{ silent = false, desc = 'evaluate visual selection' })
|
||||
vim.keymap.set('n', '<leader>mc', ':MoltenReevaluateCell<CR>',
|
||||
{ silent = false, desc = 'reevaluate cell' })
|
||||
vim.keymap.set('n', '<leader>me', ':noautocmd MoltenEnterOutput<CR>',
|
||||
{ silent = true, desc = 'show/enter output' })
|
||||
vim.keymap.set('n', '<leader>mh', ':MoltenHideOutput<CR>',
|
||||
{ silent = true, desc = 'hide output' })
|
||||
vim.keymap.set('n', '<leader>mi', ':MoltenInit<CR>', { silent = true, desc = 'Initialize the plugin' })
|
||||
vim.keymap.set('n', '<leader>mo', ':MoltenEvaluateOperator<CR>', { silent = true, desc = 'run operator selection' })
|
||||
vim.keymap.set('n', '<leader>ml', ':MoltenEvaluateLine<CR>', { silent = true, desc = 'evaluate line' })
|
||||
vim.keymap.set('v', '<leader>mv', ':<C-u>MoltenEvaluateVisual<CR>gv', { silent = false, desc = 'evaluate visual selection' })
|
||||
vim.keymap.set('n', '<leader>mc', ':MoltenReevaluateCell<CR>', { silent = false, desc = 'reevaluate cell' })
|
||||
vim.keymap.set('n', '<leader>me', ':noautocmd MoltenEnterOutput<CR>', { silent = true, desc = 'show/enter output' })
|
||||
vim.keymap.set('n', '<leader>mh', ':MoltenHideOutput<CR>', { silent = true, desc = 'hide output' })
|
||||
|
||||
|
||||
-- INFO: Flutter
|
||||
vim.keymap.set('n', '<leader>fd', '<cmd>FlutterDevices<CR>', { desc = 'show flutter devices' })
|
||||
vim.keymap.set('n', '<leader>fe', '<cmd>FlutterEmulators<CR>', { desc = 'show emulators' })
|
||||
vim.keymap.set('n', '<leader>fs', '<cmd>FlutterRun<CR>', { desc = 'flutter run' })
|
||||
vim.keymap.set('n', '<leader>fr', '<cmd>FlutterRestart<CR>', { desc = 'flutter restart' })
|
||||
vim.keymap.set('n', '<leader>fq', '<cmd>FlutterQuit<CR>', { desc = 'stop flutter' })
|
||||
vim.keymap.set('n', '<leader>fl', '<cmd>FlutterLogToggle<CR>', { desc = 'flutter log' })
|
||||
vim.keymap.set('n', '<leader>fc', '<cmd>FlutterLogClear<CR>', { desc = 'clear log' })
|
||||
|
|
|
@ -51,5 +51,6 @@ require('lazy').setup({
|
|||
|
||||
require('config.plugins.languages.molten'),
|
||||
require('config.plugins.languages.flutter'),
|
||||
require('config.plugins.languages.markdown'),
|
||||
|
||||
})
|
||||
|
|
|
@ -3,8 +3,12 @@ return {
|
|||
lazy = false,
|
||||
dependencies = { 'nvim-lua/plenary.nvim', },
|
||||
config = function()
|
||||
require('flutter-tools').setup({})
|
||||
vim.keymap.set('n', '<leader>fd', '<cmd>FlutterDevices<CR>', { desc = 'show flutter devices' })
|
||||
vim.keymap.set('n', '<leader>fq', '<cmd>FlutterQuit<CR>', { desc = 'stop flutter' })
|
||||
require('flutter-tools').setup({
|
||||
fvm = true,
|
||||
dev_log = {
|
||||
-- enabled = false,
|
||||
open_cmd = 'FloutterLog'
|
||||
}
|
||||
})
|
||||
end,
|
||||
}
|
||||
|
|
|
@ -55,7 +55,9 @@ return {
|
|||
|
||||
local capabilities = require('blink.cmp').get_lsp_capabilities()
|
||||
local servers = {
|
||||
-- clangd = {},
|
||||
bashls = {},
|
||||
|
||||
clangd = {},
|
||||
rust_analyzer = {},
|
||||
pyright = {},
|
||||
|
||||
|
@ -64,6 +66,14 @@ return {
|
|||
cssls = {},
|
||||
vtsls = {},
|
||||
|
||||
kotlin_lsp = {},
|
||||
|
||||
-- kotlin_language_server = {
|
||||
-- init_options = {
|
||||
-- storagePath = vim.fn.stdpath('cache') .. '/kotlin_language_server', -- Explicit storage path
|
||||
-- },
|
||||
-- },
|
||||
|
||||
-- -- ... etc. See `:help lspconfig-all` for a list of all the pre-configured LSPs
|
||||
--
|
||||
-- Some languages (like typescript) have entire language plugins that can be useful:
|
||||
|
|
5
.config/nvim/lua/config/plugins/languages/markdown.lua
Normal file
5
.config/nvim/lua/config/plugins/languages/markdown.lua
Normal file
|
@ -0,0 +1,5 @@
|
|||
return {
|
||||
"OXY2DEV/markview.nvim",
|
||||
lazy = false,
|
||||
opts = {}
|
||||
}
|
|
@ -6,6 +6,7 @@ return {
|
|||
ensure_installed = {
|
||||
'bash',
|
||||
'c',
|
||||
'cpp',
|
||||
'diff',
|
||||
'html',
|
||||
'css',
|
||||
|
@ -24,7 +25,8 @@ return {
|
|||
'javascript',
|
||||
'typescript',
|
||||
'tsx',
|
||||
'regex'
|
||||
'regex',
|
||||
'kotlin'
|
||||
},
|
||||
auto_install = false,
|
||||
highlight = { enable = true, },
|
||||
|
|
|
@ -1,68 +0,0 @@
|
|||
return {
|
||||
'nvim-telescope/telescope.nvim',
|
||||
dependencies = {
|
||||
'nvim-lua/plenary.nvim',
|
||||
|
||||
{
|
||||
'nvim-telescope/telescope-fzf-native.nvim',
|
||||
build = 'make',
|
||||
cond = function()
|
||||
return vim.fn.executable 'make' == 1
|
||||
end,
|
||||
},
|
||||
'nvim-telescope/telescope-ui-select.nvim',
|
||||
},
|
||||
config = function()
|
||||
local actions = require('telescope.actions')
|
||||
require('telescope').setup({
|
||||
defaults = {
|
||||
mappings = {
|
||||
i = {
|
||||
['<esc>'] = actions.close,
|
||||
}
|
||||
}
|
||||
},
|
||||
pickers = {
|
||||
mappings = {
|
||||
i = {
|
||||
['<C-s>'] = actions.file_split,
|
||||
['<C-v>'] = actions.file_vsplit
|
||||
}
|
||||
}
|
||||
},
|
||||
extensions = {
|
||||
['ui-select'] = { require('telescope.themes').get_dropdown({}) },
|
||||
}
|
||||
|
||||
})
|
||||
pcall(require('telescope').load_extension, 'fzf')
|
||||
pcall(require('telescope').load_extension('ui-select'))
|
||||
|
||||
-- INFO: Mappings --
|
||||
|
||||
-- local builtin = require('telescope.builtin')
|
||||
|
||||
-- vim.keymap.set('n', '<leader>sf', builtin.find_files, { desc = 'find files' })
|
||||
-- vim.keymap.set('n', '<leader>sw', builtin.grep_string, { desc = 'grep string' })
|
||||
-- vim.keymap.set('n', '<leader>ss', builtin.lsp_document_symbols, { desc = 'document symbols' })
|
||||
-- vim.keymap.set('n', '<leader>sS', builtin.lsp_workspace_symbols, { desc = 'workspace symbols' })
|
||||
--
|
||||
-- vim.keymap.set('n', '<leader>st', '<cmd>TodoTelescope<CR>', { desc = 'search todos' })
|
||||
-- vim.keymap.set('n', '<leader>sp', '<cmd>SessionSearch<CR>', { desc = 'search sessions' })
|
||||
--
|
||||
-- vim.keymap.set('n', '<leader>sh', function ()
|
||||
-- builtin.help_tags({
|
||||
-- previewer = false
|
||||
-- })
|
||||
-- end, { desc = 'help' })
|
||||
--
|
||||
-- vim.keymap.set('n', '<leader>/', function()
|
||||
-- -- You can pass additional configuration to Telescope to change the theme, layout, etc.
|
||||
-- builtin.current_buffer_fuzzy_find(require('telescope.themes').get_dropdown {
|
||||
-- winblend = 10,
|
||||
-- previewer = false,
|
||||
-- })
|
||||
-- end, { desc = 'Fuzzily search in current buffer' })
|
||||
|
||||
end
|
||||
}
|
|
@ -23,10 +23,12 @@ end
|
|||
---@class TermState
|
||||
---@field bufs integer[]
|
||||
---@field last_used integer[]
|
||||
---@field curr_buf_index integer
|
||||
---@field win integer
|
||||
local term_state = {
|
||||
bufs = { -1, -1, -1, -1 },
|
||||
last_used = { 1, 2, 3, 4 },
|
||||
curr_buf_index = 1,
|
||||
win = -1,
|
||||
}
|
||||
|
||||
|
@ -35,28 +37,36 @@ vim.api.nvim_create_user_command('Floaterminal', function(args_table)
|
|||
local is_new = false
|
||||
if args_table.args ~= '' then
|
||||
|
||||
local num = tonumber(args_table.args)
|
||||
if num < 1 or num > 4 then
|
||||
error('numbers from 1 to 4 allowed only')
|
||||
end
|
||||
if not vim.api.nvim_win_is_valid(term_state.win) then
|
||||
error('only specify arguments after opening the floaterminal')
|
||||
local operation = args_table.args
|
||||
|
||||
if operation == 'next' then
|
||||
term_state.curr_buf_index = term_state.curr_buf_index + 1
|
||||
if term_state.curr_buf_index > 4 then
|
||||
term_state.curr_buf_index = 1
|
||||
end
|
||||
elseif operation == 'prev' then
|
||||
term_state.curr_buf_index = term_state.curr_buf_index - 1
|
||||
if term_state.curr_buf_index < 1 then
|
||||
term_state.curr_buf_index = 4
|
||||
end
|
||||
else
|
||||
error('invalid argument, use next or prev')
|
||||
end
|
||||
|
||||
if not vim.api.nvim_buf_is_valid(term_state.bufs[num]) then
|
||||
term_state.bufs[num] = vim.api.nvim_create_buf(true, false)
|
||||
if not vim.api.nvim_buf_is_valid(term_state.bufs[term_state.curr_buf_index]) then
|
||||
term_state.bufs[term_state.curr_buf_index] = vim.api.nvim_create_buf(true, false)
|
||||
is_new = true
|
||||
end
|
||||
|
||||
for index, value in ipairs(term_state.last_used) do
|
||||
if value == num then
|
||||
if value == term_state.curr_buf_index then
|
||||
table.remove(term_state.last_used, index)
|
||||
break
|
||||
end
|
||||
end
|
||||
table.insert(term_state.last_used, 1, num)
|
||||
table.insert(term_state.last_used, 1, term_state.curr_buf_index)
|
||||
|
||||
vim.api.nvim_set_current_buf(term_state.bufs[num])
|
||||
vim.api.nvim_set_current_buf(term_state.bufs[term_state.curr_buf_index])
|
||||
|
||||
else
|
||||
|
||||
|
@ -104,3 +114,14 @@ vim.api.nvim_create_user_command('Floateroil', function()
|
|||
|
||||
end, { desc = 'open the floateroil' })
|
||||
|
||||
|
||||
local dev_log_buf = -1
|
||||
vim.api.nvim_create_user_command('FloutterLog', function (args)
|
||||
local name = args.args
|
||||
if not vim.api.nvim_buf_is_valid(dev_log_buf) then
|
||||
dev_log_buf = vim.api.nvim_create_buf(true, false)
|
||||
vim.api.nvim_buf_set_name(dev_log_buf, name)
|
||||
end
|
||||
vim.keymap.set('n', '<F27>', '<cmd>q<CR>', { desc = 'close dev log', buffer = dev_log_buf })
|
||||
open_floating_win(dev_log_buf)
|
||||
end, { desc = 'flutter dev log floating', nargs = 1 })
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue