1

6 files changed, 57 insertions, 32 deletions

diff --git a/nvim/.config/nvim/lua/custom/chadrc.lua b/nvim/.config/nvim/lua/custom/chadrc.lua
index 7cfd28e..1d3acd3 100644
--- a/nvim/.config/nvim/lua/custom/chadrc.lua
+++ b/nvim/.config/nvim/lua/custom/chadrc.lua
@@ -27,8 +27,6 @@ M.plugins = {
 }
 
 
-
-
 -- make sure you maintain the structure of `core/default_config.lua` here,
 -- example of changing theme:
 
@@ -36,6 +34,7 @@ M.ui = {
    theme = "onedark",
 }
 
+
 M.mappings = require "custom.mappings"
 
 return M
diff --git a/nvim/.config/nvim/lua/custom/init.lua b/nvim/.config/nvim/lua/custom/init.lua
index 3458777..457afb0 100644
--- a/nvim/.config/nvim/lua/custom/init.lua
+++ b/nvim/.config/nvim/lua/custom/init.lua
@@ -1,11 +1,3 @@
--- This is an example init file , its supposed to be placed in /lua/custom/
-
--- This is where your custom modules and plugins go.
--- Please check NvChad docs if you're totally new to nvchad + dont know lua!!
-
---print("custom/init.lua")
---print("custom/init.lua")
-
 local opt = vim.opt
 
 -- Indenting
@@ -20,7 +12,7 @@ vim.cmd("autocmd VimLeave *.tex !texclear %")
 -- Ensure files are read as what I want:
 vim.cmd("autocmd BufRead,BufNewFile /tmp/calcurse*,~/.calcurse/notes/* set filetype=markdown")
 vim.cmd("autocmd BufRead,BufNewFile *.ms,*.me,*.mom,*.man set filetype=groff")
-vim.cmd("autocmd BufRead,BufNewFile *.tex set filetype=texclear")
+vim.cmd("autocmd BufRead,BufNewFile *.tex set filetype=tex")
 vim.cmd("autocmd BufRead,BufNewFile *.jl set filetype=julia")
 
 -- save file as sudo on files that require root permission
@@ -50,8 +42,5 @@ if &diff
 endif
 ]])
 
--- -- autocompile dwmblocks
+-- autocompile dwmblocks
 -- vim.cmd("autocmd BufWritePost ~/.local/src/dwmblocks/config.h !cd ~/.local/src/dwmblocks/; sudo make install && { killall -q dwmblocks;setsid dwmblocks & "})
-
--- must be here and not in lazy loader parameters
-vim.g.livepreview_previewer = "zathura"
diff --git a/nvim/.config/nvim/lua/custom/mappings.lua b/nvim/.config/nvim/lua/custom/mappings.lua
index c7510cb..4d9c4f9 100644
--- a/nvim/.config/nvim/lua/custom/mappings.lua
+++ b/nvim/.config/nvim/lua/custom/mappings.lua
@@ -20,10 +20,26 @@ M.general = {
 
 M.vim_latex_live_preview = {
     n = {
-        ["<F5>"] = {"<cmd> LLPStartPreview <CR>", ""},
+        ["<F5>"] = {":LLPStartPreview<CR>", ""},
     },
 }
 
+M.vim_slime = {
+	v = {
+		["<C-c><C-c>"] = {"<Plug>SlimeRegionSend", ""},
+	},
+	n = {
+		["<C-c><C-c>"] = {"<Plug>SlimeParagraphSend", ""},
+		["<C-c>v"] = {"<Plug>SlimeConfig", ""},
+	}
+}
+
+M.vim_tmux_navigator = {
+	n = {
+		["<C-l>"] = {":TmuxNavigateRight<CR>", ""},
+	},
+}
+
 --M.vimwiki = {
 --    n = {
 --        ["<leader>wf"] = {"<cmd> VimwikiIndex <CR>", ""},
diff --git a/nvim/.config/nvim/lua/custom/plugins/init.lua b/nvim/.config/nvim/lua/custom/plugins/init.lua
index 942f47c..7f4ccbf 100644
--- a/nvim/.config/nvim/lua/custom/plugins/init.lua
+++ b/nvim/.config/nvim/lua/custom/plugins/init.lua
@@ -1,11 +1,13 @@
 return {
 
 	["jpalardy/vim-slime"] = {
-		ft = {"jl", "py", "m"},
+		--ft = {"jl", "py", "m"},
 		config = function()
 			vim.g.slime_paste_file = "$HOME/.cache/slime_paste"
 			vim.g.slime_target = "tmux"
 			vim.g.slime_default_config = { socket_name = "default", target_pane = "{last}" }
+			vim.g.slime_cell_delimiter = "\n"
+			require("custom.mappings").vim_slime()
 		end,
 	},
 
@@ -16,12 +18,16 @@ return {
 	},
 
 	["christoomey/vim-tmux-navigator"] = {
-		ft = {"jl", "py", "m"},
+		--ft = {"jl", "py", "m"},
+		config = function()
+			--require("custom.mappings").vim_tmux_navigator()
+		end,
 	},
 
 	["lervag/vimtex"] = {
 		ft = {"tex"},
 		setup = function()
+			-- possibly move out of lazy load
 			vim.g.vimtex_view_method = "zathura"
 		end,
 	},
@@ -30,12 +36,10 @@ return {
 		ft = {"tex"},
 		config = function()
 			print("latex-preview config")
-			--require("custom.plugins.mappings").vim_latex_live_preview()
-			--local map = require("core.utils").map
-			--map("n", "<F5>", ":LLPStartPreview<CR>")
 			vim.g.livepreview_use_biber = 1
 			vim.g.livepreview_cursorhold_recompile = 1
 			vim.opt.updatetime = 1000
+			require("custom.mappings").vim_latex_live_preview()
 		end,
 	},
 
diff --git a/nvim/.config/nvim/lua/custom/plugins/lspconfig.lua b/nvim/.config/nvim/lua/custom/plugins/lspconfig.lua
index e3eeecc..1b8fa97 100644
--- a/nvim/.config/nvim/lua/custom/plugins/lspconfig.lua
+++ b/nvim/.config/nvim/lua/custom/plugins/lspconfig.lua
@@ -1,17 +1,33 @@
 local M = {}
 
 M.setup_lsp = function(attach, capabilities)
-   local lspconfig = require "lspconfig"
+	local lspconfig = require "lspconfig"
 
-   --local servers = { "html", "cssls", "bashls", "emmet_ls", "tsserver", "clangd" }
-   local servers = { "html", "cssls", "bashls", "clangd", "julials" }
+	--local servers = { "html", "cssls", "bashls", "emmet_ls", "tsserver", "clangd" }
+	local servers = { "html", "cssls", "bashls", "clangd", "julials" }
+
+	for _, lsp in ipairs(servers) do
+		lspconfig[lsp].setup {
+			on_attach = attach,
+			capabilities = capabilities,
+			root_dir = vim.loop.cwd,
+		}
+	end
+
+	-- temporarily disable tsserver suggestions
+	require("lspconfig").tsserver.setup {
+		init_options = {
+			preferences = {
+				disableSuggestions = true,
+			},
+		},
+
+		on_attach = function(client, bufnr)
+			client.resolved_capabilities.document_formatting = false
+			vim.api.nvim_buf_set_keymap(bufnr, "n", "<space>fm", "<cmd>lua vim.lsp.buf.formatting()<CR>", {})
+		end,
+	}
 
-   for _, lsp in ipairs(servers) do
-      lspconfig[lsp].setup {
-         on_attach = attach,
-         capabilities = capabilities,
-      }
-   end
 end
 
 return M
diff --git a/nvim/.config/nvim/lua/custom/plugins/override.lua b/nvim/.config/nvim/lua/custom/plugins/override.lua
index 7074ff8..a42b0d3 100644
--- a/nvim/.config/nvim/lua/custom/plugins/override.lua
+++ b/nvim/.config/nvim/lua/custom/plugins/override.lua
@@ -9,12 +9,13 @@ M.treesitter = {
       "css",
       "javascript",
       "json",
-      "toml",
       "markdown",
       "c",
+	  "cpp",
       "bash",
       "lua",
-      "norg",
+	  "julia",
+	  "latex",
    },
 }