mirror of
https://github.com/m-housh/dotfiles.git
synced 2026-02-15 14:42:37 +00:00
Compare commits
3 Commits
68d3f5a183
...
4b39a3eb95
| Author | SHA1 | Date | |
|---|---|---|---|
|
4b39a3eb95
|
|||
|
1e427911ac
|
|||
|
0c15983dae
|
@@ -39,3 +39,12 @@ vim.api.nvim_exec2(
|
|||||||
]],
|
]],
|
||||||
{}
|
{}
|
||||||
)
|
)
|
||||||
|
|
||||||
|
-- Highlight when yanking.
|
||||||
|
createCmd("TextYankPost", {
|
||||||
|
desc = "Highlight when yanking text.",
|
||||||
|
group = vim.api.nvim_create_augroup("highlight-yank", { clear = true }),
|
||||||
|
callback = function()
|
||||||
|
vim.highlight.on_yank()
|
||||||
|
end,
|
||||||
|
})
|
||||||
|
|||||||
@@ -32,19 +32,26 @@ return {
|
|||||||
mapping = cmp.mapping.preset.insert({
|
mapping = cmp.mapping.preset.insert({
|
||||||
["<C-k>"] = cmp.mapping.select_prev_item(), -- previous suggestion
|
["<C-k>"] = cmp.mapping.select_prev_item(), -- previous suggestion
|
||||||
["<C-j>"] = cmp.mapping.select_next_item(), -- next suggestion
|
["<C-j>"] = cmp.mapping.select_next_item(), -- next suggestion
|
||||||
["<C-Space>"] = cmp.mapping.complete(), -- show completion suggestions
|
["<C-Space>"] = cmp.mapping.confirm({
|
||||||
|
behavior = cmp.ConfirmBehavior.Insert,
|
||||||
|
select = true,
|
||||||
|
}), -- select completion, this makes it so it doesn't auto complete when suggesting.
|
||||||
["<C-e>"] = cmp.mapping.abort(), -- close completion window
|
["<C-e>"] = cmp.mapping.abort(), -- close completion window
|
||||||
["<CR>"] = cmp.mapping(function(fallback)
|
["<CR>"] = cmp.mapping({
|
||||||
if cmp.visible() then
|
i = function(fallback)
|
||||||
if luasnip.expandable() then
|
if cmp.visible() then
|
||||||
luasnip.expand()
|
if luasnip.expandable() then
|
||||||
|
luasnip.expand()
|
||||||
|
else
|
||||||
|
cmp.confirm({ behavior = cmp.ConfirmBehavior.Insert, select = true })
|
||||||
|
end
|
||||||
else
|
else
|
||||||
cmp.confirm({ select = true })
|
fallback()
|
||||||
end
|
end
|
||||||
else
|
end,
|
||||||
fallback()
|
s = cmp.mapping.confirm({ select = true }),
|
||||||
end
|
c = cmp.mapping.confirm({ behavior = cmp.ConfirmBehavior.Replace, select = true }),
|
||||||
end),
|
}),
|
||||||
-- TODO:
|
-- TODO:
|
||||||
-- The next two mappings are also implemented in the LuaSnip configuration,
|
-- The next two mappings are also implemented in the LuaSnip configuration,
|
||||||
-- as <C-j> and <C-k> do they actually need to be here??
|
-- as <C-j> and <C-k> do they actually need to be here??
|
||||||
|
|||||||
@@ -73,16 +73,10 @@ bind -n M-h previous-window
|
|||||||
bind -n M-L next-window
|
bind -n M-L next-window
|
||||||
bind C-l send-keys 'C-l'
|
bind C-l send-keys 'C-l'
|
||||||
|
|
||||||
<<<<<<< HEAD
|
|
||||||
bind f run-shell "tmux display-popup -E -w 80% -h 80% ${SCRIPTS}/tmux-sessionator"
|
|
||||||
bind-key -r C run-shell -b "${SCRIPTS}/tmux-sessionator ~/.dotfiles"
|
|
||||||
bind S run-shell -b "~/.config/tmux/plugins/tmux-fzf/scripts/session.sh switch"
|
|
||||||
=======
|
|
||||||
bind f run-shell "tmux display-popup -E -w 80% -h 80% ~/.local/scripts/tmux-sessionator"
|
bind f run-shell "tmux display-popup -E -w 80% -h 80% ~/.local/scripts/tmux-sessionator"
|
||||||
bind-key -r C run-shell -b "~/.local/scripts/tmux-sessionator ~/.dotfiles"
|
bind-key -r C run-shell -b "~/.local/scripts/tmux-sessionator ~/.dotfiles"
|
||||||
unbind s
|
unbind s
|
||||||
bind s run-shell -b "~/.config/tmux/plugins/tmux-fzf/scripts/session.sh switch"
|
bind s run-shell -b "~/.config/tmux/plugins/tmux-fzf/scripts/session.sh switch"
|
||||||
>>>>>>> 4771d35 (feat: Nvim config updates)
|
|
||||||
|
|
||||||
# reload new changes
|
# reload new changes
|
||||||
bind-key r source-file ~/.config/tmux/tmux.conf\; \display-message "source-file done"
|
bind-key r source-file ~/.config/tmux/tmux.conf\; \display-message "source-file done"
|
||||||
|
|||||||
Reference in New Issue
Block a user