Addition of dictionary file for LaTeX lsp

after/plugin/dictionary-gb.txt

@@ -0,0 +1,5 @@
+CIFAR
+MNIST
+LeNet
+MUL
+BCNN

after/plugin/lsp.lua

@@ -8,7 +8,6 @@ end)
 lsp.ensure_installed({
   -- Replace these with whatever servers you want to install
   'bashls',
-<<<<<<< HEAD
   --'clangd',
   'julials',
   --'lua_ls',
@@ -16,15 +15,6 @@ lsp.ensure_installed({
   'pylsp',
   --'texlab',
   --'zls'
-=======
-  'clangd',
-  'julials',
-  'lua_ls',
-  'ltex',
-  'pylsp',
-  'texlab',
-  'zls'
->>>>>>> Linux
 })
 
 --[[
@@ -32,7 +22,6 @@ lsp.ensure_installed({
 ]]--
 
 -- (Optional) Configure lua language server for neovim
-<<<<<<< HEAD
 
 require('lspconfig').bashls.setup({})
 
@@ -42,60 +31,12 @@ require('lspconfig').clangd.setup({})
 --    on_attach = on_attach,
 --})
 
-require('lspconfig').julials.setup({})
-=======
-require('lspconfig').lua_ls.setup(lsp.nvim_lua_ls())
-
-
-require('lspconfig').texlab.setup({})
->>>>>>> Linux
-
-require('lspconfig').ltex.setup({
-  settings = {
-		ltex = {
-			language = "en-GB",
-		},
-	},
-})
-
-<<<<<<< HEAD
-require('lspconfig').lua_ls.setup({
-    settings = {
-        Lua = {
-            runtime = {
-                -- Tell the language server which version of Lua you're using (most likely LuaJIT in the case of Neovim)
-                version = 'LuaJIT',
-            },
-            diagnostics = {
-                -- Get the language server to recognize the `vim` global
-                globals = {'vim'},
-            },
-            workspace = {
-                -- Make the server aware of Neovim runtime files
-                library = vim.api.nvim_get_runtime_file("", true),
-            },
-            -- Do not send telemetry data containing a randomized but unique identifier
-            telemetry = {
-                enable = false,
-            },
-        },
-    }
-})
-
-require('lspconfig').pylsp.setup({})
-=======
-require('lspconfig').pylsp.setup({})
-
---require('lspconfig').gopls.setup({
---    on_attach = on_attach,
---})
-
 require('lspconfig').julials.setup({
     --on_attach = on_attach,
     symbol_cache_download = true,
     --symbol_server = "https://symbol-server",
     on_new_config = function(new_config, _)
-        local julia = vim.fn.expand("/usr/share/julia/bin/julia")
+        local julia = vim.fn.expand("/usr/local/share/julia/bin/julia")
         if require'lspconfig'.util.path.is_file(julia) then
 	    vim.notify("Hello!")
             new_config.cmd[1] = julia
@@ -103,10 +44,28 @@ require('lspconfig').julials.setup({
     end
 })
 
-require('lspconfig').zls.setup({})
+require('lspconfig').lua_ls.setup(lsp.nvim_lua_ls())
 
-require('lspconfig').bashls.setup({})
->>>>>>> Linux
+
+require('lspconfig').texlab.setup({})
+
+local path = vim.fn.stdpath("config") .. "/after/plugin/dictionary-gb.txt"
+local words = {}
+
+for word in io.open(path, "r"):lines() do
+	table.insert(words, word)
+end
+
+require('lspconfig').ltex.setup({
+  settings = {
+		ltex = {
+			language = "en-GB",
+            dictionary = {
+                ["en-GB"] = words,
+            },
+		},
+	},
+})
 
 -- source: https://rust-analyzer.github.io/manual.html#nvim-lsp
 --require('lspconfig').rust_analyzer.setup({
@@ -120,13 +79,10 @@ require('lspconfig').bashls.setup({})
 --    }
 --})
 
-<<<<<<< HEAD
 require('lspconfig').texlab.setup({})
 
 require('lspconfig').zls.setup({})
 
-=======
->>>>>>> Linux
 --[[
     END LANGUAGE SERVERS CONFIG HERE!!!
 ]]--

lua/eddie/keymaps.lua

@@ -25,19 +25,11 @@ vim.keymap.set("n", "<S-TAB>", ":bprevious<CR>", opts)
 
 -- Telescope
 local builtin = require("telescope.builtin")
-<<<<<<< HEAD
 vim.keymap.set("n", "<leader>pf", builtin.find_files, {})
 vim.keymap.set("n", "<C-p>", builtin.git_files, {})
 vim.keymap.set("n", "<leader>ps", function ()
     builtin.grep_string( { search = vim.fn.input("Grep > ") } );
 end)
-=======
---vim.keymap.set("n", "<leader>pf", builtin.find_files, {})
---vim.keymap.set("n", "<C-p>", builtin.git_files, {})
---vim.keymap.set("n", "<leader>ps", function ()
---    builtin.grep_string( { search = vim.fn.input("Grep > ") } );
---end)
->>>>>>> Linux
 
 -- Harpoon
 local mark = require("harpoon.mark")

lua/eddie/options.lua

@@ -47,25 +47,17 @@ vim.cmd [[autocmd CursorHold,CursorHoldI * lua vim.diagnostic.open_float(nil, {f
 
 
 
-<<<<<<< HEAD
-
-
-=======
->>>>>>> Linux
 -- Leader key
 vim.g.mapleader = " "
 --vim.g.maplocalleader = " "
 vim.g.maplocalleader = "\\"
 
-<<<<<<< HEAD
-=======
 -- Undotree instead of swapfile
 vim.opt.swapfile = false
 vim.opt.backup = false
 vim.opt.undodir = os.getenv("HOME") .. "/.vim/undodir"
 vim.opt.undofile = true
 
->>>>>>> Linux
 -- Airline
 vim.g.airline_powerline_fonts = 1
 

lua/eddie/packer.lua

@@ -23,11 +23,7 @@ return require('packer').startup(function(use)
 	  end
   })
 
-<<<<<<< HEAD
-  -- Code Coloring
-=======
   -- Color Coloring
->>>>>>> Linux
   use({ 'nvim-treesitter/nvim-treesitter', { run =  ':TSUpdate' } })
   use( 'nvim-treesitter/playground' )
 
@@ -39,10 +35,7 @@ return require('packer').startup(function(use)
 
   -- Git Status
   use( 'tpope/vim-fugitive' )
-<<<<<<< HEAD
   use('airblade/vim-gitgutter')
-=======
->>>>>>> Linux
 
   -- Language Servers
   use {