elixir updates

3 files changed, 45 insertions, 37 deletions

diff --git a/ftplugin/elixir.lua b/ftplugin/elixir.lua
index 418b4c4d..362ee010 100644
--- a/ftplugin/elixir.lua
+++ b/ftplugin/elixir.lua
@@ -3,8 +3,8 @@ require'lspconfig'.elixirls.setup{
 }
 
 -- needed for the LSP to recognize elixir files (alternativly just use elixir-editors/vim-elixir)
-vim.cmd([[
-  au BufRead,BufNewFile *.ex,*.exs set filetype=elixir
-  au BufRead,BufNewFile *.eex,*.leex,*.sface set filetype=eelixir
-  au BufRead,BufNewFile mix.lock set filetype=elixir
-]])
\ No newline at end of file
+-- vim.cmd([[
+--   au BufRead,BufNewFile *.ex,*.exs set filetype=elixir
+--   au BufRead,BufNewFile *.eex,*.leex,*.sface set filetype=eelixir
+--   au BufRead,BufNewFile mix.lock set filetype=elixir
+-- ]])
diff --git a/ftplugin/euphoria3.lua b/ftplugin/euphoria3.lua
new file mode 100644
index 00000000..adc0ac7d
--- /dev/null
+++ b/ftplugin/euphoria3.lua
@@ -0,0 +1,11 @@
+-- TODO Remove this at some point
+require'lspconfig'.elixirls.setup{
+    cmd = { DATA_PATH .. "/lspinstall/elixir/elixir-ls/language_server.sh"};
+}
+
+-- needed for the LSP to recognize elixir files (alternativly just use elixir-editors/vim-elixir)
+-- vim.cmd([[
+--   au BufRead,BufNewFile *.ex,*.exs set filetype=elixir
+--   au BufRead,BufNewFile *.eex,*.leex,*.sface set filetype=eelixir
+--   au BufRead,BufNewFile mix.lock set filetype=elixir
+-- ]])
diff --git a/lua/plugins.lua b/lua/plugins.lua
index ee6919d3..0a59ae8d 100644
--- a/lua/plugins.lua
+++ b/lua/plugins.lua
@@ -10,21 +10,19 @@ if fn.empty(fn.glob(install_path)) > 0 then
 end
 
 local packer_ok, packer = pcall(require, "packer")
-if not packer_ok then
-  return
-end
+if not packer_ok then return end
 
 packer.init {
-  -- compile_path = vim.fn.stdpath('data')..'/site/pack/loader/start/packer.nvim/plugin/packer_compiled.vim',
-  compile_path = require("packer.util").join_paths(vim.fn.stdpath('config'), 'plugin', 'packer_compiled.vim'),
-  git = {
-    clone_timeout = 300
-  },
-  display = {
-    open_fn = function()
-      return require("packer.util").float { border = "single" }
-    end,
-  },
+    -- compile_path = vim.fn.stdpath('data')..'/site/pack/loader/start/packer.nvim/plugin/packer_compiled.vim',
+    compile_path = require("packer.util").join_paths(vim.fn.stdpath('config'),
+                                                     'plugin',
+                                                     'packer_compiled.vim'),
+    git = {clone_timeout = 300},
+    display = {
+        open_fn = function()
+            return require("packer.util").float {border = "single"}
+        end
+    }
 }
 
 vim.cmd "autocmd BufWritePost plugins.lua PackerCompile" -- Auto compile when there are changes in plugins.lua
@@ -46,15 +44,15 @@ return require("packer").startup(function(use)
         config = [[require('lv-telescope')]],
         cmd = "Telescope"
     }
-    -- Snap
-    use {
-        "camspiers/snap",
-        rocks = "fzy",
-        config = function()
-          require("lv-snap").config()
-        end,
-        disable = not O.plugin.snap.active,
-    }
+    -- Snap TODO disable for now, need to only install fzy when user specifies they want to use snap
+    -- use {
+        -- "camspiers/snap",
+        -- rocks = "fzy",
+        -- config = function()
+        --    require("lv-snap").config()
+        -- end,
+        -- disable = not O.plugin.snap.active
+    -- }
     -- Autocomplete
     use {
         "hrsh7th/nvim-compe",
@@ -90,8 +88,11 @@ return require("packer").startup(function(use)
     use {"folke/which-key.nvim"}
 
     -- Autopairs
-    use {"windwp/nvim-autopairs",
-        config = function() require'lv-autopairs' end
+    use {
+        "windwp/nvim-autopairs",
+        config = function()
+            require 'lv-autopairs'
+        end
     }
 
     -- Comments
@@ -399,9 +400,8 @@ return require("packer").startup(function(use)
     -- Lush Create Color Schemes
     use {
         "rktjmp/lush.nvim",
-        event = "VimEnter",
         -- cmd = {"LushRunQuickstart", "LushRunTutorial", "Lushify"},
-        -- disable = not O.plugin.lush.active,
+        disable = not O.plugin.lush.active,
     }
     -- HTML preview
     use {
@@ -420,15 +420,12 @@ return require("packer").startup(function(use)
     -- LANGUAGE SPECIFIC GOES HERE
 
     -- Latex TODO what filetypes should this be active for?
-    use {"lervag/vimtex", ft = "latex", disable = not O.lang.latex.active}
+    use {"lervag/vimtex", ft = "latex"}
 
     -- Rust tools
     -- TODO: use lazy loading maybe?
-    use {"simrat39/rust-tools.nvim", disable = not O.lang.rust.active}
+    use {"simrat39/rust-tools.nvim", ft = "rust"}
 
     -- Elixir
-    use {"elixir-editors/vim-elixir",
-        ft = {"elixir", "eelixir"},
-        disable = not O.lang.elixir.active
-    }
+    use {"elixir-editors/vim-elixir", ft = {"elixir", "eelixir", "euphoria3"}}
 end)