diff --git a/init.lua b/init.lua index de273068..b1d1ee8a 100644 --- a/init.lua +++ b/init.lua @@ -227,9 +227,6 @@ require('lazy').setup({ -- -- For additional information see: https://github.com/folke/lazy.nvim#-structuring-your-plugins { import = 'custom.plugins' }, - { - 'skywind3000/vim-quickui', - } }, {}) -- [[ Setting options ]] @@ -249,7 +246,9 @@ vim.wo.list = true vim.wo.listchars = "tab:»·,trail:·,extends:>,precedes:<,nbsp:." vim.wo.colorcolumn = '120' vim.wo.wrap = false - +vim.opt.cmdheight = 3 +vim.opt.ignorecase = true +vim.opt.showtabline = 2 -- Enable mouse mode vim.o.mouse = 'a' @@ -274,7 +273,7 @@ vim.wo.signcolumn = 'yes' -- Decrease update time vim.o.updatetime = 250 -vim.o.timeoutlen = 300 +vim.o.timeoutlen = 200 -- Set completeopt to have a better completion experience vim.o.completeopt = 'menuone,noselect' @@ -630,23 +629,32 @@ cmp.setup { } vim.cmd [[ - call quickui#menu#install('&Plugins', [ + call quickui#menu#install('&Window', [ \ ['&Neotree', ':Neotree'], - \ ['&VSP', ':vsp'], - \ ['&SP', ':sp'], + \ ['&Vertical split', ':vsp'], + \ ['&Horizontal split', ':sp'], \ ]) ]] vim.cmd [[ - call quickui#menu#install('&IDE', [ - \ ['&TabNew', ':tabnew'], - \ ['&TabNext', ':tabnext'], - \ ['&TabPrev', ':tabprev'], + call quickui#menu#install('&Tabs', [ + \ ['&New', ':tabnew'], + \ ['Nex&t', ':tabnext'], + \ ['&Prev', ':tabprev'], + \ ['&Close', ':tabc'], + \ ]) +]] + +vim.cmd [[ + call quickui#menu#install('&Commands', [ + \ ['Re&source Neovim config', ':source %'], \ ]) ]] + vim.api.nvim_set_keymap('n', 'm', ':call quickui#menu#open()', { noremap = true }) vim.cmd([[ let g:quickui_color_scheme = 'papercol_dark' ]]) +vim.g.quickui_color_scheme = 'gruvbox' -- The line beneath this is called `modeline`. See `:help modeline` -- vim: ts=2 sts=2 sw=2 et diff --git a/lazy-lock.json b/lazy-lock.json index af2d89de..10f9a80a 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,6 +1,7 @@ { "Comment.nvim": { "branch": "master", "commit": "0236521ea582747b58869cb72f70ccfa967d2e89" }, "LuaSnip": { "branch": "master", "commit": "954c81b53989097faaff0fabc11c29575288c3e1" }, + "barbecue": { "branch": "main", "commit": "cd7e7da622d68136e13721865b4d919efd6325ed" }, "cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, @@ -12,15 +13,21 @@ "lualine.nvim": { "branch": "master", "commit": "2248ef254d0a1488a72041cfb45ca9caada6d994" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "9453e3d6cd2ca45d96e20f343e8f1b927364b630" }, "mason.nvim": { "branch": "main", "commit": "41e75af1f578e55ba050c863587cffde3556ffa6" }, + "neo-tree.nvim": { "branch": "v3.x", "commit": "230ff118613fa07138ba579b89d13ec2201530b9" }, "neodev.nvim": { "branch": "main", "commit": "c4ce017bd4bacf60bf59330cec9e93c5d5e104a6" }, + "nui.nvim": { "branch": "main", "commit": "c9b4de623d19a85b353ff70d2ae9c77143abe69c" }, + "nvim-autopairs": { "branch": "master", "commit": "0f04d78619cce9a5af4f355968040f7d675854a1" }, "nvim-cmp": { "branch": "main", "commit": "41d7633e4146dce1072de32cea31ee31b056a131" }, "nvim-lspconfig": { "branch": "master", "commit": "f451052bd6804e9e5ccd0ac874d7df8d3d4c55b9" }, + "nvim-navic": { "branch": "master", "commit": "8649f694d3e76ee10c19255dece6411c29206a54" }, "nvim-treesitter": { "branch": "master", "commit": "78d75bce03f218ee30aedb6e24e3ec1189a3e9ff" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "ec1c5bdb3d87ac971749fa6c7dbc2b14884f1f6a" }, + "nvim-web-devicons": { "branch": "master", "commit": "8b2e5ef9eb8a717221bd96cb8422686d65a09ed5" }, "onedark.nvim": { "branch": "master", "commit": "c5476a091b0f1b4e853db91c91ff941f848a1cdd" }, "plenary.nvim": { "branch": "master", "commit": "55d9fe89e33efd26f532ef20223e5f9430c8b0c0" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "6c921ca12321edaa773e324ef64ea301a1d0da62" }, "telescope.nvim": { "branch": "0.1.x", "commit": "d90956833d7c27e73c621a61f20b29fdb7122709" }, + "vim-be-good": { "branch": "master", "commit": "c290810728a4f75e334b07dc0f3a4cdea908d351" }, "vim-fugitive": { "branch": "master", "commit": "46eaf8918b347906789df296143117774e827616" }, "vim-quickui": { "branch": "master", "commit": "4c6ff1250f5d0d62a8b2f373d2dcb667e1fdc5ee" }, "vim-rhubarb": { "branch": "master", "commit": "ee69335de176d9325267b0fd2597a22901d927b1" }, diff --git a/lua/custom/plugins/barbecue.lua b/lua/custom/plugins/barbecue.lua new file mode 100644 index 00000000..9fbbec3e --- /dev/null +++ b/lua/custom/plugins/barbecue.lua @@ -0,0 +1,12 @@ +return { + "utilyre/barbecue.nvim", + name = "barbecue", + version = "*", + dependencies = { + "SmiteshP/nvim-navic", + "nvim-tree/nvim-web-devicons", -- optional dependency + }, + opts = { + -- configurations go here + }, +} diff --git a/lua/custom/plugins/filetree.lua b/lua/custom/plugins/filetree.lua index 2c990b91..386b681d 100644 --- a/lua/custom/plugins/filetree.lua +++ b/lua/custom/plugins/filetree.lua @@ -1,5 +1,3 @@ --- Unless you are still migrating, remove the deprecated commands from v1.x - return { "nvim-neo-tree/neo-tree.nvim", version = "*", @@ -9,6 +7,13 @@ return { "MunifTanjim/nui.nvim", }, config = function () - require('neo-tree').setup {} + require('neo-tree').setup { + filesystem = { + filtered_items = { + visible = true, -- This is what you want: If you set this to `true`, all "hide" just mean "dimmed out" + hide_dotfiles = false, + hide_gitignored = false, + } + }} end, } diff --git a/lua/custom/plugins/navic.lua b/lua/custom/plugins/navic.lua new file mode 100644 index 00000000..28ac407b --- /dev/null +++ b/lua/custom/plugins/navic.lua @@ -0,0 +1,3 @@ +return { + "SmiteshP/nvim-navic" +} diff --git a/lua/custom/plugins/quickui.lua b/lua/custom/plugins/quickui.lua new file mode 100644 index 00000000..88c67bb2 --- /dev/null +++ b/lua/custom/plugins/quickui.lua @@ -0,0 +1,4 @@ +return { + 'skywind3000/vim-quickui', + } + diff --git a/lua/custom/plugins/vimbegood.lua b/lua/custom/plugins/vimbegood.lua new file mode 100644 index 00000000..dc7524fe --- /dev/null +++ b/lua/custom/plugins/vimbegood.lua @@ -0,0 +1 @@ +return {'ThePrimeagen/vim-be-good'}