neovim update
This commit is contained in:
RafayAhmad7548
parent
f50a72b03b
commit
3cd3e38358
8 changed files with 288 additions and 189 deletions
|
|
@ -1,154 +1,154 @@
|
|||
return {
|
||||
{
|
||||
'lewis6991/gitsigns.nvim',
|
||||
opts = {
|
||||
signs = {
|
||||
add = { text = '┃' },
|
||||
change = { text = '┃' },
|
||||
delete = { text = '_' },
|
||||
topdelete = { text = '‾' },
|
||||
changedelete = { text = '~' },
|
||||
untracked = { text = '┆' },
|
||||
},
|
||||
signs_staged = {
|
||||
add = { text = '┃' },
|
||||
change = { text = '┃' },
|
||||
delete = { text = '_' },
|
||||
topdelete = { text = '‾' },
|
||||
changedelete = { text = '~' },
|
||||
untracked = { text = '┆' },
|
||||
},
|
||||
signs_staged_enable = true,
|
||||
signcolumn = true,
|
||||
{
|
||||
'lewis6991/gitsigns.nvim',
|
||||
opts = {
|
||||
signs = {
|
||||
add = { text = '┃' },
|
||||
change = { text = '┃' },
|
||||
delete = { text = '_' },
|
||||
topdelete = { text = '‾' },
|
||||
changedelete = { text = '~' },
|
||||
untracked = { text = '┆' },
|
||||
},
|
||||
signs_staged = {
|
||||
add = { text = '┃' },
|
||||
change = { text = '┃' },
|
||||
delete = { text = '_' },
|
||||
topdelete = { text = '‾' },
|
||||
changedelete = { text = '~' },
|
||||
untracked = { text = '┆' },
|
||||
},
|
||||
signs_staged_enable = true,
|
||||
signcolumn = true,
|
||||
|
||||
on_attach = function()
|
||||
local gitsigns = require('gitsigns')
|
||||
on_attach = function()
|
||||
local gitsigns = require('gitsigns')
|
||||
|
||||
vim.keymap.set('n', '<leader>gs', gitsigns.stage_hunk, { desc = 'stage hunk' })
|
||||
vim.keymap.set('n', '<leader>gr', gitsigns.reset_hunk, { desc = 'restore hunk' })
|
||||
vim.keymap.set('n', '<leader>gs', gitsigns.stage_hunk, { desc = 'stage hunk' })
|
||||
vim.keymap.set('n', '<leader>gr', gitsigns.reset_hunk, { desc = 'restore hunk' })
|
||||
|
||||
vim.keymap.set('n', '<leader>gS', gitsigns.stage_buffer, { desc = 'stage buffer' })
|
||||
vim.keymap.set('n', '<leader>gR', gitsigns.stage_hunk, { desc = 'reset buffer' })
|
||||
vim.keymap.set('n', '<leader>gS', gitsigns.stage_buffer, { desc = 'stage buffer' })
|
||||
vim.keymap.set('n', '<leader>gR', gitsigns.stage_hunk, { desc = 'reset buffer' })
|
||||
|
||||
vim.keymap.set('n', '<leader>gp', gitsigns.preview_hunk, { desc = 'preview hunk' })
|
||||
vim.keymap.set('n', '<leader>gb', gitsigns.blame_line, { desc = 'blame line' })
|
||||
vim.keymap.set('n', '<leader>gp', gitsigns.preview_hunk, { desc = 'preview hunk' })
|
||||
vim.keymap.set('n', '<leader>gb', gitsigns.blame_line, { desc = 'blame line' })
|
||||
|
||||
|
||||
end
|
||||
},
|
||||
end
|
||||
},
|
||||
{
|
||||
'sindrets/diffview.nvim',
|
||||
config = function ()
|
||||
local actions = require('diffview.config').actions
|
||||
require('diffview').setup({
|
||||
keymaps = {
|
||||
disable_defaults = true,
|
||||
file_panel = {
|
||||
['i'] = '<Up>',
|
||||
['k'] = '<Down>',
|
||||
['j'] = false,
|
||||
},
|
||||
{
|
||||
'sindrets/diffview.nvim',
|
||||
config = function ()
|
||||
local actions = require('diffview.config').actions
|
||||
require('diffview').setup({
|
||||
keymaps = {
|
||||
disable_defaults = true,
|
||||
file_panel = {
|
||||
['i'] = '<Up>',
|
||||
['k'] = '<Down>',
|
||||
['j'] = false,
|
||||
|
||||
['<Space>'] = function () actions.toggle_stage_entry() end
|
||||
['<Space>'] = function () actions.toggle_stage_entry() end
|
||||
|
||||
}
|
||||
}
|
||||
})
|
||||
end
|
||||
},
|
||||
-- {
|
||||
-- 'NeogitOrg/neogit',
|
||||
-- dependencies = {
|
||||
-- 'nvim-lua/plenary.nvim',
|
||||
-- 'nvim-telescope/telescope.nvim',
|
||||
-- },
|
||||
-- config = function()
|
||||
-- require('neogit').setup({
|
||||
--
|
||||
-- kind = 'floating',
|
||||
-- graph_style = 'kitty',
|
||||
-- disable_line_numbers = false,
|
||||
-- disable_relative_line_numbers = false,
|
||||
-- commit_editor = {
|
||||
-- kind = 'floating',
|
||||
-- },
|
||||
-- commit_select_view = {
|
||||
-- kind = 'floating',
|
||||
-- },
|
||||
-- commit_view = {
|
||||
-- kind = 'floating',
|
||||
-- verify_commit = vim.fn.executable('gpg') == 1, -- Can be set to true or false, otherwise we try to find the binary
|
||||
-- },
|
||||
-- log_view = {
|
||||
-- kind = 'floating',
|
||||
-- },
|
||||
-- rebase_editor = {
|
||||
-- kind = 'floating',
|
||||
-- },
|
||||
-- reflog_view = {
|
||||
-- kind = 'floating',
|
||||
-- },
|
||||
-- merge_editor = {
|
||||
-- kind = 'floating',
|
||||
-- },
|
||||
-- description_editor = {
|
||||
-- kind = 'floating',
|
||||
-- },
|
||||
-- tag_editor = {
|
||||
-- kind = 'floating',
|
||||
-- },
|
||||
-- preview_buffer = {
|
||||
-- kind = 'floating',
|
||||
-- },
|
||||
-- popup = {
|
||||
-- kind = 'floating',
|
||||
-- },
|
||||
-- stash = {
|
||||
-- kind = 'floating',
|
||||
-- },
|
||||
-- refs_view = {
|
||||
-- kind = 'floating',
|
||||
-- },
|
||||
-- mappings = {
|
||||
-- status = {
|
||||
-- ['i'] = 'MoveUp',
|
||||
-- ['k'] = 'MoveDown',
|
||||
-- ['j'] = false,
|
||||
-- },
|
||||
-- }
|
||||
-- })
|
||||
-- vim.keymap.set('n', '<leader>gg', '<cmd>Neogit<CR>', { desc = 'open neogit '})
|
||||
-- end
|
||||
-- }
|
||||
-- {
|
||||
-- 'tpope/vim-fugitive',
|
||||
-- }
|
||||
-- {
|
||||
-- 'sindrets/diffview.nvim',
|
||||
-- dependencies = { 'nvim-tree/nvim-web-devicons' },
|
||||
-- -- lazy, only load diffview by these commands
|
||||
-- cmd = {
|
||||
-- 'DiffviewFileHistory', 'DiffviewOpen', 'DiffviewToggleFiles', 'DiffviewFocusFiles', 'DiffviewRefresh'
|
||||
-- }
|
||||
-- },
|
||||
-- {
|
||||
-- 'SuperBo/fugit2.nvim',
|
||||
-- build = false,
|
||||
-- opts = {
|
||||
-- width = 100,
|
||||
-- },
|
||||
-- dependencies = {
|
||||
-- 'MunifTanjim/nui.nvim',
|
||||
-- 'nvim-tree/nvim-web-devicons',
|
||||
-- 'nvim-lua/plenary.nvim',
|
||||
-- -- {
|
||||
-- -- 'chrisgrieser/nvim-tinygit', -- optional: for Github PR view
|
||||
-- -- dependencies = { 'stevearc/dressing.nvim' }
|
||||
-- -- },
|
||||
-- },
|
||||
-- cmd = { 'Fugit2', 'Fugit2Diff', 'Fugit2Graph' },
|
||||
-- keys = {
|
||||
-- { '<leader>F', mode = 'n', '<cmd>Fugit2<cr>' }
|
||||
-- }
|
||||
-- },
|
||||
}
|
||||
}
|
||||
})
|
||||
end
|
||||
},
|
||||
-- {
|
||||
-- 'NeogitOrg/neogit',
|
||||
-- dependencies = {
|
||||
-- 'nvim-lua/plenary.nvim',
|
||||
-- 'nvim-telescope/telescope.nvim',
|
||||
-- },
|
||||
-- config = function()
|
||||
-- require('neogit').setup({
|
||||
--
|
||||
-- kind = 'floating',
|
||||
-- graph_style = 'kitty',
|
||||
-- disable_line_numbers = false,
|
||||
-- disable_relative_line_numbers = false,
|
||||
-- commit_editor = {
|
||||
-- kind = 'floating',
|
||||
-- },
|
||||
-- commit_select_view = {
|
||||
-- kind = 'floating',
|
||||
-- },
|
||||
-- commit_view = {
|
||||
-- kind = 'floating',
|
||||
-- verify_commit = vim.fn.executable('gpg') == 1, -- Can be set to true or false, otherwise we try to find the binary
|
||||
-- },
|
||||
-- log_view = {
|
||||
-- kind = 'floating',
|
||||
-- },
|
||||
-- rebase_editor = {
|
||||
-- kind = 'floating',
|
||||
-- },
|
||||
-- reflog_view = {
|
||||
-- kind = 'floating',
|
||||
-- },
|
||||
-- merge_editor = {
|
||||
-- kind = 'floating',
|
||||
-- },
|
||||
-- description_editor = {
|
||||
-- kind = 'floating',
|
||||
-- },
|
||||
-- tag_editor = {
|
||||
-- kind = 'floating',
|
||||
-- },
|
||||
-- preview_buffer = {
|
||||
-- kind = 'floating',
|
||||
-- },
|
||||
-- popup = {
|
||||
-- kind = 'floating',
|
||||
-- },
|
||||
-- stash = {
|
||||
-- kind = 'floating',
|
||||
-- },
|
||||
-- refs_view = {
|
||||
-- kind = 'floating',
|
||||
-- },
|
||||
-- mappings = {
|
||||
-- status = {
|
||||
-- ['i'] = 'MoveUp',
|
||||
-- ['k'] = 'MoveDown',
|
||||
-- ['j'] = false,
|
||||
-- },
|
||||
-- }
|
||||
-- })
|
||||
-- vim.keymap.set('n', '<leader>gg', '<cmd>Neogit<CR>', { desc = 'open neogit '})
|
||||
-- end
|
||||
-- }
|
||||
-- {
|
||||
-- 'tpope/vim-fugitive',
|
||||
-- }
|
||||
-- {
|
||||
-- 'sindrets/diffview.nvim',
|
||||
-- dependencies = { 'nvim-tree/nvim-web-devicons' },
|
||||
-- -- lazy, only load diffview by these commands
|
||||
-- cmd = {
|
||||
-- 'DiffviewFileHistory', 'DiffviewOpen', 'DiffviewToggleFiles', 'DiffviewFocusFiles', 'DiffviewRefresh'
|
||||
-- }
|
||||
-- },
|
||||
-- {
|
||||
-- 'SuperBo/fugit2.nvim',
|
||||
-- build = false,
|
||||
-- opts = {
|
||||
-- width = 100,
|
||||
-- },
|
||||
-- dependencies = {
|
||||
-- 'MunifTanjim/nui.nvim',
|
||||
-- 'nvim-tree/nvim-web-devicons',
|
||||
-- 'nvim-lua/plenary.nvim',
|
||||
-- -- {
|
||||
-- -- 'chrisgrieser/nvim-tinygit', -- optional: for Github PR view
|
||||
-- -- dependencies = { 'stevearc/dressing.nvim' }
|
||||
-- -- },
|
||||
-- },
|
||||
-- cmd = { 'Fugit2', 'Fugit2Diff', 'Fugit2Graph' },
|
||||
-- keys = {
|
||||
-- { '<leader>F', mode = 'n', '<cmd>Fugit2<cr>' }
|
||||
-- }
|
||||
-- },
|
||||
}
|
||||
|
|
|
|||
|
|
@ -17,7 +17,6 @@ require('lazy').setup({
|
|||
'tpope/vim-sleuth', -- Detect tabstop and shiftwidth automatically
|
||||
{ 'folke/todo-comments.nvim', event = 'VimEnter', dependencies = { 'nvim-lua/plenary.nvim' }, opts = {} },
|
||||
|
||||
{ 'meatballs/notebook.nvim', opts = {} },
|
||||
-- { 'stevearc/dressing.nvim', opts = {}, },
|
||||
|
||||
-- 'ThePrimeagen/vim-be-good',
|
||||
|
|
@ -33,7 +32,7 @@ require('lazy').setup({
|
|||
require('config.plugins.snacks'),
|
||||
require('config.plugins.mini'),
|
||||
|
||||
require('config.plugins.languages.molten'),
|
||||
require('config.plugins.languages.notebook'),
|
||||
require('config.plugins.languages.flutter'),
|
||||
require('config.plugins.languages.markdown'),
|
||||
|
||||
|
|
|
|||
|
|
@ -1,27 +0,0 @@
|
|||
return {
|
||||
{
|
||||
'3rd/image.nvim',
|
||||
version = '1.1.0',
|
||||
build = false, -- so that it doesn't build the rock https://github.com/3rd/image.nvim/issues/91#issuecomment-2453430239
|
||||
opts = {
|
||||
backend = 'kitty', -- whatever backend you would like to use
|
||||
max_width = 100,
|
||||
max_height = 20,
|
||||
max_height_window_percentage = math.huge,
|
||||
max_width_window_percentage = math.huge,
|
||||
window_overlap_clear_enabled = true, -- toggles images when windows are overlapped
|
||||
window_overlap_clear_ft_ignore = { 'cmp_menu', 'cmp_docs', '' },
|
||||
}
|
||||
|
||||
},
|
||||
{
|
||||
'benlubas/molten-nvim',
|
||||
version = '^1.0.0', -- use version <2.0.0 to avoid breaking changes
|
||||
dependencies = { '3rd/image.nvim' },
|
||||
build = ':UpdateRemotePlugins',
|
||||
init = function()
|
||||
-- these are examples, not defaults. Please see the readme
|
||||
vim.g.molten_image_provider = 'image.nvim'
|
||||
end,
|
||||
}
|
||||
}
|
||||
121
.config/nvim/lua/config/plugins/languages/notebook.lua
Normal file
121
.config/nvim/lua/config/plugins/languages/notebook.lua
Normal file
|
|
@ -0,0 +1,121 @@
|
|||
-- Provide a command to create a blank new Python notebook
|
||||
-- note: the metadata is needed for Jupytext to understand how to parse the notebook.
|
||||
-- if you use another language than Python, you should change it in the template.
|
||||
local default_notebook = [[
|
||||
{
|
||||
"cells": [
|
||||
{
|
||||
"cell_type": "markdown",
|
||||
"metadata": {},
|
||||
"source": [
|
||||
""
|
||||
]
|
||||
}
|
||||
],
|
||||
"metadata": {
|
||||
"kernelspec": {
|
||||
"display_name": "Python 3",
|
||||
"language": "python",
|
||||
"name": "python3"
|
||||
},
|
||||
"language_info": {
|
||||
"codemirror_mode": {
|
||||
"name": "ipython"
|
||||
},
|
||||
"file_extension": ".py",
|
||||
"mimetype": "text/x-python",
|
||||
"name": "python",
|
||||
"nbconvert_exporter": "python",
|
||||
"pygments_lexer": "ipython3"
|
||||
}
|
||||
},
|
||||
"nbformat": 4,
|
||||
"nbformat_minor": 5
|
||||
}
|
||||
]]
|
||||
|
||||
local function new_notebook(filename)
|
||||
local path = filename .. ".ipynb"
|
||||
local file = io.open(path, "w")
|
||||
if file then
|
||||
file:write(default_notebook)
|
||||
file:close()
|
||||
vim.cmd("edit " .. path)
|
||||
else
|
||||
print("Error: Could not open new notebook file for writing.")
|
||||
end
|
||||
end
|
||||
|
||||
vim.api.nvim_create_user_command('NewNotebook', function(opts)
|
||||
new_notebook(opts.args)
|
||||
end, {
|
||||
nargs = 1,
|
||||
complete = 'file'
|
||||
})
|
||||
|
||||
return {
|
||||
{
|
||||
'3rd/image.nvim',
|
||||
version = '1.1.0',
|
||||
build = false, -- so that it doesn't build the rock https://github.com/3rd/image.nvim/issues/91#issuecomment-2453430239
|
||||
opts = {
|
||||
backend = 'kitty', -- whatever backend you would like to use
|
||||
max_width = 100,
|
||||
max_height = 20,
|
||||
max_height_window_percentage = math.huge,
|
||||
max_width_window_percentage = math.huge,
|
||||
window_overlap_clear_enabled = true, -- toggles images when windows are overlapped
|
||||
window_overlap_clear_ft_ignore = { 'cmp_menu', 'cmp_docs', '' },
|
||||
}
|
||||
|
||||
},
|
||||
{
|
||||
'benlubas/molten-nvim',
|
||||
version = '^1.0.0', -- use version <2.0.0 to avoid breaking changes
|
||||
dependencies = { '3rd/image.nvim' },
|
||||
build = ':UpdateRemotePlugins',
|
||||
init = function()
|
||||
-- these are examples, not defaults. Please see the readme
|
||||
vim.g.molten_image_provider = 'image.nvim'
|
||||
vim.g.molten_virt_text_output = true
|
||||
vim.g.molten_virt_lines_off_by_1 = true
|
||||
vim.g.molten_auto_open_output = false
|
||||
end,
|
||||
},
|
||||
{
|
||||
'GCBallesteros/jupytext.nvim',
|
||||
opts = {
|
||||
style = 'markdown',
|
||||
output_extension = 'md',
|
||||
force_ft = 'markdown'
|
||||
}
|
||||
},
|
||||
{
|
||||
'jmbuhr/otter.nvim',
|
||||
dependencies = {
|
||||
'nvim-treesitter/nvim-treesitter',
|
||||
},
|
||||
config = function ()
|
||||
local otter = require('otter')
|
||||
otter.setup()
|
||||
|
||||
vim.api.nvim_create_autocmd('BufEnter', {
|
||||
pattern = { '*.ipynb' },
|
||||
callback = function ()
|
||||
if not vim.b._molten_import_output then
|
||||
vim.b._molten_import_output = true
|
||||
vim.cmd('MoltenImportOutput')
|
||||
otter.activate({ 'python' })
|
||||
end
|
||||
end
|
||||
})
|
||||
vim.api.nvim_create_autocmd('BufWritePost', {
|
||||
pattern = { '*.ipynb' },
|
||||
callback = function ()
|
||||
vim.cmd('MoltenExportOutput!')
|
||||
end
|
||||
})
|
||||
|
||||
end
|
||||
}
|
||||
}
|
||||
|
|
@ -79,6 +79,8 @@ return {
|
|||
|
||||
['<c-h>'] = { 'toggle_hidden', mode = 'i' },
|
||||
['<c-l>'] = { 'toggle_ignored', mode = 'i' },
|
||||
|
||||
['<a-q>'] = { 'qflist', mode = 'i' },
|
||||
}
|
||||
}
|
||||
},
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue