feat(nvim): modify statusline and other stuff

dot_config/nvim/lazy-lock.json

@@ -40,6 +40,7 @@
   "nvim-dap-virtual-text": { "branch": "master", "commit": "7f7f2af549e72a0b7bddc3b4f827beb027ea8ce3" },
   "nvim-jdtls": { "branch": "master", "commit": "8fe3be1c08ab0bb55f2998fbc02f1a08f87a44bc" },
   "nvim-lspconfig": { "branch": "master", "commit": "1712672e4da3003a0dd9f771d30389600b360f42" },
+  "nvim-navic": { "branch": "master", "commit": "7e9d2b2b601149fecdccd11b516acb721e571fe6" },
   "nvim-surround": { "branch": "main", "commit": "90821ad682aac189cd0a38fd83fc96f0cbcc5d29" },
   "nvim-tree.lua": { "branch": "master", "commit": "8b8d457e07d279976a9baac6bbff5aa036afdc5f" },
   "nvim-treesitter": { "branch": "master", "commit": "ad9ae9e7def54fee446c3e186ed0a0d44cca7b90" },

dot_config/nvim/lua/extra/feline.lua

@@ -0,0 +1,529 @@
+local M = {}
+
+local C = require("catppuccin.palettes").get_palette()
+local lsp = require("feline.providers.lsp")
+local navic = require("nvim-navic")
+
+local assets = {
+  left_separator = "",
+  right_separator = "",
+  mode_icon = "",
+  dir = "",
+  file = "",
+  lsp = {
+    server = "",
+    error = "",
+    warning = "",
+    info = "",
+    hint = "",
+  },
+  git = {
+    branch = "",
+    added = "",
+    changed = "",
+    removed = "",
+  },
+}
+
+local sett = {
+  text = C.surface0,
+  bkg = C.surface0,
+  diffs = C.mauve,
+  extras = C.overlay1,
+  curr_file = C.maroon,
+  curr_dir = C.flamingo,
+  show_modified = false,
+}
+
+if require("catppuccin").options.transparent_background then
+  sett.bkg = "NONE"
+end
+
+local mode_colors = {
+  ["n"] = { "NORMAL", C.lavender },
+  ["no"] = { "N-PENDING", C.lavender },
+  ["i"] = { "INSERT", C.green },
+  ["ic"] = { "INSERT", C.green },
+  ["t"] = { "TERMINAL", C.green },
+  ["v"] = { "VISUAL", C.flamingo },
+  ["V"] = { "V-LINE", C.flamingo },
+  [""] = { "V-BLOCK", C.flamingo },
+  ["R"] = { "REPLACE", C.maroon },
+  ["Rv"] = { "V-REPLACE", C.maroon },
+  ["s"] = { "SELECT", C.maroon },
+  ["S"] = { "S-LINE", C.maroon },
+  [""] = { "S-BLOCK", C.maroon },
+  ["c"] = { "COMMAND", C.peach },
+  ["cv"] = { "COMMAND", C.peach },
+  ["ce"] = { "COMMAND", C.peach },
+  ["r"] = { "PROMPT", C.teal },
+  ["rm"] = { "MORE", C.teal },
+  ["r?"] = { "CONFIRM", C.mauve },
+  ["!"] = { "SHELL", C.green },
+}
+
+function M.setup(opts)
+  if opts then
+    opts.assets = opts.assets or {}
+    opts.sett = opts.sett or {}
+    opts.mode_colors = opts.mode_colors or {}
+  else
+    opts = {}
+  end
+  assets = vim.tbl_deep_extend("force", assets, opts.assets)
+  sett = vim.tbl_deep_extend("force", sett, opts.sett)
+  mode_colors = vim.tbl_deep_extend("force", mode_colors, opts.mode_colors)
+end
+
+function M.get()
+  local shortline = false
+
+  local components = {
+    active = { {}, {}, {} }, -- left, center, right
+    inactive = { {} },
+  }
+
+  local function is_enabled(min_width)
+    if shortline then
+      return true
+    end
+
+    return vim.api.nvim_win_get_width(0) > min_width
+  end
+
+  -- global components
+  local invi_sep = {
+    str = " ",
+    hl = {
+      fg = sett.bkg,
+      bg = sett.bkg,
+    },
+  }
+
+  -- helpers
+  local function has_git_head()
+    return vim.b.gitsigns_head ~= nil
+  end
+
+  local function any_git_changes()
+    local gst = vim.b.gitsigns_status_dict -- git stats
+    if gst then
+      if
+        gst["added"] and gst["added"] > 0
+        or gst["removed"] and gst["removed"] > 0
+        or gst["changed"] and gst["changed"] > 0
+      then
+        return true
+      end
+    end
+    return false
+  end
+
+  -- #################### STATUSLINE ->
+
+  -- ######## Left
+
+  -- Current vi mode ------>
+  local vi_mode_hl = function()
+    return {
+      fg = sett.text,
+      bg = mode_colors[vim.fn.mode()][2],
+      style = "bold",
+    }
+  end
+
+  components.active[1][1] = {
+    provider = " " .. assets.mode_icon .. " ",
+    hl = function()
+      return {
+        fg = sett.text,
+        bg = mode_colors[vim.fn.mode()][2],
+      }
+    end,
+  }
+
+  -- there is a dilema: we need to hide Diffs if ther is no git info. We can do that, but this will
+  -- leave the right_separator colored with purple, and since we can't change the color conditonally
+  -- then the solution is to create two right_separators: one with a mauve sett.bkg and the other one normal
+  -- sett.bkg; both have the same fg (vi mode). The mauve one appears if there is git info, else the one with
+  -- the normal sett.bkg appears. Fixed :)
+
+  components.active[1][2] = {
+    provider = assets.right_separator,
+    hl = function()
+      return {
+        fg = mode_colors[vim.fn.mode()][2],
+        bg = sett.bkg,
+      }
+    end,
+    enabled = function()
+      return not any_git_changes() and not has_git_head()
+    end,
+  }
+
+  components.active[1][3] = {
+    provider = assets.right_separator,
+    hl = function()
+      return {
+        fg = mode_colors[vim.fn.mode()][2],
+        bg = sett.diffs,
+      }
+    end,
+    enabled = function()
+      return any_git_changes()
+    end,
+  }
+
+  components.active[1][4] = {
+    provider = assets.right_separator,
+    hl = function()
+      return {
+        fg = mode_colors[vim.fn.mode()][2],
+        bg = C.maroon,
+      }
+    end,
+    enabled = function()
+      return not any_git_changes() and has_git_head()
+    end,
+  }
+
+  -- Current vi mode ------>
+
+  -- Diffs ------>
+  components.active[1][5] = {
+    provider = "git_diff_added",
+    hl = {
+      fg = sett.text,
+      bg = sett.diffs,
+    },
+    icon = " " .. assets.git.added .. " ",
+  }
+
+  components.active[1][6] = {
+    provider = "git_diff_changed",
+    hl = {
+      fg = sett.text,
+      bg = sett.diffs,
+    },
+    icon = " " .. assets.git.changed .. " ",
+  }
+
+  components.active[1][7] = {
+    provider = "git_diff_removed",
+    hl = {
+      fg = sett.text,
+      bg = sett.diffs,
+    },
+    icon = " " .. assets.git.removed .. " ",
+  }
+
+  components.active[1][8] = {
+    provider = assets.right_separator,
+    hl = {
+      fg = sett.diffs,
+      bg = C.maroon,
+    },
+    enabled = function()
+      return any_git_changes()
+    end,
+  }
+  -- Diffs ------>
+
+  -- Git Branch & Breadcrumbs ------>
+
+  components.active[1][9] = {
+    provider = " ",
+    hl = {
+      fg = C.maroon,
+      bg = C.maroon,
+    },
+    enabled = function()
+      return has_git_head()
+    end,
+  }
+
+  components.active[1][10] = {
+    provider = "git_branch",
+    enabled = is_enabled(70),
+    hl = {
+      fg = sett.text,
+      bg = C.maroon,
+    },
+    icon = assets.git.branch .. " ",
+  }
+
+  components.active[1][11] = {
+    provider = " ",
+    hl = {
+      fg = sett.bkg,
+      bg = C.maroon,
+    },
+    enabled = function()
+      return has_git_head()
+    end,
+  }
+
+  components.active[1][12] = {
+    provider = assets.right_separator,
+    hl = {
+      fg = C.maroon,
+      bg = sett.bkg,
+    },
+    enabled = function()
+      return has_git_head()
+    end,
+  }
+
+  components.active[1][13] = {
+    provider = function()
+      return " " .. navic.get_location()
+    end,
+    enabled = function()
+      return navic.is_available()
+    end,
+    hl = {
+      fg = sett.text,
+      bg = sett.bkg,
+    },
+  }
+
+  components.active[1][14] = {
+    provider = " ",
+    hl = {
+      fg = sett.bkg,
+      bg = sett.bkg,
+    },
+    enabled = function()
+      return not navic.is_available()
+    end,
+  }
+  -- Git Branch & Breadcrumbs ------>
+
+  -- ######## Left
+
+  -- ######## Center
+
+  function map(arr, func)
+    local new_arr = {}
+    for i, v in ipairs(arr) do
+      new_arr[i] = func(v)
+    end
+    return new_arr
+  end
+
+  -- Diagnostics ------>
+  -- workspace loader
+  components.active[2][1] = {
+    provider = function()
+      local Lsp = vim.lsp.util.get_progress_messages()[1]
+
+      if Lsp then
+        local msg = Lsp.message or ""
+        local percentage = Lsp.percentage
+        if not percentage then
+          return ""
+        end
+        local title = Lsp.title or ""
+        local spinners = {
+          "",
+          "",
+          "",
+        }
+        local success_icon = {
+          "",
+          "",
+          "",
+        }
+        local ms = vim.loop.hrtime() / 1000000
+        local frame = math.floor(ms / 120) % #spinners
+
+        if percentage >= 70 then
+          return string.format(" %%<%s %s %s (%s%%%%) ", success_icon[frame + 1], title, msg, percentage)
+        end
+
+        return string.format(" %%<%s %s %s (%s%%%%) ", spinners[frame + 1], title, msg, percentage)
+      end
+
+      return ""
+    end,
+    enabled = is_enabled(80),
+    hl = {
+      fg = C.rosewater,
+      bg = sett.bkg,
+    },
+  }
+
+  -- general diagnostics (errors, warnings. info and hints)
+  components.active[2][2] = {
+    provider = "diagnostic_errors",
+    enabled = function()
+      return lsp.diagnostics_exist(vim.diagnostic.severity.ERROR)
+    end,
+
+    hl = {
+      fg = C.red,
+      bg = sett.bkg,
+    },
+    icon = " " .. assets.lsp.error .. " ",
+  }
+
+  components.active[2][3] = {
+    provider = "diagnostic_warnings",
+    enabled = function()
+      return lsp.diagnostics_exist(vim.diagnostic.severity.WARN)
+    end,
+    hl = {
+      fg = C.yellow,
+      bg = sett.bkg,
+    },
+    icon = " " .. assets.lsp.warning .. " ",
+  }
+
+  components.active[2][4] = {
+    provider = "diagnostic_info",
+    enabled = function()
+      return lsp.diagnostics_exist(vim.diagnostic.severity.INFO)
+    end,
+    hl = {
+      fg = C.sky,
+      bg = sett.bkg,
+    },
+    icon = " " .. assets.lsp.info .. " ",
+  }
+
+  components.active[2][5] = {
+    provider = "diagnostic_hints",
+    enabled = function()
+      return lsp.diagnostics_exist(vim.diagnostic.severity.HINT)
+    end,
+    hl = {
+      fg = C.rosewater,
+      bg = sett.bkg,
+    },
+    icon = " " .. assets.lsp.hint .. " ",
+  }
+  -- Diagnostics ------>
+
+  -- ######## Center
+
+  -- ######## Right
+
+  components.active[3][1] = {
+    provider = function()
+      local current_line = vim.fn.line(".")
+      local total_line = vim.fn.line("$")
+
+      if current_line == 1 then
+        return "Top"
+      elseif current_line == vim.fn.line("$") then
+        return "Bot"
+      end
+      local result, _ = math.modf((current_line / total_line) * 100)
+      return result .. "%%"
+    end,
+    -- enabled = shortline or function(winid)
+    -- 	return vim.api.nvim_win_get_width(winid) > 90
+    -- end,
+    hl = {
+      fg = sett.extras,
+      bg = sett.bkg,
+    },
+    right_sep = invi_sep,
+  }
+
+  -- position
+  components.active[3][2] = {
+    provider = "position",
+    -- enabled = shortline or function(winid)
+    -- 	return vim.api.nvim_win_get_width(winid) > 90
+    -- end,
+    hl = {
+      fg = sett.extras,
+      bg = sett.bkg,
+    },
+    right_sep = invi_sep,
+  }
+
+  -- macro
+  components.active[3][3] = {
+    provider = "macro",
+    enabled = function()
+      return vim.api.nvim_get_option("cmdheight") == 0
+    end,
+    hl = {
+      fg = sett.extras,
+      bg = sett.bkg,
+    },
+    right_sep = invi_sep,
+  }
+
+  -- search count
+  components.active[3][4] = {
+    provider = "search_count",
+    enabled = function()
+      return vim.api.nvim_get_option("cmdheight") == 0
+    end,
+    hl = {
+      fg = sett.extras,
+      bg = sett.bkg,
+    },
+    right_sep = invi_sep,
+  }
+
+  components.active[3][5] = {
+    provider = function()
+      local filename = vim.fn.expand("%:t")
+      local extension = vim.fn.expand("%:e")
+      local present, icons = pcall(require, "nvim-web-devicons")
+      local icon = present and icons.get_icon(filename, extension) or assets.file
+      return (sett.show_modified and "%m" or "") .. " " .. icon .. " " .. filename .. " "
+    end,
+    enabled = is_enabled(70),
+    hl = {
+      fg = sett.text,
+      bg = sett.curr_file,
+    },
+    left_sep = {
+      str = assets.left_separator,
+      hl = {
+        fg = sett.curr_file,
+        bg = sett.bkg,
+      },
+    },
+  }
+
+  components.active[3][6] = {
+    provider = function()
+      local dir_name = vim.fn.fnamemodify(vim.fn.getcwd(), ":t")
+      return " " .. assets.dir .. " " .. dir_name .. " "
+    end,
+    enabled = is_enabled(80),
+    hl = {
+      fg = sett.text,
+      bg = sett.curr_dir,
+    },
+    left_sep = {
+      str = assets.left_separator,
+      hl = {
+        fg = sett.curr_dir,
+        bg = sett.curr_file,
+      },
+    },
+  }
+  -- ######## Right
+
+  -- Inanctive components
+  components.inactive[1][1] = {
+    provider = function()
+      return " " .. string.upper(vim.bo.ft) .. " "
+    end,
+    hl = {
+      fg = C.overlay2,
+      bg = C.mantle,
+    },
+  }
+
+  return components
+end
+
+return M

dot_config/nvim/lua/lsp/init.lua

@@ -6,7 +6,11 @@ end
 M.map = map
 
 M.default_config = {
-  on_attach = function(_, bufnr)
+  on_attach = function(client, bufnr)
+    if client.server_capabilities.documentSymbolProvider then
+      require("nvim-navic").attach(client, bufnr)
+    end
+
     map("n", "K", vim.lsp.buf.hover, { bufnr, "Hover Information" })
     map("n", "]d", vim.diagnostic.goto_next, { bufnr, "Next Diagnostic" })
     map("n", "[d", vim.diagnostic.goto_prev, { bufnr, "Previous Diagnostic" })

dot_config/nvim/lua/lsp/java.lua

@@ -39,7 +39,7 @@ local on_attach = function(client, bufnr)
   map("n", "<leader>llc", jdtls.extract_constant, { bufnr, "Extract Constant" })
   map("v", "<leader>llm", "<ESC><CMD>lua require('jdtls').extract_method(true)<CR>", { bufnr, "Extract Method" })
   map("n", "<leader>ltc", jdtls.test_class, { bufnr, "Test Class (DAP)" })
-  map("n", "<leader>ltm", jdtls.test_nearest_method, { bufnr, "Test Method (DAP)" })
+  map("n", "<leader>tm", jdtls.test_nearest_method, { bufnr, "Test Method (DAP)" })
 end
 
 function M.make_jdtls_config(root_dir, workspace_folder)
@@ -60,7 +60,7 @@ function M.make_jdtls_config(root_dir, workspace_folder)
       java = {
         project = {
           referencedLibraries = {
-            HOME .. "/University/Y3/S2/PL/programming-languages/lab-five/antlr.jar",
+            HOME .. "/University/Y3/S2/programming-languages/warm-up/antlr.jar",
           },
         },
         format = {

dot_config/nvim/lua/plugins/catppuccin.lua

@@ -15,13 +15,19 @@ return {
         integrations = {
           neogit = true,
           mason = true,
-          native_lsp = { enabled = true },
+          native_lsp = {
+            enabled = true,
+            underlines = {
+              errors = {},
+              hints = {},
+              warnings = {},
+              information = {},
+            },
+          },
           navic = {
             enabled = true,
             custom_bg = "NONE",
           },
-          noice = true,
-          notify = true,
           dap = {
             enabled = true,
             enable_ui = true,
@@ -57,7 +63,9 @@ return {
           DapStoppedLinehl = { bg = "#324430" },
           DapBreakpointLinehl = { bg = "#492a32" },
 
-          NeogitDiffContextHighlight = { bg = "NONE" }
+          NeogitDiffContextHighlight = { bg = "NONE" },
+
+          NavicText = { fg = cp.teal },
         },
       })
       vim.cmd.colorscheme("catppuccin")

dot_config/nvim/lua/plugins/feline.lua

@@ -3,13 +3,12 @@ return {
     "feline-nvim/feline.nvim",
     config = function()
       local feline = require("feline")
-      local ctp_feline = require("catppuccin.groups.integrations.feline")
 
       feline.setup({
-        components = ctp_feline.get(),
+        components = require("extra.feline").get(),
         force_inactive = {
           filetypes = {
-            "^packer$",
+            "^lazy$",
             "^startify$",
             "^fugitive$",
             "^fugitiveblame$",
@@ -18,8 +17,6 @@ return {
           },
         },
       })
-      -- catppuccin statusline
-      ctp_feline.setup({})
     end,
     dependencies = { "nvim-tree/nvim-web-devicons" },
   },

dot_config/nvim/lua/plugins/lsp.lua

@@ -159,6 +159,7 @@ return {
       local null_ls = require("null-ls")
       null_ls.setup({
         sources = {
+          null_ls.builtins.formatting.beautysh,
           null_ls.builtins.formatting.stylua.with({
             extra_args = { "--indent-type", "spaces" },
           }),

dot_config/nvim/lua/plugins/nvim-navic.lua

@@ -0,0 +1,13 @@
+return {
+  {
+    "SmiteshP/nvim-navic",
+    dependencies = {
+      "neovim/nvim-lspconfig",
+      "nvim-tree/nvim-web-devicons", -- optional dependency
+    },
+    opts = {
+      highlight = true
+    },
+  },
+}
+