Merge branch 'dev' into gentoo

apply nvim changes

.config/dunst/dunstrc

@@ -70,7 +70,7 @@ hide_duplicates_count = yes
 # The width can be negative.  In this case the actual width is the
 # screen width minus the width defined in within the geometry option.
 #geometry = "250x50-40+40"
-geometry = "450x50-15+75"
+geometry = "450x50-25+47"
 
 # Shrink window if it's smaller than the width.  Will be ignored if
 # width is 0.

.config/nvim/lua/globals.lua

@@ -9,10 +9,10 @@ M = {
 	lsp_path = vim.fn.stdpath("data").. "/lsp",
 
         -- misc
-	sign_error = "",
+        sign_error = "",
-	sign_warning = "",
+        sign_warning = "",
         sign_hint = "",
-	sign_info = "",
+        sign_info = "",
 }
 
 -- Make it accessible everywhere

.config/nvim/lua/lsp/init.lua

@@ -6,34 +6,35 @@
 local lsp = {}
 
 vim.fn.sign_define(
-        "LspDiagnosticsSignError",
+        "DiagnosticSignError",
         {
-		texthl = "LspDiagnosticsSignError",
+		texthl = "DiagnosticError",
 		text = globals.sign_error,
-		numhl = "LspDiagnosticsSignError"
+		numhl = "DiagnosticError"
 	}
 )
 vim.fn.sign_define(
-        "LspDiagnosticsSignWarning",
+        "DiagnosticSignWarn",
         {
-		texthl = "LspDiagnosticsSignWarning",
+		texthl = "DiagnosticWarn",
 		text = globals.sign_warning,
-		numhl = "LspDiagnosticsSignWarning"}
+		numhl = "DiagnosticWarn"
-)
-vim.fn.sign_define(
-        "LspDiagnosticsSignHint",
-        {
-		texthl = "LspDiagnosticsSignHint",
-		text = globals.sign_hint,
-		numhl = "LspDiagnosticsSignHint"
         }
 )
 vim.fn.sign_define(
-        "LspDiagnosticsSignInformation",
+        "DiagnosticSignHint",
         {
-		texthl = "LspDiagnosticsSignInformation",
+		texthl = "DiagnosticHint",
+		text = globals.sign_hint,
+		numhl = "DiagnosticHint"
+	}
+)
+vim.fn.sign_define(
+        "DiagnosticSignInfo",
+        {
+		texthl = "DiagnosticInfo",
 		text = globals.sign_info,
-		numhl = "LspDiagnosticsSignInformation"
+		numhl = "DiagnosticInfo"
 	}
 )
 

.config/nvim/lua/statusline.lua

@@ -103,8 +103,8 @@ local function get_lsp_diagnostics(bufnr)
         local result = {}
         local levels = {
                 errors = "Error",
-                warnings = "Warning",
+                warnings = "Warn",
-                info = "Information",
+                info = "Info",
                 hints = "Hint"
         }
 
@@ -148,17 +148,17 @@ local function statusline_focused()
                                 process_diagnostics(
                                         globals.sign_error .. " ",
                                         diagnostics.errors,
-                                        "%#LspDiagnosticsDefaultError#"
+                                        "%#DiagnosticError#"
                                 ),
                                 process_diagnostics(
                                         globals.sign_warning .. " ",
                                         diagnostics.warnings,
-                                        "%#LspDiagnosticsDefaultWarning#"
+                                        "%#DiagnosticWarn#"
                                 ),
                                 process_diagnostics(
                                         globals.sign_info .. " ",
                                         diagnostics.info,
-                                        "%#LspDiagnosticsDefaultInformation#"
+                                        "%#DiagnosticInfo#"
                                 )
                         }
                 )

.local/src/polyjuice

@@ -1 +1 @@
-Subproject commit 2596b02be402dae70a915898edc9c4391805c489
+Subproject commit bd4119a8c1a57b84f9470950a514f52d81907abb