Merge branch 'master' of github.com:ChristianChiarulli/LunarVim into rolling

1 files changed, 68 insertions, 65 deletions

diff --git a/lua/default-config.lua b/lua/default-config.lua
index 45e93302..ea2642c2 100644
--- a/lua/default-config.lua
+++ b/lua/default-config.lua
@@ -8,6 +8,7 @@ O = {
   auto_close_tree = 0,
   auto_complete = true,
   colorscheme = "lunar",
+  clipboard = "unnamedplus",
   hidden_files = true,
   wrap_lines = false,
   number = true,
@@ -16,6 +17,7 @@ O = {
   cmdheight = 2,
   cursorline = true,
   shell = "bash",
+  scrolloff = 0,
   timeoutlen = 100,
   nvim_tree_disable_netrw = 0,
   ignore_case = true,
@@ -99,76 +101,76 @@ O = {
   },
 
   lang = {
-    python = {
-      linter = "",
-      isort = false,
+    cmake = {},
+    clang = {
       diagnostics = {
         virtual_text = { spacing = 0, prefix = "" },
         signs = true,
         underline = true,
       },
-      analysis = {
-        type_checking = "basic",
-        auto_search_paths = true,
-        use_library_code_types = true,
-      },
+      cross_file_rename = true,
+      header_insertion = "never",
+    },
+    css = {
+      virtual_text = true,
     },
     dart = {
       sdk_path = "/usr/lib/dart/bin/snapshots/analysis_server.dart.snapshot",
     },
-    lua = {
+    docker = {},
+    efm = {},
+    elm = {},
+    emmet = { active = true },
+    elixir = {},
+    graphql = {},
+    go = {},
+    html = {},
+    java = {},
+    json = {
       diagnostics = {
         virtual_text = { spacing = 0, prefix = "" },
         signs = true,
         underline = true,
       },
     },
-    sh = {
-      -- @usage can be 'shellcheck'
-      linter = "",
-      -- @usage can be 'shfmt'
+    kotlin = {},
+    latex = {},
+    lua = {
       diagnostics = {
         virtual_text = { spacing = 0, prefix = "" },
         signs = true,
         underline = true,
       },
     },
-    tsserver = {
-      -- @usage can be 'eslint'
-      linter = "",
-      diagnostics = {
-        virtual_text = { spacing = 0, prefix = "" },
-        signs = true,
-        underline = true,
+    php = {
+      format = {
+        format = {
+          default = "psr12",
+        },
+      },
+      environment = {
+        php_version = "7.4",
       },
-    },
-    json = {
       diagnostics = {
         virtual_text = { spacing = 0, prefix = "" },
         signs = true,
         underline = true,
       },
+      filetypes = { "php", "phtml" },
     },
-    tailwindcss = {
-      active = false,
-      filetypes = {
-        "html",
-        "css",
-        "scss",
-        "javascript",
-        "javascriptreact",
-        "typescript",
-        "typescriptreact",
-      },
-    },
-    clang = {
+    python = {
+      linter = "",
+      isort = false,
       diagnostics = {
         virtual_text = { spacing = 0, prefix = "" },
         signs = true,
         underline = true,
       },
-      cross_file_rename = true,
-      header_insertion = "never",
+      analysis = {
+        type_checking = "basic",
+        auto_search_paths = true,
+        use_library_code_types = true,
+      },
     },
     ruby = {
       diagnostics = {
@@ -178,14 +180,11 @@ O = {
       },
       filetypes = { "rb", "erb", "rakefile", "ruby" },
     },
-    go = {},
-    elixir = {},
-    vim = {},
-    yaml = {},
-    terraform = {},
     rust = {
       rust_tools = {
         active = false,
+        parameter_hints_prefix = "<-",
+        other_hints_prefix = "=>", -- prefix for all the other hints (type, chaining)
       },
       linter = "",
       diagnostics = {
@@ -194,37 +193,41 @@ O = {
         underline = true,
       },
     },
-    svelte = {},
-
-    php = {
-      format = {
-        format = {
-          default = "psr12",
-        },
+    sh = {
+      -- @usage can be 'shellcheck'
+      linter = "",
+      -- @usage can be 'shfmt'
+      diagnostics = {
+        virtual_text = { spacing = 0, prefix = "" },
+        signs = true,
+        underline = true,
       },
-      environment = {
-        php_version = "7.4",
+    },
+    svelte = {},
+    tailwindcss = {
+      active = false,
+      filetypes = {
+        "html",
+        "css",
+        "scss",
+        "javascript",
+        "javascriptreact",
+        "typescript",
+        "typescriptreact",
       },
+    },
+    terraform = {},
+    tsserver = {
+      -- @usage can be 'eslint'
+      linter = "",
       diagnostics = {
         virtual_text = { spacing = 0, prefix = "" },
         signs = true,
         underline = true,
       },
-      filetypes = { "php", "phtml" },
-    },
-    latex = {},
-    kotlin = {},
-    html = {},
-    elm = {},
-    emmet = { active = true },
-    graphql = {},
-    efm = {},
-    docker = {},
-    cmake = {},
-    java = {},
-    css = {
-      virtual_text = true,
     },
+    vim = {},
+    yaml = {},
   },
 
   dashboard = {