lualine instead of barbar for buffers

after/plugin/barbar.lua

@@ -1,50 +1,53 @@
-local map = vim.api.nvim_set_keymap
-local opts = { noremap = true, silent = true }
 
--- Move to previous/next
+local enable = false
-map('n', '<A-,>', '<Cmd>BufferPrevious<CR>', opts)
+if (enable) then
-map('n', '<A-.>', '<Cmd>BufferNext<CR>', opts)
--- Re-order to previous/next
-map('n', '<A-<>', '<Cmd>BufferMovePrevious<CR>', opts)
-map('n', '<A->>', '<Cmd>BufferMoveNext<CR>', opts)
--- Goto buffer in position...
-map('n', '<A-1>', '<Cmd>BufferGoto 1<CR>', opts)
-map('n', '<A-2>', '<Cmd>BufferGoto 2<CR>', opts)
-map('n', '<A-3>', '<Cmd>BufferGoto 3<CR>', opts)
-map('n', '<A-4>', '<Cmd>BufferGoto 4<CR>', opts)
-map('n', '<A-5>', '<Cmd>BufferGoto 5<CR>', opts)
-map('n', '<A-6>', '<Cmd>BufferGoto 6<CR>', opts)
-map('n', '<A-7>', '<Cmd>BufferGoto 7<CR>', opts)
-map('n', '<A-8>', '<Cmd>BufferGoto 8<CR>', opts)
-map('n', '<A-9>', '<Cmd>BufferGoto 9<CR>', opts)
-map('n', '<A-0>', '<Cmd>BufferLast<CR>', opts)
--- Pin/unpin buffer
-map('n', '<A-p>', '<Cmd>BufferPin<CR>', opts)
--- Close buffer
-map('n', '<A-c>', '<Cmd>BufferClose<CR>', opts)
--- Wipeout buffer
---                 :BufferWipeout
--- Close commands
---                 :BufferCloseAllButCurrent
---                 :BufferCloseAllButPinned
---                 :BufferCloseAllButCurrentOrPinned
---                 :BufferCloseBuffersLeft
---                 :BufferCloseBuffersRight
--- Magic buffer-picking mode
-map('n', '<C-p>', '<Cmd>BufferPick<CR>', opts)
--- Sort automatically by...
-map('n', '<Space>bb', '<Cmd>BufferOrderByBufferNumber<CR>', opts)
-map('n', '<Space>bn', '<Cmd>BufferOrderByName<CR>', opts)
-map('n', '<Space>bd', '<Cmd>BufferOrderByDirectory<CR>', opts)
-map('n', '<Space>bl', '<Cmd>BufferOrderByLanguage<CR>', opts)
-map('n', '<Space>bw', '<Cmd>BufferOrderByWindowNumber<CR>', opts)
 
--- Other:
+    local map = vim.api.nvim_set_keymap
--- :BarbarEnable - enables barbar (enabled by default)
+    local opts = { noremap = true, silent = true }
--- :BarbarDisable - very bad command, should never be used
 
+    -- Move to previous/next
+    map('n', '<A-,>', '<Cmd>BufferPrevious<CR>', opts)
+    map('n', '<A-.>', '<Cmd>BufferNext<CR>', opts)
+    -- Re-order to previous/next
+    map('n', '<A-<>', '<Cmd>BufferMovePrevious<CR>', opts)
+    map('n', '<A->>', '<Cmd>BufferMoveNext<CR>', opts)
+    -- Goto buffer in position...
+    map('n', '<A-1>', '<Cmd>BufferGoto 1<CR>', opts)
+    map('n', '<A-2>', '<Cmd>BufferGoto 2<CR>', opts)
+    map('n', '<A-3>', '<Cmd>BufferGoto 3<CR>', opts)
+    map('n', '<A-4>', '<Cmd>BufferGoto 4<CR>', opts)
+    map('n', '<A-5>', '<Cmd>BufferGoto 5<CR>', opts)
+    map('n', '<A-6>', '<Cmd>BufferGoto 6<CR>', opts)
+    map('n', '<A-7>', '<Cmd>BufferGoto 7<CR>', opts)
+    map('n', '<A-8>', '<Cmd>BufferGoto 8<CR>', opts)
+    map('n', '<A-9>', '<Cmd>BufferGoto 9<CR>', opts)
+    map('n', '<A-0>', '<Cmd>BufferLast<CR>', opts)
+    -- Pin/unpin buffer
+    map('n', '<A-p>', '<Cmd>BufferPin<CR>', opts)
+    -- Close buffer
+    map('n', '<A-c>', '<Cmd>BufferClose<CR>', opts)
+    -- Wipeout buffer
+    --                 :BufferWipeout
+    -- Close commands
+    --                 :BufferCloseAllButCurrent
+    --                 :BufferCloseAllButPinned
+    --                 :BufferCloseAllButCurrentOrPinned
+    --                 :BufferCloseBuffersLeft
+    --                 :BufferCloseBuffersRight
+    -- Magic buffer-picking mode
+    map('n', '<C-p>', '<Cmd>BufferPick<CR>', opts)
+    -- Sort automatically by...
+    map('n', '<Space>bb', '<Cmd>BufferOrderByBufferNumber<CR>', opts)
+    map('n', '<Space>bn', '<Cmd>BufferOrderByName<CR>', opts)
+    map('n', '<Space>bd', '<Cmd>BufferOrderByDirectory<CR>', opts)
+    map('n', '<Space>bl', '<Cmd>BufferOrderByLanguage<CR>', opts)
+    map('n', '<Space>bw', '<Cmd>BufferOrderByWindowNumber<CR>', opts)
 
-require'barbar'.setup {
+    -- Other:
+    -- :BarbarEnable - enables barbar (enabled by default)
+    -- :BarbarDisable - very bad command, should never be used
+
+    require'barbar'.setup {
         -- WARN: do not copy everything below into your config!
         --       It is just an example of what configuration options there are.
         --       The defaults are suitable for most people.
@@ -177,4 +180,5 @@ require'barbar'.setup {
         -- Sets the name of unnamed buffers. By default format is "[Buffer X]"
         -- where X is the buffer number. But only a static string is accepted here.
         no_name_title = nil,
-}
+    }
+end

after/plugin/lualine.lua

@@ -1,10 +1,34 @@
 
+local map = vim.api.nvim_set_keymap
+local opts = { noremap = true, silent = true }
+
+-- Move to previous/next
+map('n', '<A-,>', '<Cmd>bnext<CR>', opts)
+map('n', '<A-.>', '<Cmd>bprevious<CR>', opts)
+-- Re-order to previous/next
+--map('n', '<A-<>', '<Cmd>BufferMovePrevious<CR>', opts)
+--map('n', '<A->>', '<Cmd>BufferMoveNext<CR>', opts)
+-- Goto buffer in position...
+map('n', '<A-1>', '<Cmd>LualineBuffersJump! 1<CR>', opts)
+map('n', '<A-2>', '<Cmd>LualineBuffersJump! 2<CR>', opts)
+map('n', '<A-3>', '<Cmd>LualineBuffersJump! 3<CR>', opts)
+map('n', '<A-4>', '<Cmd>LualineBuffersJump! 4<CR>', opts)
+map('n', '<A-5>', '<Cmd>LualineBuffersJump! 5<CR>', opts)
+map('n', '<A-6>', '<Cmd>LualineBuffersJump! 6<CR>', opts)
+map('n', '<A-7>', '<Cmd>LualineBuffersJump! 7<CR>', opts)
+map('n', '<A-8>', '<Cmd>LualineBuffersJump! 8<CR>', opts)
+map('n', '<A-9>', '<Cmd>LualineBuffersJump! 9<CR>', opts)
+map('n', '<A-0>', '<Cmd>BufferLast<CR>', opts)
+-- Pin/unpin buffer
+--map('n', '<A-p>', '<Cmd>BufferPin<CR>', opts)
+-- Close buffer
+map('n', '<A-c>', '<Cmd>bdelete<CR>', opts)
+
 local colors = {
     white = "#cccccc",
     grey = "#303030",
     black = "#080808"
 }
-
 local custom = require'lualine.themes.palenight'
 
 custom.normal.c.fg = colors.white
@@ -27,6 +51,63 @@ require('lualine').setup {
           statusline = 1000,
           tabline = 1000,
           winbar = 1000,
+        },
+    },
+    tabline = {
+        lualine_a =
+        {
+            {
+              'buffers',
+              show_filename_only = true,   -- Shows shortened relative path when set to false.
+              hide_filename_extension = false,   -- Hide filename extension when set to true.
+              show_modified_status = true, -- Shows indicator when the buffer is modified.
+
+              mode = 2, -- 0: Shows buffer name
+                        -- 1: Shows buffer index
+                        -- 2: Shows buffer name + buffer index
+                        -- 3: Shows buffer number
+                        -- 4: Shows buffer name + buffer number
+
+              max_length = vim.o.columns,
+
+              filetype_names = {
+                netrw = 'netrw',
+                TelescopePrompt = 'Telescope',
+                dashboard = 'Dashboard',
+                packer = 'Packer',
+                fzf = 'FZF',
+                alpha = 'Alpha'
+              }, -- Shows specific buffer name for that filetype ( { `filetype` = `buffer_name`, ... } )
+
+              -- Automatically updates active buffer color to match color of other components (will be overidden if buffers_color is set)
+              use_mode_colors = true,
+
+              buffers_color = {
+                active = {
+                    --fg = '#ffffff',
+                    --bg = '#0000ff',
+                    gui = 'bold'
+                  },
+                  inactive = {
+                    fg = colors.white,
+                    bg = colors.grey,
+                    gui = 'bold'
+                  },
+              },
+
+              symbols = {
+                modified = ' ●',      -- Text to show when the buffer is modified
+                alternate_file = '#', -- Text to show to identify the alternate file
+                directory =  '',     -- Text to show when the buffer is a directory
+              },
             }
         },
+        lualine_b = {},
+        lualine_c = {},
+        lualine_x = {},
+        lualine_y = {},
+        lualine_z = {'tabs'}
+    }
 }
+
+

lazy-lock.json

@@ -1,34 +1,35 @@
 {
-  "LuaSnip": { "branch": "master", "commit": "b152822e1a4bafb6bdf11a16cc26525cbd95ee00" },
+  "LuaSnip": { "branch": "master", "commit": "7ad2eaeaca56d6ed63acacbfc114b99f1f67b982" },
-  "barbar.nvim": { "branch": "master", "commit": "79f7d16578a167bdf5355725551ef7d90613a601" },
+  "barbar.nvim": { "branch": "master", "commit": "53b5a2f34b68875898f0531032fbf090e3952ad7" },
   "cmp-look": { "branch": "master", "commit": "971e65a6be0e75c3438fe7b176d4fc020cb89d7b" },
-  "cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" },
+  "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" },
-  "conform.nvim": { "branch": "master", "commit": "6dc1603ea408f476a57937bbeaf7f86520a21a98" },
+  "conform.nvim": { "branch": "master", "commit": "62eba813b7501b39612146cbf29cd07f1d4ac29c" },
   "cutlass.nvim": { "branch": "main", "commit": "1ac7e4b53d79410be52a9e464d44c60556282b3e" },
   "flatten.nvim": { "branch": "main", "commit": "e420e531d2ab24aebcf7b3c9fca28e6c5c34964d" },
-  "fzf-lua": { "branch": "main", "commit": "9c953dfa7650191d892800333d187f3439e01afd" },
+  "fzf-lua": { "branch": "main", "commit": "1ac27d5734ccd057ef2b46a8644022913f37b89e" },
-  "gitsigns.nvim": { "branch": "main", "commit": "bcae8395fb1033ed0340dd00d61b3bf050b1bd8e" },
+  "gitsigns.nvim": { "branch": "main", "commit": "562dc47189ad3c8696dbf460d38603a74d544849" },
   "harpoon": { "branch": "master", "commit": "ccae1b9bec717ae284906b0bf83d720e59d12b91" },
   "instant.nvim": { "branch": "master", "commit": "294b6d08143b3db8f9db7f606829270149e1a786" },
-  "lazy.nvim": { "branch": "main", "commit": "d3974346b6cef2116c8e7b08423256a834cb7cbc" },
+  "lazy.nvim": { "branch": "main", "commit": "077102c5bfc578693f12377846d427f49bc50076" },
-  "lsp-zero.nvim": { "branch": "v3.x", "commit": "d1114ca5ff28ffcd0bc2a3fdd4c13019b1c41812" },
+  "lsp-zero.nvim": { "branch": "v3.x", "commit": "56db3d5ce5476b183783160e6045f7337ba12b83" },
-  "lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" },
+  "lualine.nvim": { "branch": "master", "commit": "b431d228b7bbcdaea818bdc3e25b8cdbe861f056" },
   "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" },
-  "mason-lspconfig.nvim": { "branch": "main", "commit": "05744f0f1967b5757bd05c08df4271ab8ec990aa" },
+  "mason-lspconfig.nvim": { "branch": "main", "commit": "482350b050bd413931c2cdd4857443c3da7d57cb" },
-  "mason.nvim": { "branch": "main", "commit": "751b1fcbf3d3b783fcf8d48865264a9bcd8f9b10" },
+  "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" },
-  "neovim": { "branch": "main", "commit": "17b466e79479758b332a3cac12544a3ad2be6241" },
+  "neovim": { "branch": "main", "commit": "256d086c218a282ae5de79d2c091b1e592a65367" },
-  "nvim-autopairs": { "branch": "master", "commit": "14e97371b2aab6ee70054c1070a123dfaa3e217e" },
+  "nvim-autopairs": { "branch": "master", "commit": "19606af7c039271d5aa96bceff101e7523af3136" },
-  "nvim-cmp": { "branch": "main", "commit": "cd2cf0c124d3de577fb5449746568ee8e601afc8" },
+  "nvim-cmp": { "branch": "main", "commit": "ae644feb7b67bf1ce4260c231d1d4300b19c6f30" },
-  "nvim-lspconfig": { "branch": "master", "commit": "a3d9395455f2b2e3b50a0b0f37b8b4c23683f44a" },
+  "nvim-lspconfig": { "branch": "master", "commit": "911167921d49cd5c1c9b2436031d0da3945e787f" },
-  "nvim-possession": { "branch": "main", "commit": "253e52fe26f2816acae68e7e0ced9d89adf3f85a" },
+  "nvim-possession": { "branch": "main", "commit": "0844f6d21b358f748b4d753c91ec767517aca447" },
-  "nvim-treesitter": { "branch": "master", "commit": "1be5aa99e3e0e4a36c31fa7066dcf46a4e0142dd" },
+  "nvim-treesitter": { "branch": "master", "commit": "bef7ec6f7a01ba0717da73082e33c224bdc2ddcc" },
-  "nvim-web-devicons": { "branch": "master", "commit": "5b9067899ee6a2538891573500e8fd6ff008440f" },
+  "nvim-web-devicons": { "branch": "master", "commit": "3722e3d1fb5fe1896a104eb489e8f8651260b520" },
-  "plenary.nvim": { "branch": "master", "commit": "08e301982b9a057110ede7a735dd1b5285eb341f" },
+  "pkl-neovim": { "branch": "main", "commit": "a0ae099c7eb926150ee0a126b1dd78086edbe3fc" },
-  "telescope-file-browser.nvim": { "branch": "master", "commit": "4d5fd21bae12ee6e9a79232e1c377f43c419d0c5" },
+  "plenary.nvim": { "branch": "master", "commit": "ec289423a1693aeae6cd0d503bac2856af74edaa" },
-  "telescope.nvim": { "branch": "master", "commit": "fac83a556e7b710dc31433dec727361ca062dbe9" },
+  "telescope-file-browser.nvim": { "branch": "master", "commit": "a46780830b576049c675680650f773bedfa8677a" },
+  "telescope.nvim": { "branch": "master", "commit": "5972437de807c3bc101565175da66a1aa4f8707a" },
   "undotree": { "branch": "master", "commit": "56c684a805fe948936cda0d1b19505b84ad7e065" },
-  "vim-fugitive": { "branch": "master", "commit": "ce882460cf3db12e99f8bf579cbf99e331f6dd4f" },
+  "vim-fugitive": { "branch": "master", "commit": "0444df68cd1cdabc7453d6bd84099458327e5513" },
   "vim-vinegar": { "branch": "master", "commit": "bb1bcddf43cfebe05eb565a84ab069b357d0b3d6" },
   "wilder.nvim": { "branch": "master", "commit": "679f348dc90d80ff9ba0e7c470c40a4d038dcecf" },
-  "wrapping.nvim": { "branch": "master", "commit": "d1ac69c0db82ff0c7540088a0f91d74ad7378c3d" }
+  "wrapping.nvim": { "branch": "master", "commit": "3a823200c297885b70515fa8d974e1763c578e26" }
 }

lua/juliuswaldmann/lazynvim.lua

@@ -43,6 +43,7 @@ return lazy.setup({
             })
         end
     },
+    "apple/pkl-neovim",
 
     -- Other useful plugins
     'theprimeagen/harpoon',
@@ -149,20 +150,20 @@ return lazy.setup({
       lazy = false,
       priority = 1001,
     },
-    {'romgrk/barbar.nvim',
+    --{'romgrk/barbar.nvim',
-        dependencies = {
+    --  dependencies = {
-          'lewis6991/gitsigns.nvim', -- OPTIONAL: for git status
+    --    'lewis6991/gitsigns.nvim', -- OPTIONAL: for git status
-          'nvim-tree/nvim-web-devicons', -- OPTIONAL: for file icons
+    --    'nvim-tree/nvim-web-devicons', -- OPTIONAL: for file icons
-        },
+    --  },
-        init = function() vim.g.barbar_auto_setup = false end,
+    --  init = function() vim.g.barbar_auto_setup = false end,
-        opts = {
+    --  opts = {
-          -- lazy.nvim will automatically call setup for you. put your options here, anything missing will use the default:
+    --    -- lazy.nvim will automatically call setup for you. put your options here, anything missing will use the default:
-          -- animation = true,
+    --    -- animation = true,
-          -- insert_at_start = true,
+    --    -- insert_at_start = true,
-          -- …etc.
+    --    -- …etc.
-        },
+    --  },
-        version = '^1.0.0', -- optional: only update when a new 1.x version is released
+    --  version = '^1.0.0', -- optional: only update when a new 1.x version is released
-      },
+    --},
     {
       dir = "~/Documents/code/here.nvim",
       name = "here",