diff --git a/.config/nvim/after/plugin/flash.lua b/.config/nvim/after/plugin/flash.lua new file mode 100644 index 0000000..b1c750e --- /dev/null +++ b/.config/nvim/after/plugin/flash.lua @@ -0,0 +1,3 @@ +vim.keymap.set("n", "ls", function() require("flash").jump() end) +vim.keymap.set("n", "lr", function() require("flash").treesitter() end) +vim.keymap.set("n", "lt", function() require("flash").treesitter_search() end) diff --git a/.config/nvim/after/plugin/lualine.lua b/.config/nvim/after/plugin/lualine.lua new file mode 100644 index 0000000..64f3470 --- /dev/null +++ b/.config/nvim/after/plugin/lualine.lua @@ -0,0 +1,41 @@ +require('lualine').setup { + options = { + icons_enabled = true, + theme = 'auto', + component_separators = { left = '', right = '' }, + section_separators = { left = '', right = '' }, + disabled_filetypes = { + statusline = {"NvimTree"}, + winbar = {"NvimTree"}, + }, + ignore_focus = {}, + always_divide_middle = true, + globalstatus = false, + refresh = { + statusline = 10, + tabline = 1000, + winbar = 1000, + } + }, + sections = { + lualine_a = { 'mode' }, + lualine_b = { 'branch', 'diff', 'diagnostics' }, + lualine_c = { 'filename' }, + lualine_x = { 'encoding', 'filesize', 'filetype' }, + -- lualine_x = { 'hostname', 'fileformat', 'encoding', 'filesize', 'filetype' }, + lualine_y = { 'progress' }, + lualine_z = { 'selectioncount', 'location' } + }, + inactive_sections = { + lualine_a = {}, + lualine_b = {}, + lualine_c = { 'filename' }, + lualine_x = { 'location' }, + lualine_y = {}, + lualine_z = {} + }, + tabline = {}, + winbar = {}, + inactive_winbar = {}, + extensions = {} +} diff --git a/.config/nvim/after/plugin/nvim-tree.lua b/.config/nvim/after/plugin/nvim-tree.lua index 6ffeef9..6606c96 100644 --- a/.config/nvim/after/plugin/nvim-tree.lua +++ b/.config/nvim/after/plugin/nvim-tree.lua @@ -16,6 +16,8 @@ require("nvim-tree").setup({ }, filters = { dotfiles = false, + -- don't hide gitignored files + git_ignored = false, }, }) diff --git a/.config/nvim/lua/tiagorg/packer.lua b/.config/nvim/lua/tiagorg/packer.lua index c06d1e0..60c2bec 100644 --- a/.config/nvim/lua/tiagorg/packer.lua +++ b/.config/nvim/lua/tiagorg/packer.lua @@ -16,9 +16,9 @@ return require('packer').startup(function(use) use({ 'rose-pine/neovim', as = 'rose-pine', - config = function() - vim.cmd('colorscheme rose-pine') - end + --config = function() + -- vim.cmd('colorscheme rose-pine') + --end }) use { "loctvl842/monokai-pro.nvim", @@ -30,16 +30,10 @@ return require('packer').startup(function(use) use('nvim-treesitter/nvim-treesitter', { run = ':TSUpdate' }) use('theprimeagen/harpoon') use('mbbill/undotree') - use('tpope/vim-fugitive') use('wakatime/vim-wakatime') use('andweeb/presence.nvim') use('m4xshen/autoclose.nvim') - use({ - "andrewferrier/wrapping.nvim", - config = function() - require("wrapping").setup() - end, - }) + use("andrewferrier/wrapping.nvim") use "lukas-reineke/indent-blankline.nvim" use { 'VonHeikemen/lsp-zero.nvim', @@ -82,4 +76,22 @@ return require('packer').startup(function(use) use 'lewis6991/gitsigns.nvim' -- OPTIONAL: for git status use 'romgrk/barbar.nvim' use { "akinsho/toggleterm.nvim", tag = '*' } + use 'folke/flash.nvim' + use({ + 'numToStr/Comment.nvim', + require('Comment').setup() + }) + use({ + "kylechui/nvim-surround", + tag = "*", -- Use for stability; omit to use `main` branch for the latest features + config = function() + require("nvim-surround").setup({ + -- Configuration here, or leave empty to use defaults + }) + end + }) + use { + 'nvim-lualine/lualine.nvim', + requires = { 'nvim-tree/nvim-web-devicons', opt = true }, + } end) diff --git a/.config/nvim/lua/tiagorg/remap.lua b/.config/nvim/lua/tiagorg/remap.lua index ad28e60..4ccf6d0 100644 --- a/.config/nvim/lua/tiagorg/remap.lua +++ b/.config/nvim/lua/tiagorg/remap.lua @@ -29,7 +29,7 @@ vim.keymap.set("n", "", "cprevzz") vim.keymap.set("n", "k", "lnextzz") vim.keymap.set("n", "j", "lprevzz") -vim.keymap.set("n", "s", [[:%s/\<\>//gI]]) +vim.keymap.set("n", "r", [[:%s/\<\>//gI]]) vim.keymap.set("n", "x", "!chmod +x %", { silent = true }) vim.keymap.set("n", "X", "!chmod -x %", { silent = true }) diff --git a/.config/nvim/plugin/packer_compiled.lua b/.config/nvim/plugin/packer_compiled.lua index f710561..dd5513e 100644 --- a/.config/nvim/plugin/packer_compiled.lua +++ b/.config/nvim/plugin/packer_compiled.lua @@ -49,8 +49,8 @@ local function save_profiles(threshold) end time([[Luarocks path setup]], true) -local package_path_str = "/home/tiagorg/.cache/nvim/packer_hererocks/2.1.1697887905/share/lua/5.1/?.lua;/home/tiagorg/.cache/nvim/packer_hererocks/2.1.1697887905/share/lua/5.1/?/init.lua;/home/tiagorg/.cache/nvim/packer_hererocks/2.1.1697887905/lib/luarocks/rocks-5.1/?.lua;/home/tiagorg/.cache/nvim/packer_hererocks/2.1.1697887905/lib/luarocks/rocks-5.1/?/init.lua" -local install_cpath_pattern = "/home/tiagorg/.cache/nvim/packer_hererocks/2.1.1697887905/lib/lua/5.1/?.so" +local package_path_str = "/home/tiagorg/.cache/nvim/packer_hererocks/2.1.1699392533/share/lua/5.1/?.lua;/home/tiagorg/.cache/nvim/packer_hererocks/2.1.1699392533/share/lua/5.1/?/init.lua;/home/tiagorg/.cache/nvim/packer_hererocks/2.1.1699392533/lib/luarocks/rocks-5.1/?.lua;/home/tiagorg/.cache/nvim/packer_hererocks/2.1.1699392533/lib/luarocks/rocks-5.1/?/init.lua" +local install_cpath_pattern = "/home/tiagorg/.cache/nvim/packer_hererocks/2.1.1699392533/lib/lua/5.1/?.so" if not string.find(package.path, package_path_str, 1, true) then package.path = package.path .. ';' .. package_path_str end @@ -74,6 +74,11 @@ end time([[try_loadstring definition]], false) time([[Defining packer_plugins]], true) _G.packer_plugins = { + ["Comment.nvim"] = { + loaded = true, + path = "/home/tiagorg/.local/share/nvim/site/pack/packer/start/Comment.nvim", + url = "https://github.com/numToStr/Comment.nvim" + }, LuaSnip = { loaded = true, path = "/home/tiagorg/.local/share/nvim/site/pack/packer/start/LuaSnip", @@ -114,6 +119,11 @@ _G.packer_plugins = { path = "/home/tiagorg/.local/share/nvim/site/pack/packer/start/cmp_luasnip", url = "https://github.com/saadparwaiz1/cmp_luasnip" }, + ["flash.nvim"] = { + loaded = true, + path = "/home/tiagorg/.local/share/nvim/site/pack/packer/start/flash.nvim", + url = "https://github.com/folke/flash.nvim" + }, ["friendly-snippets"] = { loaded = true, path = "/home/tiagorg/.local/share/nvim/site/pack/packer/start/friendly-snippets", @@ -139,6 +149,11 @@ _G.packer_plugins = { path = "/home/tiagorg/.local/share/nvim/site/pack/packer/start/lsp-zero.nvim", url = "https://github.com/VonHeikemen/lsp-zero.nvim" }, + ["lualine.nvim"] = { + loaded = true, + path = "/home/tiagorg/.local/share/nvim/site/pack/packer/start/lualine.nvim", + url = "https://github.com/nvim-lualine/lualine.nvim" + }, ["mason-lspconfig.nvim"] = { loaded = true, path = "/home/tiagorg/.local/share/nvim/site/pack/packer/start/mason-lspconfig.nvim", @@ -165,6 +180,12 @@ _G.packer_plugins = { path = "/home/tiagorg/.local/share/nvim/site/pack/packer/start/nvim-lspconfig", url = "https://github.com/neovim/nvim-lspconfig" }, + ["nvim-surround"] = { + config = { "\27LJ\2\n?\0\0\3\0\3\0\a6\0\0\0'\2\1\0B\0\2\0029\0\2\0004\2\0\0B\0\2\1K\0\1\0\nsetup\18nvim-surround\frequire\0" }, + loaded = true, + path = "/home/tiagorg/.local/share/nvim/site/pack/packer/start/nvim-surround", + url = "https://github.com/kylechui/nvim-surround" + }, ["nvim-tree.lua"] = { loaded = true, path = "/home/tiagorg/.local/share/nvim/site/pack/packer/start/nvim-tree.lua", @@ -196,7 +217,6 @@ _G.packer_plugins = { url = "https://github.com/andweeb/presence.nvim" }, ["rose-pine"] = { - config = { "\27LJ\2\n9\0\0\3\0\3\0\0056\0\0\0009\0\1\0'\2\2\0B\0\2\1K\0\1\0\26colorscheme rose-pine\bcmd\bvim\0" }, loaded = true, path = "/home/tiagorg/.local/share/nvim/site/pack/packer/start/rose-pine", url = "https://github.com/rose-pine/neovim" @@ -222,18 +242,12 @@ _G.packer_plugins = { path = "/home/tiagorg/.local/share/nvim/site/pack/packer/start/undotree", url = "https://github.com/mbbill/undotree" }, - ["vim-fugitive"] = { - loaded = true, - path = "/home/tiagorg/.local/share/nvim/site/pack/packer/start/vim-fugitive", - url = "https://github.com/tpope/vim-fugitive" - }, ["vim-wakatime"] = { loaded = true, path = "/home/tiagorg/.local/share/nvim/site/pack/packer/start/vim-wakatime", url = "https://github.com/wakatime/vim-wakatime" }, ["wrapping.nvim"] = { - config = { "\27LJ\2\n6\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\rwrapping\frequire\0" }, loaded = true, path = "/home/tiagorg/.local/share/nvim/site/pack/packer/start/wrapping.nvim", url = "https://github.com/andrewferrier/wrapping.nvim" @@ -241,22 +255,18 @@ _G.packer_plugins = { } time([[Defining packer_plugins]], false) --- Config for: monokai-pro.nvim -time([[Config for monokai-pro.nvim]], true) -try_loadstring("\27LJ\2\n9\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\16monokai-pro\frequire\0", "config", "monokai-pro.nvim") -time([[Config for monokai-pro.nvim]], false) -- Config for: tabset.nvim time([[Config for tabset.nvim]], true) try_loadstring("\27LJ\2\n4\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\vtabset\frequire\0", "config", "tabset.nvim") time([[Config for tabset.nvim]], false) --- Config for: wrapping.nvim -time([[Config for wrapping.nvim]], true) -try_loadstring("\27LJ\2\n6\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\rwrapping\frequire\0", "config", "wrapping.nvim") -time([[Config for wrapping.nvim]], false) --- Config for: rose-pine -time([[Config for rose-pine]], true) -try_loadstring("\27LJ\2\n9\0\0\3\0\3\0\0056\0\0\0009\0\1\0'\2\2\0B\0\2\1K\0\1\0\26colorscheme rose-pine\bcmd\bvim\0", "config", "rose-pine") -time([[Config for rose-pine]], false) +-- Config for: monokai-pro.nvim +time([[Config for monokai-pro.nvim]], true) +try_loadstring("\27LJ\2\n9\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\16monokai-pro\frequire\0", "config", "monokai-pro.nvim") +time([[Config for monokai-pro.nvim]], false) +-- Config for: nvim-surround +time([[Config for nvim-surround]], true) +try_loadstring("\27LJ\2\n?\0\0\3\0\3\0\a6\0\0\0'\2\1\0B\0\2\0029\0\2\0004\2\0\0B\0\2\1K\0\1\0\nsetup\18nvim-surround\frequire\0", "config", "nvim-surround") +time([[Config for nvim-surround]], false) _G._packer.inside_compile = false if _G._packer.needs_bufread == true then