I

2023-04-04 12:09:23 +02:00
parent 433a218e91
commit ae2414113a
14 changed files with 316 additions and 105 deletions
--- a/configs/nvim/lua/max/configs/lsp.lua
+++ b/configs/nvim/lua/max/configs/lsp.lua
@@ -2,6 +2,16 @@ local mason = require("mason")
 local mason_lsp = require("mason-lspconfig")
 local lsp = require("lspconfig")

+vim.lsp.handlers['textDocument/hover'] = vim.lsp.with(
+  vim.lsp.handlers.hover,
+  { border = 'single' }
+)
+vim.diagnostic.config({
+  float = {
+    border = 'single',
+  },
+})
+
 local null_ls = require("null-ls")
 null_ls.setup({
  sources = {
@@ -140,7 +150,7 @@ custom_lsp.intelephense = {

 custom_lsp.rust_analyzer = {
  settings = {
-    ["rust-analyzer"] = {
+        ["rust-analyzer"] = {
      imports = {
        granularity = {
          group = "module",
@@ -163,10 +173,10 @@ custom_lsp.yamlls = {
  settings = {
    yaml = {
      schemas = {
-        ["https://raw.githubusercontent.com/quantumblacklabs/kedro/develop/static/jsonschema/kedro-catalog-0.17.json"] = "conf/**/*catalog*",
-        ["https://json.schemastore.org/github-workflow.json"] = "/.github/workflows/*",
-        ["https://raw.githubusercontent.com/SchemaStore/schemastore/master/src/schemas/json/traefik-v2-file-provider.json"] = "rules.yml",
-        ["https://raw.githubusercontent.com/SchemaStore/schemastore/master/src/schemas/json/traefik-v2.json"] = "traefik.yml",
+            ["https://raw.githubusercontent.com/quantumblacklabs/kedro/develop/static/jsonschema/kedro-catalog-0.17.json"] = "conf/**/*catalog*",
+            ["https://json.schemastore.org/github-workflow.json"] = "/.github/workflows/*",
+            ["https://raw.githubusercontent.com/SchemaStore/schemastore/master/src/schemas/json/traefik-v2-file-provider.json"] = "rules.yml",
+            ["https://raw.githubusercontent.com/SchemaStore/schemastore/master/src/schemas/json/traefik-v2.json"] = "traefik.yml",
      },
    },
  },
@@ -182,7 +192,7 @@ custom_lsp.ltex = {
      language = "de",
      disabledRules = { ["en-US"] = { "PROFANITY" } },
      dictionary = {
-        ["en-US"] = { "perf", "ci", "neovim" },
+            ["en-US"] = { "perf", "ci", "neovim" },
      },
      hiddenFalsePositives = {
        "neovim",
--- a/configs/nvim/lua/max/configs/toggleterm.lua
+++ b/configs/nvim/lua/max/configs/toggleterm.lua
@@ -24,7 +24,7 @@ local pnpm = Terminal:new({
  float_opts = {
    winblend = 0,
    padding = 10,
-    border = "shadow",
+    border = "single",
  },
  on_close = function()
    Terminal:close()
--- a/configs/nvim/lua/max/core/autocommands.lua
+++ b/configs/nvim/lua/max/core/autocommands.lua
@@ -26,6 +26,14 @@ autocmd({ "BufWinLeave" }, {
  group = save_fold,
 })

+autocmd({ "BufReadPost" }, {
+  pattern = "*.http",
+  callback = function()
+    vim.bo.filetype = "http"
+  end,
+  group = save_fold,
+})
+
 autocmd({ "BufWinEnter" }, {
  pattern = "*.*",
  callback = function()
--- a/configs/nvim/lua/max/core/keymappings.lua
+++ b/configs/nvim/lua/max/core/keymappings.lua
@@ -38,12 +38,13 @@ map("n", "<Leader>li", ":LspInfo<CR>", opts)
 map("n", "<Leader>lr", ":LspRestart<CR>", opts)

 -- This is my [i]nspect section,
-map("n", "<Leader>is", ":SymbolsOutline<cr>", opts) -- [i]nspect [s]ymbols
-map("n", "<Leader>io", ":Lspsaga outline<CR>", opts) -- [i]nspect [o]utline
-map("n", "<Leader>in", ":Telescope notify<CR>", opts) -- [i]nspect [n]otifications
-map("n", "<Leader>ip", ":TroubleToggle<CR>", opts) -- [i]nspect [p]roblems
-map("n", "<Leader>ii", ":Lspsaga incomming_calls<CR>", opts) --[i]nspect [i]ncomming_calls
-map("n", "<Leader>io", ":Lspsaga outgoing_calls<CR>", opts) --[i]nspect [o]utgoing_calls
+map("n", "<Leader>is", ":SymbolsOutline<cr>", opts)          -- [i]nspect [s]ymbols
+map("n", "<Leader>ic", ":ColorizerToggle<CR>", opts)         -- [i]nspect [c]olors
+map("n", "<Leader>io", ":Lspsaga outline<CR>", opts)         -- [i]nspect [o]utline
+map("n", "<Leader>in", ":Telescope notify<CR>", opts)        -- [i]nspect [n]otifications
+map("n", "<Leader>ip", ":TroubleToggle<CR>", opts)           -- [i]nspect [p]roblems
+map("n", "<Leader>ii", ":Lspsaga incomming_calls<CR>", opts) -- [i]nspect [i]ncomming_calls
+map("n", "<Leader>io", ":Lspsaga outgoing_calls<CR>", opts)  -- [i]nspect [o]utgoing_calls

 map({ "n", "v" }, "<Leader>t", require("max.configs.translate"), opts)

--- a/configs/nvim/lua/max/core/options.lua
+++ b/configs/nvim/lua/max/core/options.lua
@@ -10,52 +10,59 @@ g.loaded_netrwSettings = 1
 g.loaded_netrwFileHandlers = 1
 g.loaded_netrw_gitignore = 1

-opt.autowrite = true -- Enable auto write
-opt.clipboard = "unnamedplus" -- Sync with system clipboard
+opt.autowrite = true           -- Enable auto write
+opt.clipboard = "unnamedplus"  -- Sync with system clipboard
 opt.completeopt = "menu,menuone,noselect"
-opt.conceallevel = 3 -- Hide * markup for bold and italic
-opt.confirm = true -- Confirm to save changes before exiting modified buffer
-opt.cursorline = true -- Enable highlighting of the current line
-opt.expandtab = true -- Use spaces instead of tabs
+opt.conceallevel = 3           -- Hide * markup for bold and italic
+opt.confirm = true             -- Confirm to save changes before exiting modified buffer
+opt.cursorline = true          -- Enable highlighting of the current line
+opt.expandtab = true           -- Use spaces instead of tabs
 opt.formatoptions = "jcroqlnt" -- tcqj
 opt.grepformat = "%f:%l:%c:%m"
 opt.grepprg = "rg --vimgrep"
-opt.ignorecase = true -- Ignore case
+opt.ignorecase = true      -- Ignore case
 opt.inccommand = "nosplit" -- preview incremental substitute
-opt.laststatus = 3 -- laststatus=3 enables global statusline
-opt.list = false -- Show some invisible characters (tabs...
-opt.mouse = "a" -- Enable mouse mode
-opt.number = true -- Print line number
-opt.pumblend = 10 -- Popup blend
-opt.pumheight = 10 -- Maximum number of entries in a popup
-opt.relativenumber = true -- Relative line numbers
-opt.scrolloff = 4 -- Lines of context
+opt.laststatus = 3         -- laststatus=3 enables global statusline
+opt.list = false           -- Show some invisible characters (tabs...
+opt.mouse = "a"            -- Enable mouse mode
+opt.number = true          -- Print line number
+opt.pumblend = 10          -- Popup blend
+opt.pumheight = 10         -- Maximum number of entries in a popup
+opt.relativenumber = true  -- Relative line numbers
+opt.scrolloff = 4          -- Lines of context
 opt.sessionoptions = { "buffers", "curdir", "tabpages", "winsize" }
-opt.shiftround = true -- Round indent
-opt.shiftwidth = 2 -- Size of an indent
+opt.shiftround = true      -- Round indent
+opt.shiftwidth = 2         -- Size of an indent
 opt.shortmess:append { W = true, I = true, c = true }
-opt.showmode = false -- Dont show mode since we have a statusline
-opt.sidescrolloff = 8 -- Columns of context
-opt.signcolumn = "no" -- Always show the signcolumn, otherwise it would shift the text each time
-opt.smartcase = true -- Don't ignore case with capitals
-opt.smartindent = true -- Insert indents automatically
+opt.showmode = false       -- Dont show mode since we have a statusline
+opt.sidescrolloff = 8      -- Columns of context
+opt.signcolumn = "no"      -- Always show the signcolumn, otherwise it would shift the text each time
+opt.smartcase = true       -- Don't ignore case with capitals
+opt.smartindent = true     -- Insert indents automatically
 opt.spelllang = { "en" }
-opt.splitbelow = true -- Put new windows below current
-opt.splitright = true -- Put new windows right of current
-opt.tabstop = 2 -- Number of spaces tabs count for
-opt.termguicolors = true -- True color support
+opt.splitbelow = true      -- Put new windows below current
+opt.splitright = true      -- Put new windows right of current
+opt.tabstop = 2            -- Number of spaces tabs count for
+opt.termguicolors = true   -- True color support
 opt.timeoutlen = 300
 opt.undofile = true
 opt.undolevels = 10000
-opt.updatetime = 200 -- Save swap file and trigger CursorHold
+opt.updatetime = 200               -- Save swap file and trigger CursorHold
 opt.wildmode = "longest:full,full" -- Command-line completion mode
-opt.winminwidth = 5 -- Minimum window width
-opt.wrap = false -- Disable line wrap
+opt.winminwidth = 5                -- Minimum window width
+opt.wrap = false                   -- Disable line wrap

 if vim.fn.has("nvim-0.9.0") == 1 then
  opt.splitkeep = "screen"
  opt.shortmess:append { C = true }
 end

+function _G.CustomFoldText()
+  return vim.fn.getline(vim.v.foldstart) .. ' …'
+end
+
+opt.fillchars = "fold: "
+opt.foldtext = 'v:lua.CustomFoldText()'
+
 -- Fix markdown indentation settings
 vim.g.markdown_recommended_style = 0
--- a/configs/nvim/lua/max/core/plugins.lua
+++ b/configs/nvim/lua/max/core/plugins.lua
@@ -3,7 +3,14 @@ local plugins = {
  {
    dir = "~/Projects/sudoku.nvim",
    cmd = "Sudoku",
-    config = true
+    config = function()
+      require("sudoku").setup({
+        custom_highlights = {
+          square = { fg = "red" }
+        }
+      })
+      vim.cmd("hi SudokuSquare guibg=red")
+    end
  },

  "nvim-lua/plenary.nvim",
@@ -62,14 +69,26 @@ local plugins = {
  {
    "folke/noice.nvim",
    event = "VeryLazy",
+    enabled = true,
    opts = {
      lsp = {
        progress = {
          enabled = false
        },
-        override = {
-          ["vim.lsp.util.convert_input_to_markdown_lines"] = true,
-          ["vim.lsp.util.stylize_markdown"] = true,
+        hover = {
+          enabled = false
+        }
+      },
+      views = {
+        cmdline_popup = {
+          border = {
+            style = "single",
+            padding = { 0, 1 },
+          },
+          filter_options = {},
+          win_options = {
+            winhighlight = "NormalFloat:NormalFloat,FloatBorder:FloatBorder",
+          },
        },
      },
      presets = {
@@ -79,17 +98,6 @@ local plugins = {
        lsp_doc_border = true
      },
    },
-    keys = {
-      { "<S-Enter>",   function() require("noice").redirect(vim.fn.getcmdline()) end, mode = "c",                 desc = "Redirect Cmdline" },
-      { "<leader>snl", function() require("noice").cmd("last") end,                   desc = "Noice Last Message" },
-      { "<leader>snh", function() require("noice").cmd("history") end,                desc = "Noice History" },
-      { "<leader>sna", function() require("noice").cmd("all") end,                    desc = "Noice All" },
-    },
-  },
-  {
-    "stevearc/dressing.nvim",
-    enabled = false,
-    lazy = true,
  },
  {
    "folke/which-key.nvim",
@@ -140,12 +148,6 @@ local plugins = {
    end,
    event = "VimEnter",
  },
-  {
-    "kevinhwang91/nvim-ufo",
-    event = "BufReadPost",
-    dependencies = "kevinhwang91/promise-async",
-    config = require("max.configs.ufo"),
-  },
  {
    "goolord/alpha-nvim",
    lazy = false,
@@ -287,11 +289,11 @@ local plugins = {
  --------------------
  {
    "rest-nvim/rest.nvim",
-    cmd = "RestNvim",
+    lazy = false,
    dependencies = { "nvim-lua/plenary.nvim" },
    config = function()
      require("rest-nvim").setup({})
-    end
+    end,
  },
  {
    "chrisgrieser/nvim-recorder",
@@ -370,7 +372,7 @@ local opts = {
  install = { colorscheme = { require("max.theme").name } },
  change_detection = {
    enabled = true, -- automatically check for config file changes and reload the ui
-    notify = true, -- get a notification when changes are found
+    notify = true,  -- get a notification when changes are found
  },
  performance = {
    rtp = {
--- a/configs/nvim/lua/max/theme/catpuccin.lua
+++ b/configs/nvim/lua/max/theme/catpuccin.lua
@@ -14,6 +14,11 @@ return {
      comments = { "italic" },
      strings = { "italic" },
    },
+    custom_highlights = function()
+      return {
+        Folded = { bg = "#1d1e27" }
+      }
+    end,
    integrations = {
      gitsigns = true,
      telescope = true,
--- a/configs/nvim/lua/max/theme/everblush.lua
+++ b/configs/nvim/lua/max/theme/everblush.lua
@@ -0,0 +1,7 @@
+return {
+  'Everblush/nvim',
+  name = 'everblush',
+  opts = {
+    transparent_background = true,
+  }
+}