mirror of
https://github.com/WarrenHood/dotfiles.git
synced 2025-04-29 23:04:59 +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
|
program: /bin/zsh
|
||||||
args:
|
args:
|
||||||
- -l
|
- -l
|
||||||
|
# - -c
|
||||||
|
# - "tmux attach || tmux"
|
||||||
|
|
||||||
# Startup directory
|
# Startup directory
|
||||||
#
|
#
|
||||||
# Directory the shell is started in. If this is unset, or `None`, the working
|
# Directory the shell is started in. If this is unset, or `None`, the working
|
||||||
|
|
|
@ -21,8 +21,20 @@ cmp.setup({
|
||||||
["<C-Space>"] = cmp.mapping.complete(),
|
["<C-Space>"] = cmp.mapping.complete(),
|
||||||
["<C-e>"] = cmp.mapping.abort(),
|
["<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.
|
["<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),
|
["<Tab>"] = cmp.mapping(function(fallback)
|
||||||
["<S-Tab>"] = cmp.mapping(function() if cmp.visible() then cmp.select_prev_item() end end),
|
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({
|
sources = cmp.config.sources({
|
||||||
{ name = "nvim_lsp" },
|
{ name = "nvim_lsp" },
|
||||||
|
|
|
@ -17,6 +17,7 @@ map('i', '<C-S>', '<ESC>:w<CR>')
|
||||||
-- Telescope
|
-- Telescope
|
||||||
local telescope_builtin = require('telescope.builtin')
|
local telescope_builtin = require('telescope.builtin')
|
||||||
map('n', '<leader>ff', telescope_builtin.find_files, { desc = 'Find Files' })
|
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>fg', telescope_builtin.live_grep, { desc = 'Live Grep' })
|
||||||
map('n', '<leader>fb', telescope_builtin.buffers, { desc = 'Find Buffers' })
|
map('n', '<leader>fb', telescope_builtin.buffers, { desc = 'Find Buffers' })
|
||||||
map('n', '<leader>fh', telescope_builtin.help_tags, { desc = 'Help Tags' })
|
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>')
|
map('n', '<C-B>', ':NvimTreeToggle<CR>')
|
||||||
|
|
||||||
-- ToggleTerm
|
-- ToggleTerm
|
||||||
map('n', '<S-t>', ':ToggleTerm<CR>')
|
map('n', '<C-t>', ':ToggleTerm<CR>')
|
||||||
map('t', '<S-t>', '<C-\\><C-n>:ToggleTerm<CR>')
|
map('t', '<C-t>', '<C-\\><C-n>:ToggleTerm<CR>')
|
||||||
|
|
||||||
--[[ -- Pane navigation
|
--[[ -- Pane navigation
|
||||||
map('n', '<C-h>', ':wincmd h<CR>')
|
map('n', '<C-h>', ':wincmd h<CR>')
|
||||||
|
@ -144,3 +145,11 @@ map('n', '<Space>bw', '<Cmd>BufferOrderByWindowNumber<CR>', barbar_opts)
|
||||||
-- Other:
|
-- Other:
|
||||||
-- :BarbarEnable - enables barbar (enabled by default)
|
-- :BarbarEnable - enables barbar (enabled by default)
|
||||||
-- :BarbarDisable - very bad command, should never be used
|
-- :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
|
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
|
-- Automatically set up configuration after cloning packer.nvim
|
||||||
if packer_bootstrap then
|
if packer_bootstrap then
|
||||||
require("packer").sync()
|
require("packer").sync()
|
||||||
|
|
Loading…
Reference in a new issue