diff --git a/lua/plugins/bufferline.lua b/lua/plugins/bufferline.lua deleted file mode 100755 index f362692..0000000 --- a/lua/plugins/bufferline.lua +++ /dev/null @@ -1,73 +0,0 @@ - local bufferline = require('bufferline') - bufferline.setup { - options = { - mode = "buffers", -- set to "tabs" to only show tabpages instead - style_preset = bufferline.style_preset.default, -- or bufferline.style_preset.minimal, - themable = true, -- allows highlight groups to be overriden i.e. sets highlights as default - numbers = "none" , - close_command = "bdelete! %d", -- can be a string | function, | false see "Mouse actions" - right_mouse_command = "bdelete! %d", -- can be a string | function | false, see "Mouse actions" - left_mouse_command = "buffer %d", -- can be a string | function, | false see "Mouse actions" - middle_mouse_command = nil, -- can be a string | function, | false see "Mouse actions" - indicator = { - icon = '/', -- this should be omitted if indicator style is not 'icon' - style = 'icon' , - }, - buffer_close_icon = '󰅖', - modified_icon = '●', - close_icon = '', - left_trunc_marker = '', - right_trunc_marker = '', - --- name_formatter can be used to change the buffer's label in the bufferline. - --- Please note some names can/will break the - --- bufferline so use this at your discretion knowing that it has - --- some limitations that will *NOT* be fixed. - max_name_length = 25, - max_prefix_length = 15, -- prefix used when a buffer is de-duplicated - truncate_names = true, -- whether or not tab names should be truncated - tab_size = 25, - diagnostics = false, - diagnostics_update_in_insert = false, - -- The diagnostics indicator can be set to nil to keep the buffer name highlight but delete the highlighting - -- NOTE: this will be called a lot so don't do any heavy processing here - offsets = { - { - filetype = "NvimTree", - text = "File Explorer" , - text_align = "center", - separator = true - } - }, - color_icons = true , -- whether or not to add the filetype icon highlights - get_element_icon = function(element) - -- element consists of {filetype: string, path: string, extension: string, directory: string} - -- This can be used to change how bufferline fetches the icon - -- for an element e.g. a buffer or a tab. - -- e.g. - local icon, hl = require('nvim-web-devicons').get_icon_by_filetype(element.filetype, { default = false }) - return icon, hl - -- or - end, - show_buffer_icons = true , -- disable filetype icons for buffers - show_buffer_close_icons = true , - show_close_icon = true , - show_tab_indicators = true , - show_duplicate_prefix = true , -- whether to show duplicate buffer prefix - persist_buffer_sort = true, -- whether or not custom sorted buffers should persist - move_wraps_at_ends = false, -- whether or not the move command "wraps" at the first or last position - -- can also be a table containing 2 custom separators - -- [focused and unfocused]. eg: { '|', '|' } - separator_style = "thin" , - enforce_regular_tabs = false , - always_show_bufferline = true , - hover = { - enabled = true, - delay = 200, - reveal = {'close'} - }, - sort_by = 'insert_at_end', function(buffer_a, buffer_b) - -- add custom logic - return buffer_a.modified > buffer_b.modified - end - } - } diff --git a/lua/plugins/fterm.lua b/lua/plugins/fterm.lua deleted file mode 100644 index 5dc3641..0000000 --- a/lua/plugins/fterm.lua +++ /dev/null @@ -1,63 +0,0 @@ -require('FTerm').setup({ - ---Filetype of the terminal buffer - ---@type string - ft = 'FTerm', - - ---Command to run inside the terminal - ---NOTE: if given string[], it will skip the shell and directly executes the command - ---@type fun():(string|string[])|string|string[] - cmd = os.getenv('SHELL'), - - ---Neovim's native window border. See `:h nvim_open_win` for more configuration options. - border = 'single', - - ---Close the terminal as soon as shell/command exits. - ---Disabling this will mimic the native terminal behaviour. - ---@type boolean - auto_close = false, - - ---Highlight group for the terminal. See `:h winhl` - ---@type string - hl = 'Normal', - - ---Transparency of the floating window. See `:h winblend` - ---@type integer - blend = 0, - - ---Object containing the terminal window dimensions. - ---The value for each field should be between `0` and `1` - ---@type table - dimensions = { - height = 0.8, -- Height of the terminal window - width = 0.8, -- Width of the terminal window - x = 0.5, -- X axis of the terminal window - y = 0.5, -- Y axis of the terminal window - }, - - ---Replace instead of extend the current environment with `env`. - ---See `:h jobstart-options` - ---@type boolean - clear_env = false, - - ---Map of environment variables extending the current environment. - ---See `:h jobstart-options` - ---@type table|nil - env = nil, - - ---Callback invoked when the terminal exits. - ---See `:h jobstart-options` - ---@type fun()|nil - on_exit = nil, - - ---Callback invoked when the terminal emits stdout data. - ---See `:h jobstart-options` - ---@type fun()|nil - on_stdout = nil, - - ---Callback invoked when the terminal emits stderr data. - ---See `:h jobstart-options` - ---@type fun()|nil - on_stderr = nil, -}) - - diff --git a/lua/plugins/init.lua b/lua/plugins/init.lua index 4fd225e..fc276c0 100755 --- a/lua/plugins/init.lua +++ b/lua/plugins/init.lua @@ -1,12 +1,12 @@ require("plugins.lazy") -require("plugins.harpoon") -require("plugins.treesitter") -require("plugins.lsp-zero") require("plugins.devicons") -require("plugins.lualine") -require("plugins.hlblocks") require("plugins.gitsigns") -require("plugins.wilder") +require("plugins.harpoon") +require("plugins.hlblocks") +require("plugins.lsp-zero") +require("plugins.lualine") require("plugins.mini") require("plugins.oil") require("plugins.telescope") +require("plugins.treesitter") +require("plugins.wilder") diff --git a/lua/plugins/lazy.lua b/lua/plugins/lazy.lua index d48af8b..a213ec5 100755 --- a/lua/plugins/lazy.lua +++ b/lua/plugins/lazy.lua @@ -1,114 +1,115 @@ local lazypath = vim.fn.stdpath('data') .. '/lazy/lazy.nvim' if not vim.loop.fs_stat(lazypath) then - vim.fn.system({ - 'git', - 'clone', - '--filter=blob:none', - 'https://github.com/folke/lazy.nvim.git', - '--branch=stable', -- latest stable release - lazypath, - }) + vim.fn.system({ + 'git', + 'clone', + '--filter=blob:none', + 'https://github.com/folke/lazy.nvim.git', + '--branch=stable', -- latest stable release + lazypath, + }) end vim.opt.rtp:prepend(lazypath) - require('lazy').setup({ - 'EdenEast/nightfox.nvim', - 'luckasRanarison/tree-sitter-hypr', + 'EdenEast/nightfox.nvim', + 'luckasRanarison/tree-sitter-hypr', - 'lambdalisue/nerdfont.vim', - 'gelguy/wilder.nvim', + 'lambdalisue/nerdfont.vim', + 'gelguy/wilder.nvim', - 'bkad/camelcasemotion', - 'lewis6991/gitsigns.nvim', + 'bkad/camelcasemotion', + 'lewis6991/gitsigns.nvim', - { - 'nvim-telescope/telescope.nvim', - tag = '0.1.8', - dependencies = { - 'nvim-lua/plenary.nvim' - } - }, - - { - 'stevearc/oil.nvim', - dependencies = { - 'nvim-tree/nvim-web-devicons' + { + 'nvim-telescope/telescope.nvim', + tag = '0.1.8', + dependencies = { + 'nvim-lua/plenary.nvim' + } }, - }, - { - 'kylechui/nvim-surround', - version = '*', -- Use for stability; omit to use `main` branch for the latest features - config = function() - require('nvim-surround').setup() - end - }, - - { - 'OXY2DEV/markview.nvim', - config = function() - require('markview').setup() - end - }, - - { - 'shellRaining/hlchunk.nvim', - event = { - 'UIEnter' + { + 'stevearc/oil.nvim', + dependencies = { + 'nvim-tree/nvim-web-devicons' + }, }, - }, - { - 'ThePrimeagen/harpoon', - branch = 'harpoon2', - dependencies = { - 'nvim-lua/plenary.nvim' - } - }, + { + 'kylechui/nvim-surround', + version = '*', -- Use for stability; omit to use `main` branch for the latest features + config = function() + require('nvim-surround').setup() + end + }, - { - 'nvim-lualine/lualine.nvim', - dependencies = - { - 'nvim-tree/nvim-web-devicons', - opt = true - } - }, + { + 'OXY2DEV/markview.nvim', + config = function() + require('markview').setup() + end, + dependencies = { + -- You may not need this if you don't lazy load + -- Or if the parsers are in your $RUNTIMEPATH + "nvim-treesitter/nvim-treesitter", - { - 'nvim-treesitter/nvim-treesitter', - build = ':TSUpdate' - }, + "nvim-tree/nvim-web-devicons" + }, + }, - { - 'VonHeikemen/lsp-zero.nvim', - branch = 'v3.x', - dependencies = { - -- LSP Support - {'neovim/nvim-lspconfig'}, -- Required - {'williamboman/mason.nvim'}, -- Optional - {'williamboman/mason-lspconfig.nvim'}, -- Optional + { + 'shellRaining/hlchunk.nvim', + event = { + 'UIEnter' + }, + }, - -- Autocompletion - {'hrsh7th/nvim-cmp'}, -- Required - {'hrsh7th/cmp-nvim-lsp'}, -- Required - {'L3MON4D3/LuaSnip'}, -- Required - } - }, + { + 'ThePrimeagen/harpoon', + branch = 'harpoon2', + dependencies = { + 'nvim-lua/plenary.nvim' + } + }, - { - 'echasnovski/mini.nvim', - version = false - }, + { + 'nvim-lualine/lualine.nvim', + dependencies = + { + 'nvim-tree/nvim-web-devicons', + opt = true + } + }, + + { + 'nvim-treesitter/nvim-treesitter', + build = ':TSUpdate' + }, + + { + 'VonHeikemen/lsp-zero.nvim', + branch = 'v3.x', + dependencies = { + -- LSP Support + 'neovim/nvim-lspconfig', + 'williamboman/mason.nvim', + 'williamboman/mason-lspconfig.nvim', + + -- Autocompletion + 'hrsh7th/nvim-cmp', + 'hrsh7th/cmp-nvim-lsp', + 'L3MON4D3/LuaSnip', + } + }, + + { + 'echasnovski/mini.nvim', + version = false + }, }) - - vim.opt.laststatus=2 - --- vim.keymap.set('i', '', [[pumvisible() ? '\' : '\']], { expr = true }) --- vim.keymap.set('i', '', [[pumvisible() ? '\' : '\']], { expr = true }) diff --git a/lua/plugins/nvimtree.lua b/lua/plugins/nvimtree.lua deleted file mode 100755 index ea0a54b..0000000 --- a/lua/plugins/nvimtree.lua +++ /dev/null @@ -1,23 +0,0 @@ --- disable netrw at the very start of your init.lua -vim.g.loaded_netrw = 1 -vim.g.loaded_netrwPlugin = 1 - --- set termguicolors to enable highlight groups -vim.opt.termguicolors = true - --- empty setup using defaults -require("nvim-tree").setup() - --- OR setup with some options -require("nvim-tree").setup({ - sort_by = "case_sensitive", - view = { - width = 30, - }, - renderer = { - group_empty = true, - }, - filters = { - dotfiles = true, - }, -})