From 14013d199efbcedeb2d9ccb3f4306f75f834694d Mon Sep 17 00:00:00 2001
From: Nicholas Novak <nnovak@flexport.com>
Date: Wed, 29 Jun 2022 12:28:59 -0700
Subject: [PATCH] Addded kotlin syntax, new tabs in macos, and disabled path
 auto-completion with LSP

This makes it so that new tabs with Kitty in macos (cmd + t) will now open in the same directory, which is the same functionality as Linux

Paths should no longer erronoeously auto-complete every time I press a slash

And, Deno LSP is now disabled again, because Flow conflicts with it
---
 kitty/.config/kitty/kitty.conf |  2 ++
 nvim/.config/nvim/init.vim     | 31 ++++++++++++++++---------------
 2 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/kitty/.config/kitty/kitty.conf b/kitty/.config/kitty/kitty.conf
index 8bce8d0..902c3b2 100644
--- a/kitty/.config/kitty/kitty.conf
+++ b/kitty/.config/kitty/kitty.conf
@@ -15,6 +15,8 @@ map alt+9 goto_tab 9
 # Open new tabs in the same working directory
 map ctrl+shift+t new_tab_with_cwd
 
+map super+t new_tab_with_cwd
+
 # When on wayland remove the unsightly title bar
 linux_display_server x11
 
diff --git a/nvim/.config/nvim/init.vim b/nvim/.config/nvim/init.vim
index f85f2f5..3776220 100644
--- a/nvim/.config/nvim/init.vim
+++ b/nvim/.config/nvim/init.vim
@@ -10,6 +10,9 @@ Plug 'google/vim-codefmt'
 " `:help :Glaive` for usage.
 Plug 'google/vim-glaive'
 
+" Kotlin
+Plug 'udalov/kotlin-vim'
+
 " Go development
 Plug 'fatih/vim-go', { 'do': ':GoUpdateBinaries' }
 
@@ -118,12 +121,18 @@ cmp.setup({
     -- Tab immediately completes. C-n/C-p to select.
     ['<Tab>'] = cmp.mapping.confirm({ select = true })
   },
-  sources = cmp.config.sources({
+  sources = cmp.config.sources(
+		{
     -- TODO: currently snippets from lsp end up getting prioritized -- stop that!
-    { name = 'nvim_lsp' },
-  }, {
-    { name = 'path' },
-  }),
+			{ name = 'nvim_lsp' },
+  	}
+		-- Disable 'path' auto-completion
+		--[[
+		{
+    	{ name = 'path' },
+  	}
+		--]]
+	),
   experimental = {
     ghost_text = true,
   },
@@ -204,20 +213,12 @@ vim.g.markdown_fenced_languages = {
 }
 
 -- Deno Javascript Language Server
+--[[
 lspconfig.denols.setup{
 	on_attach = on_attach,
 	flags = lsp_flags,
-	-- Disable the highlighting for Deno, because it conflicts with Flow typing
-	handlers = {
-		["textDocument/publishDiagnostics"] = vim.lsp.with(
-			vim.lsp.diagnostic.on_publish_diagnostics, {
-				-- Disable virtual_text
-				virtual_text = false,
-				signs = false,
-			}
-		)
-	}
 }
+--]]
 
 -- Flow Javascript Language Server
 lspconfig.flow.setup{