From 59c92909da8cfa28e42478d2b3782f9917cbe049 Mon Sep 17 00:00:00 2001
From: mitchell <m@mjfs.us>
Date: Tue, 7 Feb 2023 20:35:10 -0500
Subject: [PATCH] Fix neovim font, lsp hover, and other minor improvements

---
 .config/kitty/kitty.conf |  6 +++---
 .config/nvim/init.lua    | 30 +++++++++++++-----------------
 .vimrc                   |  2 ++
 3 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/.config/kitty/kitty.conf b/.config/kitty/kitty.conf
index f422edd..a84ed98 100644
--- a/.config/kitty/kitty.conf
+++ b/.config/kitty/kitty.conf
@@ -1,9 +1,9 @@
 # vim:fileencoding=utf-8:foldmethod=marker
 
 font_family      JetBrainsMono Nerd Font
-bold_font        JetBrainsMono Nerd Font Bold
-italic_font      JetBrainsMono Nerd Font Italic
-bold_italic_font JetBrainsMono Nerd Font Bold Italic
+bold_font        JetBrains     Mono Bold
+italic_font      JetBrains     Mono Italic
+bold_italic_font JetBrains     Mono Bold Italic
 
 
 # Theme (Gruvbox Dark)
diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua
index 260f149..fd820ea 100644
--- a/.config/nvim/init.lua
+++ b/.config/nvim/init.lua
@@ -2,6 +2,8 @@ vim.cmd("set runtimepath^=~/.vim runtimepath+=~/.vim/after")
 vim.cmd("let &packpath = &runtimepath")
 vim.cmd("source ~/.vimrc")
 vim.keymap.set("t", "<Esc>", "<C-\\><C-n>")
+vim.g.neovide_scale_factor = 0.7
+vim.opt.guifont = { "JetBrainsMono Nerd Font", "h13" }
 
 require('twilight').setup()
 require('zen-mode').setup({
@@ -23,8 +25,12 @@ require('noice').setup({
       ["cmp.entry.get_documentation"] = true,
     },
   },
+  presets = {
+    long_message_to_split = true, -- long messages will be sent to a split
+  },
 })
 
+require('treesitter-context').setup()
 require('nvim-treesitter.configs').setup({
   -- A list of parser names, or "all" (the four listed parsers should always be installed)
   ensure_installed = {
@@ -92,32 +98,22 @@ local on_attach = function(client, bufnr)
     print(vim.inspect(vim.lsp.buf.list_workspace_folders()))
   end, bufopts)
   vim.keymap.set('n', '<leader>m', vim.lsp.buf.code_action, bufopts)
-  vim.keymap.set('n', '<leader>mr', vim.lsp.buf.rename, bufopts)
+  vim.keymap.set('n', '<leader>r', vim.lsp.buf.rename, bufopts)
   vim.keymap.set('n', '<leader>F', function() vim.lsp.buf.format { async = true } end, bufopts)
 end
 
-local lsp = require "lspconfig"
+local lspconfig = require "lspconfig"
 local coq = require "coq"
 
-
 local lsp_flags = {
   -- This is the default in Nvim 0.7+
   debounce_text_changes = 150,
 }
-lsp['tsserver'].setup({
-    on_attach = on_attach,
-    flags = lsp_flags,
-})
-lsp['tsserver'].setup(coq.lsp_ensure_capabilities())
 
-lsp['elixirls'].setup({
+local servers = { 'tsserver', 'elixirls', 'gopls' }
+for _, lsp in ipairs(servers) do
+  lspconfig[lsp].setup(coq.lsp_ensure_capabilities({
     on_attach = on_attach,
     flags = lsp_flags,
-})
-lsp['elixirls'].setup(coq.lsp_ensure_capabilities())
-
-lsp['gopls'].setup({
-    on_attach = on_attach,
-    flags = lsp_flags,
-})
-lsp['gopls'].setup(coq.lsp_ensure_capabilities())
+  }))
+end
diff --git a/.vimrc b/.vimrc
index eb07ed8..d4609d8 100644
--- a/.vimrc
+++ b/.vimrc
@@ -18,6 +18,7 @@ if !exists('g:vscode')
 
   if has('nvim')
     Plug 'nvim-treesitter/nvim-treesitter', {'do': ':TSUpdate'}
+    Plug 'nvim-treesitter/nvim-treesitter-context'
     Plug 'BurntSushi/ripgrep'
     Plug 'MunifTanjim/nui.nvim'
     Plug 'rcarriga/nvim-notify'
@@ -70,6 +71,7 @@ set cursorline
 set showmatch
 set hlsearch
 set mouse=a
+set mousemodel=extend
 set number
 set noshowmode
 set background=dark