Merge branch 'dev' into mercury

nvim: consistent names for LSP hints
statusbar: handle >100% battery cases

.config/nvim/lua/globals.lua

@@ -8,7 +8,7 @@ local M = {} -- The module to export
 M = {
     -- misc
     sign_error = "",
-    sign_warning = "",
+    sign_warn = "",
     sign_hint = "",
     sign_info = "",
 }

.config/nvim/lua/statusline.lua

@@ -102,10 +102,10 @@ end
 local function get_lsp_diagnostics()
     local result = {}
     local levels = {
-        errors = "Error",
+        error = "Error",
-        warnings = "Warn",
+        warn = "Warn",
         info = "Info",
-        hints = "Hint"
+        hint = "Hint"
     }
 
     for k, level in pairs(levels) do
@@ -152,12 +152,12 @@ local left = table.concat {
         {
             process_diagnostics(
                 globals.sign_error .. " ",
-                diagnostics.errors,
+                diagnostics.error,
                 "%#DiagnosticVirtualTextError#"
             ),
             process_diagnostics(
-                globals.sign_warning .. " ",
+                globals.sign_warn .. " ",
-                diagnostics.warnings,
+                diagnostics.warn,
                 "%#DiagnosticVirtualTextWarn#"
             ),
             process_diagnostics(

.local/bin/statusbar/sb-battery

@@ -43,18 +43,22 @@ do
 		status=" " && capacity="FULL"
                 printf " %s:%s(%s) " "$slot" "$status" "$capacity"
         else
-                if [ "$status" = "Charging" ]; then
+                if [ 100  -lt $(expr $capacity) ]; then
-                        status=""
+                        status=""
                 else
-                        case "$capacity" in
+                        if [ "$status" = "Charging" ]; then
-                                100|[8-9][0-9])	status="" ;;
+                                status=""
-                                [6-7][0-9])	status="" ;;
+                        else
-                                [4-5][0-9])	status="" ;;
+                                case "$capacity" in
-                                [2-3][0-9])	status="" ;;
+                                        100|[8-9][0-9])	status="" ;;
-                                *)	status="" ;;
+                                        [6-7][0-9])	status="" ;;
-                        esac
+                                        [4-5][0-9])	status="" ;;
-                        [ "BAT0" = $slot ] && [ 30 -gt $capacity ] && notify;
+                                        [2-3][0-9])	status="" ;;
+                                        *)	status="" ;;
+                                esac
+                                [ "BAT0" = $slot ] && [ 30 -gt $capacity ] && notify;
+                        fi
+                        printf " %s:%s (%0.2d%%) " "$slot" "$status" "$capacity";
                 fi
-                printf " %s:%s (%0.2d%%) " "$slot" "$status" "$capacity";
         fi
 done