changed bufferline to heirline

lua/keys.lua

@@ -14,6 +14,10 @@ vim.api.nvim_set_keymap("", "q:", "<Nop>", {silent = true})
 vim.api.nvim_set_keymap("n", "<leader>h", "<Plug>RestNvim", {silent = true})
 vim.api.nvim_set_keymap("n", "<leader><cr>", ":terminal<cr>i", {silent = true})
 vim.api.nvim_set_keymap("t", "<Esc>", "<C-\\><C-n>", {silent = true, noremap = true})
+vim.api.nvim_set_keymap("", "<A-Left>", "<C-w><Left>", {silent = true})
+vim.api.nvim_set_keymap("", "<A-Up>", "<C-w><Up>", {silent = true})
+vim.api.nvim_set_keymap("", "<A-Down>", "<C-w><Down>", {silent = true})
+vim.api.nvim_set_keymap("", "<A-Right>", "<C-w><Right>", {silent = true})
 
 function _G.toggle_venn()
   local venn_enabled = vim.inspect(vim.b.venn_enabled)

lua/plugins.lua

@@ -50,21 +50,6 @@ return require("packer").startup(
       requires = {"kyazdani42/nvim-web-devicons", opt = true}
     }
     use "JoosepAlviste/nvim-ts-context-commentstring"
-    use {
-      "b3nj5m1n/kommentary",
-      config = function()
-        require("kommentary.config").configure_language(
-          "typescriptreact",
-          {
-            single_line_comment_string = "auto",
-            multi_line_comment_strings = "auto",
-            hook_function = function()
-              require("ts_context_commentstring.internal").update_commentstring()
-            end
-          }
-        )
-      end
-    }
     use {
       "nvim-treesitter/playground",
       requires = {"nvim-treesitter/nvim-treesitter"}
@@ -93,7 +78,7 @@ return require("packer").startup(
         require "nvim-treesitter.configs".setup {
           context_commentstring = {
             enable = true,
-            enable_autocmd = true
+            enable_autocmd = false
           },
           highlight = {
             enable = true
@@ -115,6 +100,17 @@ return require("packer").startup(
         "windwp/nvim-autopairs"
       }
     }
+    use {
+      "numToStr/Comment.nvim",
+      config = function()
+        require("Comment").setup {
+          pre_hook = require("ts_context_commentstring.integrations.comment_nvim").create_pre_hook(),
+          mappings = {
+            basic = true
+          }
+        }
+      end
+    }
     use {
       "mhartington/formatter.nvim",
       config = function()
@@ -166,13 +162,13 @@ return require("packer").startup(
         require "plugins/diffview"
       end
     }
-    use {
+    -- use {
-      "akinsho/bufferline.nvim",
+    --   "akinsho/bufferline.nvim",
-      config = function()
+    --   config = function()
-        require "plugins/bufferline"
+    --     require "plugins/bufferline"
-      end,
+    --   end,
-      requires = "kyazdani42/nvim-web-devicons"
+    --   requires = "kyazdani42/nvim-web-devicons"
-    }
+    -- }
     use {
       "vuki656/package-info.nvim",
       config = function()

lua/plugins/cmp.lua

@@ -51,7 +51,8 @@ local cmp_kinds = {
   Struct = "פּ ",
   Event = " ",
   Operator = " ",
-  TypeParameter = " "
+  TypeParameter = " ",
+  Copilot = " "
 }
 
 options = {

lua/plugins/heirline.lua

@@ -163,7 +163,7 @@ local FileFlags = {
         return ""
       end
     end,
-    hl = {fg = colors.orange, bg = colors.bg}
+    hl = {fg = colors.orange}
   }
 }
 
@@ -488,4 +488,267 @@ vim.api.nvim_create_autocmd(
   }
 )
 
-require "heirline".setup(StatusLines, WinBars)
+-- we redefine the filename component, as we probably only want the tail and not the relative path
+local TablineFileName = {
+  provider = function(self)
+    -- self.filename will be defined later, just keep looking at the example!
+    local filename = self.filename
+    filename = filename == "" and "[No Name]" or vim.fn.fnamemodify(filename, ":t")
+    return filename
+  end,
+  hl = function(self)
+    return {bold = self.is_active or self.is_visible, italic = true}
+  end
+}
+
+local TablineFileFlags = {
+  {
+    provider = function(self)
+      if vim.bo[self.bufnr].modified then
+        return " [+]"
+      end
+    end,
+    hl = {fg = colors.green}
+  },
+  {
+    provider = function(self)
+      if not vim.bo[self.bufnr].modifiable or vim.bo[self.bufnr].readonly then
+        return ""
+      end
+    end,
+    hl = {fg = "orange"}
+  }
+}
+
+local TablineDiagnostics = {
+  static = {
+    error_icon = " " .. vim.fn.sign_getdefined("DiagnosticSignError")[1].text,
+    warn_icon = " " .. vim.fn.sign_getdefined("DiagnosticSignWarn")[1].text,
+    info_icon = " " .. vim.fn.sign_getdefined("DiagnosticSignInfo")[1].text,
+    hint_icon = " " .. vim.fn.sign_getdefined("DiagnosticSignHint")[1].text
+  },
+  init = function(self)
+    self.errors = #vim.diagnostic.get(self.bufnr, {severity = vim.diagnostic.severity.ERROR})
+    self.warnings = #vim.diagnostic.get(self.bufnr, {severity = vim.diagnostic.severity.WARN})
+    self.hints = #vim.diagnostic.get(self.bufnr, {severity = vim.diagnostic.severity.HINT})
+    self.info = #vim.diagnostic.get(self.bufnr, {severity = vim.diagnostic.severity.INFO})
+  end,
+  {
+    provider = function(self)
+      return self.errors > 0 and (self.error_icon .. self.errors .. " ")
+    end,
+    hl = {fg = colors.diag.error}
+  },
+  {
+    provider = function(self)
+      return self.warnings > 0 and (self.warn_icon .. self.warnings .. " ")
+    end,
+    hl = {fg = colors.diag.warn}
+  },
+  {
+    provider = function(self)
+      return self.info > 0 and (self.info_icon .. self.info .. " ")
+    end,
+    hl = {fg = colors.diag.info}
+  },
+  {
+    provider = function(self)
+      return self.hints > 0 and (self.hint_icon .. self.hints)
+    end,
+    hl = {fg = colors.diag.hint}
+  }
+}
+
+local TablineFileIcon = {
+  init = function(self)
+    local filename = self.filename
+    local extension = vim.fn.fnamemodify(filename, ":e")
+    self.icon, self.icon_color = require("nvim-web-devicons").get_icon_color(filename, extension, {default = true})
+  end,
+  provider = function(self)
+    return self.icon and (" " .. self.icon .. " ")
+  end,
+  hl = function(self)
+    return {fg = self.icon_color}
+  end
+}
+
+-- Here the filename block finally comes together
+local TablineFileNameBlock = {
+  init = function(self)
+    self.filename = vim.api.nvim_buf_get_name(self.bufnr)
+  end,
+  hl = function(self)
+    if self.is_active then
+      return "TabLineSel"
+    else
+      return "TabLine"
+    end
+  end,
+  on_click = {
+    callback = function(_, minwid)
+      vim.api.nvim_win_set_buf(0, minwid)
+    end,
+    minwid = function(self)
+      return self.bufnr
+    end,
+    name = "heirline_tabline_buffer_callback"
+  },
+  TablineFileIcon,
+  TablineFileName,
+  TablineFileFlags,
+  TablineDiagnostics
+}
+
+-- a nice "x" button to close the buffer
+local TablineCloseButton = {
+  condition = function(self)
+    return not vim.bo[self.bufnr].modified
+  end,
+  {provider = " "},
+  {
+    provider = "",
+    hl = {fg = "gray"},
+    on_click = {
+      callback = function(_, minwid)
+        vim.api.nvim_buf_delete(minwid, {force = false})
+      end,
+      minwid = function(self)
+        return self.bufnr
+      end,
+      name = "heirline_tabline_close_buffer_callback"
+    }
+  }
+}
+
+-- The final touch!
+local TablineBufferBlock =
+  utils.surround(
+  {"", ""},
+  function(self)
+    if self.is_active then
+      return utils.get_highlight("TabLineSel").bg
+    else
+      return utils.get_highlight("TabLine").bg
+    end
+  end,
+  {TablineFileNameBlock, TablineCloseButton}
+)
+
+-- and here we go
+local BufferLine =
+  utils.make_buflist(
+  TablineBufferBlock,
+  {provider = "", hl = {fg = "gray"}}, -- left truncation, optional (defaults to "<")
+  {provider = "", hl = {fg = "gray"}} -- right trunctation, also optional (defaults to ...... yep, ">")
+  -- by the way, open a lot of buffers and try clicking them ;)
+)
+
+local TabLineOffset = {
+  condition = function(self)
+    local win = vim.api.nvim_tabpage_list_wins(0)[1]
+    local bufnr = vim.api.nvim_win_get_buf(win)
+    self.winid = win
+
+    if vim.bo[bufnr].filetype == "NvimTree" then
+      self.title = "NvimTree"
+      return true
+    -- elseif vim.bo[bufnr].filetype == "TagBar" then
+    --     ...
+    end
+  end,
+  provider = function(self)
+    local title = self.title
+    local width = vim.api.nvim_win_get_width(self.winid)
+    local pad = math.ceil((width - #title) / 2)
+    return string.rep(" ", pad) .. title .. string.rep(" ", pad)
+  end,
+  hl = function(self)
+    if vim.api.nvim_get_current_win() == self.winid then
+      return "TablineSel"
+    else
+      return "Tabline"
+    end
+  end
+}
+
+local Tabpage = {
+  provider = function(self)
+    return "%" .. self.tabnr .. "T " .. self.tabnr .. " %T"
+  end,
+  hl = function(self)
+    if not self.is_active then
+      return "TabLine"
+    else
+      return "TabLineSel"
+    end
+  end
+}
+
+local TabpageClose = {
+  provider = "%999X  %X",
+  hl = "TabLine"
+}
+
+local TabPages = {
+  -- only show this component if there's 2 or more tabpages
+  condition = function()
+    return #vim.api.nvim_list_tabpages() >= 2
+  end,
+  {provider = "%="},
+  utils.make_tablist(Tabpage),
+  TabpageClose
+}
+
+local TabLine = {TabLineOffset, BufferLine, TabPages}
+
+require "heirline".setup(StatusLines, WinBars, TabLine)
+
+vim.cmd([[au FileType * if index(['wipe', 'delete', 'unload'], &bufhidden) >= 0 | set nobuflisted | endif]])
+
+vim.api.nvim_create_augroup("Heirline", {clear = true})
+vim.api.nvim_create_autocmd(
+  "ColorScheme",
+  {
+    callback = function()
+      local colors = setup_colors()
+      utils.on_colorscheme(colors)
+    end,
+    group = "Heirline"
+  }
+)
+
+local function get_bufs()
+  return vim.tbl_filter(
+    function(bufnr)
+      return vim.api.nvim_buf_is_loaded(bufnr) and vim.bo[bufnr].buflisted
+    end,
+    vim.api.nvim_list_bufs()
+  )
+end
+
+local function goto_buf(index)
+  local bufs = get_bufs()
+  if index > #bufs then
+    index = #bufs
+  end
+  vim.api.nvim_win_set_buf(0, bufs[index])
+end
+
+print(vim.inspect(get_bufs()))
+
+local function addKey(key, index)
+  vim.keymap.set(
+    "",
+    "<A-" .. key .. ">",
+    function()
+      goto_buf(index)
+    end,
+    {noremap = true, silent = true}
+  )
+end
+
+for i = 1, 9 do
+  addKey(i, i)
+end
+addKey("0", 10)

lua/plugins/lsp.lua

@@ -119,7 +119,7 @@ require "lspconfig".eslint.setup {
   on_attach = on_attach,
   cmd = {"java-language-server"}
 } ]]
-local servers = {"pyright", "bashls", "clangd", "cssls", "texlab", "rust_analyzer", "prismals"}
+local servers = {"pyright", "bashls", "clangd", "cssls", "texlab", "prismals"}
 for _, lsp in ipairs(servers) do
   nvim_lsp[lsp].setup {
     on_attach = on_attach,
@@ -129,3 +129,29 @@ for _, lsp in ipairs(servers) do
     capabilities = capabilities
   }
 end
+
+nvim_lsp.rust_analyzer.setup {
+  on_attach = on_attach,
+  flags = {
+    debounce_text_changes = 150
+  },
+  capabilities = capabilities,
+  settings = {
+    ["rust-analyzer"] = {
+      imports = {
+        granularity = {
+          group = "module"
+        },
+        prefix = "crate"
+      },
+      cargo = {
+        buildScripts = {
+          enable = true
+        }
+      },
+      procMacro = {
+        enable = true
+      }
+    }
+  }
+}

lua/plugins/nvim-tree.lua

@@ -10,6 +10,8 @@ local tree_cb = require "nvim-tree.config".nvim_tree_callback
 -- default mappings
 require "nvim-tree".setup(
   {
+    auto_reload_on_write = true,
+    reload_on_bufenter = true,
     git = {
       enable = true,
       ignore = false,