mirror of
https://github.com/WarrenHood/dotfiles.git
synced 2025-04-29 19:04:58 +01:00
Merge branch 'main' of github.com:warrenhood/dotfiles into arch-awesome
This commit is contained in:
commit
266f5da0b3
|
@ -430,6 +430,9 @@ shell:
|
|||
program: /bin/zsh
|
||||
args:
|
||||
- -l
|
||||
# - -c
|
||||
# - "tmux attach || tmux"
|
||||
|
||||
# Startup directory
|
||||
#
|
||||
# Directory the shell is started in. If this is unset, or `None`, the working
|
||||
|
|
|
@ -2,63 +2,75 @@
|
|||
local cmp = require("cmp")
|
||||
|
||||
cmp.setup({
|
||||
snippet = {
|
||||
-- REQUIRED - you must specify a snippet engine
|
||||
expand = function(args)
|
||||
require('luasnip').lsp_expand(args.body)
|
||||
end,
|
||||
vim.lsp.buf.format,
|
||||
},
|
||||
window = {
|
||||
snippet = {
|
||||
-- REQUIRED - you must specify a snippet engine
|
||||
expand = function(args)
|
||||
require('luasnip').lsp_expand(args.body)
|
||||
end,
|
||||
vim.lsp.buf.format,
|
||||
},
|
||||
window = {
|
||||
|
||||
-- completion = cmp.config.window.bordered(),
|
||||
-- documentation = cmp.config.window.bordered(),
|
||||
},
|
||||
mapping = cmp.mapping.preset.insert({
|
||||
["<C-b>"] = cmp.mapping.scroll_docs(-4),
|
||||
["<C-f>"] = cmp.mapping.scroll_docs(4),
|
||||
-- completion = cmp.config.window.bordered(),
|
||||
-- documentation = cmp.config.window.bordered(),
|
||||
},
|
||||
mapping = cmp.mapping.preset.insert({
|
||||
["<C-b>"] = cmp.mapping.scroll_docs(-4),
|
||||
["<C-f>"] = cmp.mapping.scroll_docs(4),
|
||||
|
||||
["<C-Space>"] = cmp.mapping.complete(),
|
||||
["<C-e>"] = cmp.mapping.abort(),
|
||||
["<CR>"] = cmp.mapping.confirm({ select = true }), -- Accept currently selected item. Set `select` to `false` to only confirm explicitly selected items.
|
||||
["<Tab>"] = cmp.mapping(function() if cmp.visible() then cmp.select_next_item() end end),
|
||||
["<S-Tab>"] = cmp.mapping(function() if cmp.visible() then cmp.select_prev_item() end end),
|
||||
}),
|
||||
sources = cmp.config.sources({
|
||||
{ name = "nvim_lsp" },
|
||||
{ name = "luasnip" },
|
||||
{ name = "treesitter" },
|
||||
}, {
|
||||
{ name = "buffer" },
|
||||
}),
|
||||
["<C-Space>"] = cmp.mapping.complete(),
|
||||
["<C-e>"] = cmp.mapping.abort(),
|
||||
["<CR>"] = cmp.mapping.confirm({ select = true }), -- Accept currently selected item. Set `select` to `false` to only confirm explicitly selected items.
|
||||
["<Tab>"] = cmp.mapping(function(fallback)
|
||||
if cmp.visible() then
|
||||
cmp.select_next_item()
|
||||
else
|
||||
fallback()
|
||||
end
|
||||
end),
|
||||
["<S-Tab>"] = cmp.mapping(function(fallback)
|
||||
if cmp.visible() then
|
||||
cmp.select_prev_item()
|
||||
else
|
||||
fallback()
|
||||
end
|
||||
end),
|
||||
}),
|
||||
sources = cmp.config.sources({
|
||||
{ name = "nvim_lsp" },
|
||||
{ name = "luasnip" },
|
||||
{ name = "treesitter" },
|
||||
}, {
|
||||
{ name = "buffer" },
|
||||
}),
|
||||
})
|
||||
|
||||
-- Set configuration for specific filetype.
|
||||
cmp.setup.filetype("gitcommit", {
|
||||
sources = cmp.config.sources({
|
||||
{ name = "cmp_git" }, -- You can specify the `cmp_git` source if you were installed it.
|
||||
}, {
|
||||
{ name = "buffer" },
|
||||
}),
|
||||
sources = cmp.config.sources({
|
||||
{ name = "cmp_git" }, -- You can specify the `cmp_git` source if you were installed it.
|
||||
}, {
|
||||
{ name = "buffer" },
|
||||
}),
|
||||
})
|
||||
|
||||
-- Use buffer source for `/` and `?` (if you enabled `native_menu`, this won't work anymore).
|
||||
cmp.setup.cmdline({ "/", "?" }, {
|
||||
mapping = cmp.mapping.preset.cmdline(),
|
||||
sources = {
|
||||
{ name = "buffer" },
|
||||
},
|
||||
mapping = cmp.mapping.preset.cmdline(),
|
||||
sources = {
|
||||
{ name = "buffer" },
|
||||
},
|
||||
})
|
||||
|
||||
-- Use cmdline & path source for ':' (if you enabled `native_menu`, this won't work anymore).
|
||||
cmp.setup.cmdline(":", {
|
||||
mapping = cmp.mapping.preset.cmdline(),
|
||||
sources = cmp.config.sources({
|
||||
{ name = "path" },
|
||||
}, {
|
||||
{ name = "cmdline" },
|
||||
}, {
|
||||
{ name = "stylua" },
|
||||
}),
|
||||
mapping = cmp.mapping.preset.cmdline(),
|
||||
sources = cmp.config.sources({
|
||||
{ name = "path" },
|
||||
}, {
|
||||
{ name = "cmdline" },
|
||||
}, {
|
||||
{ name = "stylua" },
|
||||
}),
|
||||
})
|
||||
|
||||
|
|
|
@ -17,6 +17,7 @@ map('i', '<C-S>', '<ESC>:w<CR>')
|
|||
-- Telescope
|
||||
local telescope_builtin = require('telescope.builtin')
|
||||
map('n', '<leader>ff', telescope_builtin.find_files, { desc = 'Find Files' })
|
||||
map('n', '<leader>fF', ":Telescope find_files hidden=true<CR>", { desc = 'Find Files (including hidden)' })
|
||||
map('n', '<leader>fg', telescope_builtin.live_grep, { desc = 'Live Grep' })
|
||||
map('n', '<leader>fb', telescope_builtin.buffers, { desc = 'Find Buffers' })
|
||||
map('n', '<leader>fh', telescope_builtin.help_tags, { desc = 'Help Tags' })
|
||||
|
@ -25,8 +26,8 @@ map('n', '<leader>fh', telescope_builtin.help_tags, { desc = 'Help Tags' })
|
|||
map('n', '<C-B>', ':NvimTreeToggle<CR>')
|
||||
|
||||
-- ToggleTerm
|
||||
map('n', '<S-t>', ':ToggleTerm<CR>')
|
||||
map('t', '<S-t>', '<C-\\><C-n>:ToggleTerm<CR>')
|
||||
map('n', '<C-t>', ':ToggleTerm<CR>')
|
||||
map('t', '<C-t>', '<C-\\><C-n>:ToggleTerm<CR>')
|
||||
|
||||
--[[ -- Pane navigation
|
||||
map('n', '<C-h>', ':wincmd h<CR>')
|
||||
|
@ -144,3 +145,11 @@ map('n', '<Space>bw', '<Cmd>BufferOrderByWindowNumber<CR>', barbar_opts)
|
|||
-- Other:
|
||||
-- :BarbarEnable - enables barbar (enabled by default)
|
||||
-- :BarbarDisable - very bad command, should never be used
|
||||
|
||||
|
||||
-- Disable arrow keys
|
||||
local arrows = {'<Up>', '<Down>', '<Left>', '<Right>'}
|
||||
for i=1,#arrows do
|
||||
map('n', arrows[i], function () end)
|
||||
map('i', arrows[i], function () end)
|
||||
end
|
||||
|
|
|
@ -172,6 +172,15 @@ require("packer").startup(function()
|
|||
end
|
||||
}
|
||||
|
||||
-- Markdown Stuff
|
||||
use({ 'jakewvincent/mkdnflow.nvim',
|
||||
rocks = 'luautf8', -- Ensures optional luautf8 dependency is installed
|
||||
config = function()
|
||||
require('mkdnflow').setup({})
|
||||
end
|
||||
})
|
||||
|
||||
|
||||
-- Automatically set up configuration after cloning packer.nvim
|
||||
if packer_bootstrap then
|
||||
require("packer").sync()
|
||||
|
|
Loading…
Reference in a new issue