From 6ef69e4c4a637614ade7a7ec36b387a832c8520f Mon Sep 17 00:00:00 2001 From: GlaDOS Date: Tue, 21 Nov 2023 23:43:08 +0100 Subject: [PATCH] nvim: statusline neotree bufferline --- nvim/init.lua | 72 ++++++++++++++++++++++++++++++++++----------- nvim/lazy-lock.json | 17 ++++++----- nvim/readme.md | 5 ++++ 3 files changed, 69 insertions(+), 25 deletions(-) create mode 100644 nvim/readme.md diff --git a/nvim/init.lua b/nvim/init.lua index 7b0960d..8a40333 100644 --- a/nvim/init.lua +++ b/nvim/init.lua @@ -1,4 +1,5 @@ local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim" + if not vim.loop.fs_stat(lazypath) then vim.fn.system({ "git", @@ -12,7 +13,6 @@ end vim.opt.rtp:prepend(lazypath) plugins = { - 'f-person/git-blame.nvim', { 'windwp/nvim-autopairs', event = 'InsertEnter', @@ -94,31 +94,66 @@ plugins = { dependencies = {{'nvim-tree/nvim-web-devicons'}} }, { - 'romgrk/barbar.nvim', - init = function() - vim.g.barbar_autosetup = false - require('barbar').setup { - auto_hide = 1 + 'akinsho/bufferline.nvim', + config = function () + require('bufferline').setup{ + options = { + separator_style = "thin", + indicator = { + style = "none" + }, + diagnostics = "nvim_lsp", + always_show_bufferline = false, + offsets = { + { + filetype = "neo-tree", + text = "Explorer", + highlight = "directory", + separator = false + } + } + } } end, dependencies = { - 'lewis6991/gitsigns.nvim', 'nvim-tree/nvim-web-devicons', }, }, { - 'NTBBloodbath/galaxyline.nvim', - config = function() require('galaxyline.themes.eviline') end, + 'nvim-lualine/lualine.nvim', + config = function() + require('lualine').setup { + options = { + disabled_filetypes = { + statusline = { + "neo-tree" + } + } + } + } + end, dependencies = {{'nvim-tree/nvim-web-devicons'}}, }, { 'nvim-neo-tree/neo-tree.nvim', branch = "v3.x", dependencies = { - 'nvim-lua/plenary.nvim', - 'nvim-tree/nvim-web-devicons', - 'MunifTanjim/nui.nvim' - } + {'nvim-lua/plenary.nvim'}, + {'nvim-tree/nvim-web-devicons'}, + {'MunifTanjim/nui.nvim'} + }, + config = function () + require("neo-tree").setup { + enable_git_status = true, + enable_diagnostics = true, + + filesystem = { + follow_current_file = { + enabled = true + } + } + } + end }, { "nvim-treesitter/nvim-treesitter", @@ -126,7 +161,7 @@ plugins = { config = function () local configs = require("nvim-treesitter.configs") configs.setup({ - ensure_installed = { "c", "rust", "lua", "vim", "vimdoc", "javascript", "html", "astro" }, + ensure_installed = { "c", "rust", "lua", "vim", "vimdoc", "markdown" , "javascript", "html", "astro" }, sync_install = false, highlight = { enable = true }, indent = { enable = true }, @@ -141,10 +176,13 @@ if vim.g.neovide == true then vim.api.nvim_set_keymap('n', "", ":let g:neovide_fullscreen = !g:neovide_fullscreen", {}) end -vim.opt.smarttab = true -vim.opt.expandtab = true +vim.opt.splitright = true +vim.opt.splitbelow = true vim.opt.shiftwidth = 2 vim.opt.cmdheight = 0 -vim.opt.guifont = "victor mono:h11" +vim.opt.guifont = "jetbrains mono:h11" vim.opt.termguicolors = true vim.wo.number = true +vim.opt.fillchars = { + vert = " " +} diff --git a/nvim/lazy-lock.json b/nvim/lazy-lock.json index b4ef5be..01899b4 100644 --- a/nvim/lazy-lock.json +++ b/nvim/lazy-lock.json @@ -1,21 +1,22 @@ { - "LuaSnip": { "branch": "master", "commit": "1f4ad8bb72bdeb60975e98652636b991a9b7475d" }, - "barbar.nvim": { "branch": "master", "commit": "283bceab39f549c5e5228212661750704fcfcd9e" }, + "LuaSnip": { "branch": "master", "commit": "cab667e2674881001a86a7478fff7dc7791c63f5" }, + "bufferline.nvim": { "branch": "main", "commit": "9e8d2f695dd50ab6821a6a53a840c32d2067a78a" }, "cmp-nvim-lsp": { "branch": "main", "commit": "44b16d11215dce86f253ce0c30949813c0a90765" }, "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, "dashboard-nvim": { "branch": "master", "commit": "63df28409d940f9cac0a925df09d3dc369db9841" }, "dracula.nvim": { "branch": "master", "commit": "2f396b6ba988ad4b3961c2e40d1b9ae436b8c26c" }, "friendly-snippets": { "branch": "main", "commit": "43727c2ff84240e55d4069ec3e6158d74cb534b6" }, - "galaxyline.nvim": { "branch": "main", "commit": "4d4f5fc8e20a10824117e5beea7ec6e445466a8f" }, "git-blame.nvim": { "branch": "master", "commit": "f07e913b7143f19edd6787229f2d51759b478600" }, - "gitsigns.nvim": { "branch": "main", "commit": "af0f583cd35286dd6f0e3ed52622728703237e50" }, - "indent-blankline.nvim": { "branch": "master", "commit": "29be0919b91fb59eca9e90690d76014233392bef" }, "lazy.nvim": { "branch": "main", "commit": "96584866b9c5e998cbae300594d0ccfd0c464627" }, + "lualine.nvim": { "branch": "master", "commit": "2248ef254d0a1488a72041cfb45ca9caada6d994" }, "mason.nvim": { "branch": "main", "commit": "41e75af1f578e55ba050c863587cffde3556ffa6" }, + "neo-tree.nvim": { "branch": "v3.x", "commit": "230ff118613fa07138ba579b89d13ec2201530b9" }, + "nui.nvim": { "branch": "main", "commit": "c0c8e347ceac53030f5c1ece1c5a5b6a17a25b32" }, "nvim-autopairs": { "branch": "master", "commit": "0f04d78619cce9a5af4f355968040f7d675854a1" }, "nvim-cmp": { "branch": "main", "commit": "0b751f6beef40fd47375eaf53d3057e0bfa317e4" }, - "nvim-lspconfig": { "branch": "master", "commit": "48347089666d5b77d054088aa72e4e0b58026e6e" }, - "nvim-treesitter": { "branch": "master", "commit": "c0da2013d1cef768c00f3f0b7f365fe19a10bca3" }, + "nvim-lspconfig": { "branch": "master", "commit": "addad5176dbbe8bcc82ef91c51c5f1bf6629ec2d" }, + "nvim-treesitter": { "branch": "master", "commit": "7da3cb6323d1e1fbfc4d7dc05cac74946458b8a0" }, "nvim-ts-autotag": { "branch": "main", "commit": "6be1192965df35f94b8ea6d323354f7dc7a557e4" }, - "nvim-web-devicons": { "branch": "master", "commit": "11eb26fc166742db8d1e8a6f5a7de9df37b09aae" } + "nvim-web-devicons": { "branch": "master", "commit": "cdbcca210cf3655aa9b31ebf2422763ecd85ee5c" }, + "plenary.nvim": { "branch": "master", "commit": "50012918b2fc8357b87cff2a7f7f0446e47da174" } } \ No newline at end of file diff --git a/nvim/readme.md b/nvim/readme.md new file mode 100644 index 0000000..b354892 --- /dev/null +++ b/nvim/readme.md @@ -0,0 +1,5 @@ +# nvim config thingy. + +* requirements + > base-devel, npm, pip, wl-clipboard +