nvim+ipython+zsh updates
This commit is contained in:
@@ -1,6 +1,3 @@
|
|||||||
c.InteractiveShellApp.extensions = ["autoreload"]
|
|
||||||
c.InteractiveShellApp.exec_lines = ["%autoreload 2"]
|
|
||||||
|
|
||||||
## Use colors for displaying information about objects. Because this information
|
## Use colors for displaying information about objects. Because this information
|
||||||
# is passed through a pager (like 'less'), and some pagers get confused with
|
# is passed through a pager (like 'less'), and some pagers get confused with
|
||||||
# color codes, this capability can be turned off.
|
# color codes, this capability can be turned off.
|
||||||
|
|||||||
+47
-13
@@ -200,6 +200,7 @@ require("lazy").setup({
|
|||||||
"nvim-lualine/lualine.nvim",
|
"nvim-lualine/lualine.nvim",
|
||||||
dependencies = { "nvim-tree/nvim-web-devicons" },
|
dependencies = { "nvim-tree/nvim-web-devicons" },
|
||||||
config = function()
|
config = function()
|
||||||
|
local noice_status = require("noice").api.status
|
||||||
require("lualine").setup({
|
require("lualine").setup({
|
||||||
options = { theme = "auto", globalstatus = false },
|
options = { theme = "auto", globalstatus = false },
|
||||||
extensions = { "fugitive" },
|
extensions = { "fugitive" },
|
||||||
@@ -215,7 +216,18 @@ require("lazy").setup({
|
|||||||
},
|
},
|
||||||
{ "diff", colored = true },
|
{ "diff", colored = true },
|
||||||
},
|
},
|
||||||
lualine_x = {},
|
lualine_x = {
|
||||||
|
{
|
||||||
|
noice_status.command.get,
|
||||||
|
cond = noice_status.command.has,
|
||||||
|
color = { fg = "#ff9e64" },
|
||||||
|
},
|
||||||
|
{
|
||||||
|
noice_status.mode.get,
|
||||||
|
cond = noice_status.mode.has,
|
||||||
|
color = { fg = "#ff9e64" },
|
||||||
|
},
|
||||||
|
},
|
||||||
lualine_y = { "filetype", "progress" },
|
lualine_y = { "filetype", "progress" },
|
||||||
lualine_z = { "location" },
|
lualine_z = { "location" },
|
||||||
},
|
},
|
||||||
@@ -382,6 +394,7 @@ require("lazy").setup({
|
|||||||
},
|
},
|
||||||
config = function()
|
config = function()
|
||||||
local cmp = require("cmp")
|
local cmp = require("cmp")
|
||||||
|
local compare = require("cmp.config.compare")
|
||||||
cmp.setup({
|
cmp.setup({
|
||||||
sources = cmp.config.sources({
|
sources = cmp.config.sources({
|
||||||
{ name = "nvim_lsp" },
|
{ name = "nvim_lsp" },
|
||||||
@@ -395,25 +408,44 @@ require("lazy").setup({
|
|||||||
["<C-e>"] = cmp.mapping.abort(),
|
["<C-e>"] = cmp.mapping.abort(),
|
||||||
["<CR>"] = cmp.mapping.confirm({ select = false }),
|
["<CR>"] = cmp.mapping.confirm({ select = false }),
|
||||||
}),
|
}),
|
||||||
|
matching = {
|
||||||
|
disallow_fuzzy_matching = true,
|
||||||
|
disallow_fullfuzzy_matching = true,
|
||||||
|
disallow_partial_fuzzy_matching = true,
|
||||||
|
disallow_partial_matching = true,
|
||||||
|
disallow_prefix_unmatching = false,
|
||||||
|
},
|
||||||
|
sorting = {
|
||||||
|
priority_weight = 2,
|
||||||
|
comparators = {
|
||||||
|
compare.offset,
|
||||||
|
compare.exact,
|
||||||
|
-- compare.scopes,
|
||||||
|
compare.score,
|
||||||
|
compare.recently_used,
|
||||||
|
compare.locality,
|
||||||
|
compare.kind,
|
||||||
|
compare.sort_text,
|
||||||
|
compare.length,
|
||||||
|
compare.order,
|
||||||
|
},
|
||||||
|
},
|
||||||
})
|
})
|
||||||
cmp.setup.cmdline(":", {
|
cmp.setup.cmdline(":", {
|
||||||
mapping = cmp.mapping.preset.cmdline(),
|
mapping = cmp.mapping.preset.cmdline(),
|
||||||
sources = cmp.config.sources({ { name = "path" } }, { { name = "cmdline" } }),
|
sources = cmp.config.sources({ { name = "path" } }, { { name = "cmdline" } }),
|
||||||
})
|
})
|
||||||
-- Set configuration for specific filetype.
|
|
||||||
cmp.setup.filetype("gitcommit", {
|
cmp.setup.filetype("gitcommit", {
|
||||||
sources = cmp.config.sources({
|
sources = cmp.config.sources({
|
||||||
{ name = "cmp_git" }, -- You can specify the `cmp_git` source if you were installed it.
|
{ name = "cmp_git" }, -- You can specify the `cmp_git` source if you were installed it.
|
||||||
}, { { name = "buffer" } }),
|
}, { { name = "buffer" } }),
|
||||||
})
|
})
|
||||||
|
|
||||||
-- Use buffer source for `/` and `?` (if you enabled `native_menu`, this won't work anymore).
|
cmp.setup.cmdline({ "/", "?" }, {
|
||||||
-- cmp.setup.cmdline({ "/", "?" }, {
|
mapping = cmp.mapping.preset.cmdline(),
|
||||||
-- mapping = cmp.mapping.preset.cmdline(),
|
sources = { { name = "buffer" } },
|
||||||
-- sources = { { name = "buffer" } },
|
})
|
||||||
-- })
|
|
||||||
|
|
||||||
-- Use cmdline & path source for ':' (if you enabled `native_menu`, this won't work anymore).
|
|
||||||
cmp.setup.cmdline(":", {
|
cmp.setup.cmdline(":", {
|
||||||
mapping = cmp.mapping.preset.cmdline(),
|
mapping = cmp.mapping.preset.cmdline(),
|
||||||
sources = cmp.config.sources({ { name = "path" } }, { { name = "cmdline" } }),
|
sources = cmp.config.sources({ { name = "path" } }, { { name = "cmdline" } }),
|
||||||
@@ -435,8 +467,14 @@ require("lazy").setup({
|
|||||||
local actions = require("telescope.actions")
|
local actions = require("telescope.actions")
|
||||||
map("n", "<M-F>", "<cmd>Telescope find_files layout_config={width=0.99}<cr>", opts)
|
map("n", "<M-F>", "<cmd>Telescope find_files layout_config={width=0.99}<cr>", opts)
|
||||||
map("n", "<M-f>", "<cmd>Telescope git_files layout_config={width=0.99}<cr>", opts)
|
map("n", "<M-f>", "<cmd>Telescope git_files layout_config={width=0.99}<cr>", opts)
|
||||||
map("n", "<M-e>", "<cmd>Telescope diagnostics layout_strategy=vertical layout_config={width=0.99}<cr>", opts)
|
map(
|
||||||
|
"n",
|
||||||
|
"<M-e>",
|
||||||
|
"<cmd>Telescope diagnostics layout_strategy=vertical layout_config={width=0.99}<cr>",
|
||||||
|
opts
|
||||||
|
)
|
||||||
map("n", "<M-w>", "<cmd>Telescope live_grep layout_strategy=vertical layout_config={width=0.99}<cr>", opts)
|
map("n", "<M-w>", "<cmd>Telescope live_grep layout_strategy=vertical layout_config={width=0.99}<cr>", opts)
|
||||||
|
map("n", "<M-w>", ':lua require("telescope").extensions.live_grep_args.live_grep_args()<cr>', opts)
|
||||||
map("n", "<M-y>", "<cmd>Telescope filetypes<cr>", opts)
|
map("n", "<M-y>", "<cmd>Telescope filetypes<cr>", opts)
|
||||||
map("n", "<M-u>", "<cmd>Telescope search_history<cr>", opts)
|
map("n", "<M-u>", "<cmd>Telescope search_history<cr>", opts)
|
||||||
map("n", "<F9>", "<cmd>Telescope colorscheme layout_config={width=0.5} enable_preview=1<cr>", opts)
|
map("n", "<F9>", "<cmd>Telescope colorscheme layout_config={width=0.5} enable_preview=1<cr>", opts)
|
||||||
@@ -823,10 +861,6 @@ require("lazy").setup({
|
|||||||
},
|
},
|
||||||
opts = { skip = true },
|
opts = { skip = true },
|
||||||
},
|
},
|
||||||
{ -- show 'recording @...'
|
|
||||||
filter = { event = "msg_showmode" },
|
|
||||||
view = "notify",
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
filter = { kind = "", min_height = 2 },
|
filter = { kind = "", min_height = 2 },
|
||||||
view = "split",
|
view = "split",
|
||||||
|
|||||||
@@ -36,6 +36,7 @@ bindkey "^[[1;3C" forward-word # alt+right
|
|||||||
bindkey "^[[1;3D" backward-word # alt+left
|
bindkey "^[[1;3D" backward-word # alt+left
|
||||||
bindkey "[[3~" delete-char # delete
|
bindkey "[[3~" delete-char # delete
|
||||||
bindkey "^[^?" backward-kill-word # alt+backspace
|
bindkey "^[^?" backward-kill-word # alt+backspace
|
||||||
|
bindkey '^[[Z' reverse-menu-complete
|
||||||
|
|
||||||
# substring search
|
# substring search
|
||||||
bindkey "^[[A" history-substring-search-up # up
|
bindkey "^[[A" history-substring-search-up # up
|
||||||
|
|||||||
Reference in New Issue
Block a user