Compare commits
No commits in common. "4c12a2bee96856b058eb374d8c4ea06141b24b81" and "9897c9665aab5a6f06f33d7b24e90a1a7fc3a49b" have entirely different histories.
4c12a2bee9
...
9897c9665a
@ -1,4 +1,5 @@
|
|||||||
-- CORE SETTINGS
|
-- CORE SETTINGS
|
||||||
|
|
||||||
local opt = vim.o
|
local opt = vim.o
|
||||||
local global = vim.g
|
local global = vim.g
|
||||||
|
|
||||||
|
@ -41,6 +41,8 @@ vim.api.nvim_set_keymap('', '<leader>tt', ':TagbarToggle<cr>', {silent = true})
|
|||||||
vim.api.nvim_set_keymap('', '<C-n>', ':NvimTreeToggle<cr>', {silent = true})
|
vim.api.nvim_set_keymap('', '<C-n>', ':NvimTreeToggle<cr>', {silent = true})
|
||||||
-- toggle formatter
|
-- toggle formatter
|
||||||
vim.api.nvim_set_keymap('', '<leader>fm', ':Neoformat<cr>', {silent = true})
|
vim.api.nvim_set_keymap('', '<leader>fm', ':Neoformat<cr>', {silent = true})
|
||||||
|
-- toggle comment
|
||||||
|
vim.api.nvim_set_keymap('', '<leader>/', ':CommentToggle<cr>', {silent = true})
|
||||||
-- toggle Hop
|
-- toggle Hop
|
||||||
vim.api.nvim_set_keymap('', '<leader>b', ':HopWordBC<cr>', {silent = true})
|
vim.api.nvim_set_keymap('', '<leader>b', ':HopWordBC<cr>', {silent = true})
|
||||||
vim.api.nvim_set_keymap('', '<leader>w', ':HopWordAC<cr>', {silent = true})
|
vim.api.nvim_set_keymap('', '<leader>w', ':HopWordAC<cr>', {silent = true})
|
||||||
|
@ -62,7 +62,7 @@ return require('packer').startup(function(use)
|
|||||||
use {
|
use {
|
||||||
'ms-jpq/coq_nvim',
|
'ms-jpq/coq_nvim',
|
||||||
branch = 'coq',
|
branch = 'coq',
|
||||||
after = {'nvim-lsp-installer', 'zk-nvim'},
|
after = 'nvim-lsp-installer',
|
||||||
run = ':COQdeps',
|
run = ':COQdeps',
|
||||||
config = function() require "plugins.coq" end
|
config = function() require "plugins.coq" end
|
||||||
}
|
}
|
||||||
@ -79,7 +79,6 @@ return require('packer').startup(function(use)
|
|||||||
|
|
||||||
end
|
end
|
||||||
}
|
}
|
||||||
|
|
||||||
-- formating and editing
|
-- formating and editing
|
||||||
use {"sbdchd/neoformat", cmd = "Neoformat"}
|
use {"sbdchd/neoformat", cmd = "Neoformat"}
|
||||||
use {
|
use {
|
||||||
@ -90,8 +89,9 @@ return require('packer').startup(function(use)
|
|||||||
use {"machakann/vim-sandwich", event = "BufEnter"}
|
use {"machakann/vim-sandwich", event = "BufEnter"}
|
||||||
|
|
||||||
use {
|
use {
|
||||||
'numToStr/Comment.nvim',
|
"terrortylor/nvim-comment",
|
||||||
config = function() require('Comment').setup() end
|
config = function() require('nvim_comment').setup() end,
|
||||||
|
cmd = "CommentToggle"
|
||||||
}
|
}
|
||||||
use {
|
use {
|
||||||
"windwp/nvim-autopairs",
|
"windwp/nvim-autopairs",
|
||||||
@ -111,6 +111,7 @@ return require('packer').startup(function(use)
|
|||||||
after = 'nvim-treesitter',
|
after = 'nvim-treesitter',
|
||||||
config = function() require "plugins.matchup" end
|
config = function() require "plugins.matchup" end
|
||||||
}
|
}
|
||||||
|
-- Lua
|
||||||
use {
|
use {
|
||||||
'abecodes/tabout.nvim',
|
'abecodes/tabout.nvim',
|
||||||
config = function() require('tabout').setup {} end,
|
config = function() require('tabout').setup {} end,
|
||||||
@ -120,7 +121,7 @@ return require('packer').startup(function(use)
|
|||||||
'nvim-telescope/telescope.nvim',
|
'nvim-telescope/telescope.nvim',
|
||||||
requires = {{'nvim-lua/plenary.nvim'}},
|
requires = {{'nvim-lua/plenary.nvim'}},
|
||||||
config = function() require "plugins.telescope" end,
|
config = function() require "plugins.telescope" end,
|
||||||
event = "UIEnter"
|
cmd = 'Telescope'
|
||||||
}
|
}
|
||||||
use {'preservim/tagbar', cmd = 'TagbarToggle'}
|
use {'preservim/tagbar', cmd = 'TagbarToggle'}
|
||||||
use {
|
use {
|
||||||
@ -183,14 +184,7 @@ return require('packer').startup(function(use)
|
|||||||
|
|
||||||
-- integrations
|
-- integrations
|
||||||
use {"tpope/vim-fugitive", cmd = "G"}
|
use {"tpope/vim-fugitive", cmd = "G"}
|
||||||
use {
|
use {"ellisonleao/glow.nvim", branch = 'main', cmd = {"Glow", "GlowInstall"}}
|
||||||
"mickael-menu/zk-nvim",
|
|
||||||
filetypes = {'markdown'},
|
|
||||||
config = function()
|
|
||||||
require "plugins.telescope"
|
|
||||||
require "plugins.zk"
|
|
||||||
end
|
|
||||||
}
|
|
||||||
|
|
||||||
-- fixes and misc. stuff
|
-- fixes and misc. stuff
|
||||||
use {"antoinemadec/FixCursorHold.nvim"}
|
use {"antoinemadec/FixCursorHold.nvim"}
|
||||||
|
@ -1,6 +1,27 @@
|
|||||||
require('telescope').setup {
|
require('telescope').setup {
|
||||||
defaults = {layout_strategy = 'vertical', layout_config = {height = 0.95}},
|
defaults = {
|
||||||
pickers = {},
|
-- Default configuration for telescope goes here:
|
||||||
extensions = {}
|
-- config_key = value,
|
||||||
|
-- ..
|
||||||
|
layout_strategy = 'vertical',
|
||||||
|
layout_config = {height = 0.95}
|
||||||
|
|
||||||
|
},
|
||||||
|
pickers = {
|
||||||
|
-- Default configuration for builtin pickers goes here:
|
||||||
|
-- picker_name = {
|
||||||
|
-- picker_config_key = value,
|
||||||
|
-- ...
|
||||||
|
-- }
|
||||||
|
-- Now the picker_config_key will be applied every time you call this
|
||||||
|
-- builtin picker
|
||||||
|
},
|
||||||
|
extensions = {
|
||||||
|
-- Your extension configuration goes here:
|
||||||
|
-- extension_name = {
|
||||||
|
-- extension_config_key = value,
|
||||||
|
-- }
|
||||||
|
-- please take a look at the readme of the extension you want to configure
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1,21 +0,0 @@
|
|||||||
require("zk").setup({
|
|
||||||
-- can be "telescope", "fzf" or "select" (`vim.ui.select`)
|
|
||||||
-- it's recommended to use "telescope" or "fzf"
|
|
||||||
picker = "telescope",
|
|
||||||
|
|
||||||
lsp = {
|
|
||||||
-- `config` is passed to `vim.lsp.start_client(config)`
|
|
||||||
config = {
|
|
||||||
cmd = { "zk", "lsp" },
|
|
||||||
name = "zk",
|
|
||||||
-- on_attach = ...
|
|
||||||
-- etc, see `:h vim.lsp.start_client()`
|
|
||||||
},
|
|
||||||
|
|
||||||
-- automatically attach buffers in a zk notebook that match the given filetypes
|
|
||||||
auto_attach = {
|
|
||||||
enabled = true,
|
|
||||||
filetypes = { "markdown" },
|
|
||||||
},
|
|
||||||
},
|
|
||||||
})
|
|
Loading…
Reference in New Issue
Block a user