diff --git a/.github/README.md b/.github/README.md index 484c102..4285aa8 100644 --- a/.github/README.md +++ b/.github/README.md @@ -32,7 +32,7 @@ ## Showcase <img src="https://github.com/NvChad/nvchad.github.io/blob/src/static/img/screenshots/dashboard.png"> -<img src="https://cdn.discordapp.com/attachments/610012460828852229/853933487295299584/unknown.png"> +<img src="https://github.com/NvChad/nvchad.github.io/blob/src/static/img/screenshots/main2.png"> ( Zoom in the screenshot ) @@ -67,45 +67,42 @@ Fast file tree: -<kbd><img src="https://raw.githubusercontent.com/siduck/dotfiles/all/rice%20flex/nvimtree.png"></kbd><hr> +<kbd><img src="https://github.com/NvChad/nvchad.github.io/blob/src/static/img/features/nvimtree.png"></kbd><hr> <h3> Telescope-nvim </h3> A fuzzy file finder, picker, sorter, previewer and much more: -<kbd><img src="https://raw.githubusercontent.com/siduck/dotfiles/all/rice%20flex/tel.png"></kbd> +<kbd><img src="https://github.com/NvChad/nvchad.github.io/blob/src/static/img/features/tel.png"></kbd><hr> <h3> Indent-blankline.nvim </h3> Adds indentline: -<kbd><img src="https://raw.githubusercontent.com/siduck/dotfiles/all/rice%20flex/blanklineNvim.png"></kbd><hr> +<kbd><img src="https://github.com/NvChad/nvchad.github.io/blob/src/static/img/features/blanklineNvim.png"></kbd><hr> -<h3> Feline.nvim </h3> +<h3> Our own statusline written from scratch </h3> -Highly configurable statusline plugin: +[link](https://github.com/NvChad/NvChad/blob/main/lua/ui/statusline.lua) -<kbd><img src="https://raw.githubusercontent.com/siduck/dotfiles/all/rice%20flex/statusline.png"></kbd><hr> +<kbd><img src="https://github.com/NvChad/nvchad.github.io/blob/src/static/img/features/statusline.png"></kbd><hr> +<kbd><img src="https://github.com/NvChad/nvchad.github.io/blob/src/static/img/features/statusline_modes.png"></kbd><hr> <h3> Nvim-bufferline.lua </h3> -Better tab implementation: +A snazzy bufferline for Neovim -<kbd><img src="https://raw.githubusercontent.com/siduck/dotfiles/all/rice%20flex/bufferline.png"></kbd><hr> +<kbd><img src="https://github.com/NvChad/nvchad.github.io/blob/src/static/img/features/bufferline.png"></kbd><hr> <h3> Nvim-web-devicons </h3> Lua fork of Vim Devicons which offers more file icon customisability: -<kbd><img src="https://raw.githubusercontent.com/siduck/dotfiles/all/rice%20flex/image.png"></kbd><hr> +<kbd><img src="https://github.com/NvChad/nvchad.github.io/blob/src/static/img/features/devicons.png"></kbd><hr> <h3> Nvim-treesitter </h3 -Better syntax highlighting for programming languages (NvChad by default comes with Lua/bash treesitter parsers). - -Without/with Treesitter: - -<kbd><img src="https://raw.githubusercontent.com/siduck/dotfiles/all/rice%20flex/woTree.png"></kbd><hr> +NeoVim Treesitter configurations and abstraction layer. We mostly use this for syntax highlighting. The pretty syntax highlighting you see in all of our screenshots has gotten possible due to treesitter </details> @@ -117,7 +114,6 @@ Without/with Treesitter: - File navigation with [nvim-tree.lua](https://github.com/kyazdani42/nvim-tree.lua) - Managing tabs, buffers with [bufferline.nvim](https://github.com/akinsho/bufferline.nvim) - Beautiful and configurable icons with [nvim-web-devicons](https://github.com/kyazdani42/nvim-web-devicons) -- Pretty and functional statusline with [feline.nvim](https://github.com/Famiu/feline.nvim) - Git diffs and more with [gitsigns.nvim](https://github.com/lewis6991/gitsigns.nvim) - NeoVim Lsp configuration with [nvim-lspconfig](https://github.com/neovim/nvim-lspconfig) and [lsp-installer](https://github.com/williamboman/nvim-lsp-installer/) - Autocompletion with [nvim-cmp](https://github.com/hrsh7th/nvim-cmp) diff --git a/lua/core/default_config.lua b/lua/core/default_config.lua index f34f4e2..2562dfb 100644 --- a/lua/core/default_config.lua +++ b/lua/core/default_config.lua @@ -35,6 +35,7 @@ M.plugins = { }, statusline = { separator_style = "default", -- default/round/block + config = "%!v:lua.require'ui.statusline'.run()", }, }, diff --git a/lua/core/init.lua b/lua/core/init.lua index a4cc556..3d6df8c 100644 --- a/lua/core/init.lua +++ b/lua/core/init.lua @@ -22,6 +22,3 @@ autocmd('BufEnter', { pattern = '*', command = 'set fo-=c fo-=r fo-=o' }) - --- load statusline -vim.opt.statusline = "%!v:lua.require'ui.statusline'.run()" diff --git a/lua/core/options.lua b/lua/core/options.lua index dce5fcf..6b20277 100644 --- a/lua/core/options.lua +++ b/lua/core/options.lua @@ -12,7 +12,11 @@ g.toggle_theme_icon = " " g.transparency = config.ui.transparency opt.confirm = true + opt.laststatus = 3 -- global statusline +opt.statusline = config.plugins.options.statusline.config +opt.showmode = false + opt.title = true opt.clipboard = "unnamedplus" opt.cmdheight = 1 diff --git a/lua/ui/statusline.lua b/lua/ui/statusline.lua index 71fa0f8..963f804 100644 --- a/lua/ui/statusline.lua +++ b/lua/ui/statusline.lua @@ -152,14 +152,14 @@ M.LSP_status = function() end M.cwd = function() - local left_sep = "%#ST_EmptySpace2#" .. sep_l .. "%#St_cwd_sep#" .. sep_l - local dir_icon = "%#St_cwd_icon#" .. " " + local left_sep = "%#St_cwd_sep#" .. sep_l + local dir_icon = "%#St_cwd_icon#" .. " " local dir_name = "%#St_cwd_text#" .. " " .. fn.fnamemodify(fn.getcwd(), ":t") .. " " return (vim.o.columns > 120 and left_sep .. dir_icon .. dir_name) or "" end M.cursor_position = function() - local left_sep = "%#ST_EmptySpace#" .. sep_l .. "%#St_pos_sep#" .. sep_l + local left_sep = "%#St_pos_sep#" .. sep_l local icon = "%#St_pos_icon#" .. " " local current_line = fn.line "."