getting the new Linux update

after/plugin/lsp.lua

@@ -8,6 +8,7 @@ end)
 lsp.ensure_installed({
   -- Replace these with whatever servers you want to install
   'bashls',
+<<<<<<< HEAD
   --'clangd',
   'julials',
   --'lua_ls',
@@ -15,6 +16,15 @@ lsp.ensure_installed({
   'pylsp',
   --'texlab',
   --'zls'
+=======
+  'clangd',
+  'julials',
+  'lua_ls',
+  'ltex',
+  'pylsp',
+  'texlab',
+  'zls'
+>>>>>>> Linux
 })
 
 --[[
@@ -22,6 +32,7 @@ lsp.ensure_installed({
 ]]--
 
 -- (Optional) Configure lua language server for neovim
+<<<<<<< HEAD
 
 require('lspconfig').bashls.setup({})
 
@@ -32,6 +43,12 @@ require('lspconfig').clangd.setup({})
 --})
 
 require('lspconfig').julials.setup({})
+=======
+require('lspconfig').lua_ls.setup(lsp.nvim_lua_ls())
+
+
+require('lspconfig').texlab.setup({})
+>>>>>>> Linux
 
 require('lspconfig').ltex.setup({
   settings = {
@@ -41,6 +58,7 @@ require('lspconfig').ltex.setup({
 	},
 })
 
+<<<<<<< HEAD
 require('lspconfig').lua_ls.setup({
     settings = {
         Lua = {
@@ -65,6 +83,30 @@ require('lspconfig').lua_ls.setup({
 })
 
 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")
+        if require'lspconfig'.util.path.is_file(julia) then
+	    vim.notify("Hello!")
+            new_config.cmd[1] = julia
+        end
+    end
+})
+
+require('lspconfig').zls.setup({})
+
+require('lspconfig').bashls.setup({})
+>>>>>>> Linux
 
 -- source: https://rust-analyzer.github.io/manual.html#nvim-lsp
 --require('lspconfig').rust_analyzer.setup({
@@ -78,10 +120,13 @@ require('lspconfig').pylsp.setup({})
 --    }
 --})
 
+<<<<<<< HEAD
 require('lspconfig').texlab.setup({})
 
 require('lspconfig').zls.setup({})
 
+=======
+>>>>>>> Linux
 --[[
     END LANGUAGE SERVERS CONFIG HERE!!!
 ]]--

lua/eddie/keymaps.lua

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