diff --git a/alacritty/.alacritty.yml b/alacritty/.alacritty.yml index cc045b0..486a339 100644 --- a/alacritty/.alacritty.yml +++ b/alacritty/.alacritty.yml @@ -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 diff --git a/neovim/.config/nvim/lua/warrenhood/cmp-config.lua b/neovim/.config/nvim/lua/warrenhood/cmp-config.lua index 95095d8..820031e 100644 --- a/neovim/.config/nvim/lua/warrenhood/cmp-config.lua +++ b/neovim/.config/nvim/lua/warrenhood/cmp-config.lua @@ -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({ - [""] = cmp.mapping.scroll_docs(-4), - [""] = cmp.mapping.scroll_docs(4), + -- completion = cmp.config.window.bordered(), + -- documentation = cmp.config.window.bordered(), + }, + mapping = cmp.mapping.preset.insert({ + [""] = cmp.mapping.scroll_docs(-4), + [""] = cmp.mapping.scroll_docs(4), - [""] = cmp.mapping.complete(), - [""] = cmp.mapping.abort(), - [""] = cmp.mapping.confirm({ select = true }), -- Accept currently selected item. Set `select` to `false` to only confirm explicitly selected items. - [""] = cmp.mapping(function() if cmp.visible() then cmp.select_next_item() end end), - [""] = 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" }, - }), + [""] = cmp.mapping.complete(), + [""] = cmp.mapping.abort(), + [""] = cmp.mapping.confirm({ select = true }), -- Accept currently selected item. Set `select` to `false` to only confirm explicitly selected items. + [""] = cmp.mapping(function(fallback) + if cmp.visible() then + cmp.select_next_item() + else + fallback() + end + end), + [""] = 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" }, + }), }) diff --git a/neovim/.config/nvim/lua/warrenhood/keybinds.lua b/neovim/.config/nvim/lua/warrenhood/keybinds.lua index a61b584..1b5be3f 100644 --- a/neovim/.config/nvim/lua/warrenhood/keybinds.lua +++ b/neovim/.config/nvim/lua/warrenhood/keybinds.lua @@ -17,6 +17,7 @@ map('i', '', ':w') -- Telescope local telescope_builtin = require('telescope.builtin') map('n', 'ff', telescope_builtin.find_files, { desc = 'Find Files' }) +map('n', 'fF', ":Telescope find_files hidden=true", { desc = 'Find Files (including hidden)' }) map('n', 'fg', telescope_builtin.live_grep, { desc = 'Live Grep' }) map('n', 'fb', telescope_builtin.buffers, { desc = 'Find Buffers' }) map('n', 'fh', telescope_builtin.help_tags, { desc = 'Help Tags' }) @@ -25,8 +26,8 @@ map('n', 'fh', telescope_builtin.help_tags, { desc = 'Help Tags' }) map('n', '', ':NvimTreeToggle') -- ToggleTerm -map('n', '', ':ToggleTerm') -map('t', '', ':ToggleTerm') +map('n', '', ':ToggleTerm') +map('t', '', ':ToggleTerm') --[[ -- Pane navigation map('n', '', ':wincmd h') @@ -144,3 +145,11 @@ map('n', 'bw', 'BufferOrderByWindowNumber', barbar_opts) -- Other: -- :BarbarEnable - enables barbar (enabled by default) -- :BarbarDisable - very bad command, should never be used + + +-- Disable arrow keys +local arrows = {'', '', '', ''} +for i=1,#arrows do + map('n', arrows[i], function () end) + map('i', arrows[i], function () end) +end diff --git a/neovim/.config/nvim/lua/warrenhood/plugins.lua b/neovim/.config/nvim/lua/warrenhood/plugins.lua index 1093707..4b7c1f7 100644 --- a/neovim/.config/nvim/lua/warrenhood/plugins.lua +++ b/neovim/.config/nvim/lua/warrenhood/plugins.lua @@ -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()