From 4fff72b08dc9150822374aa4e1f45e36fbf580f7 Mon Sep 17 00:00:00 2001
From: Bryan Ramos <bryan@ramos.codes>
Date: Sun, 28 May 2023 20:39:31 -0400
Subject: [PATCH] Trying one last change

---
 .../dotfiles/nvim/lua/config/autocmds.lua     | 60 ++++++++++++++++---
 homeConfig/home.nix                           | 22 +++----
 2 files changed, 62 insertions(+), 20 deletions(-)

diff --git a/homeConfig/dotfiles/nvim/lua/config/autocmds.lua b/homeConfig/dotfiles/nvim/lua/config/autocmds.lua
index 68822be..a00bc37 100644
--- a/homeConfig/dotfiles/nvim/lua/config/autocmds.lua
+++ b/homeConfig/dotfiles/nvim/lua/config/autocmds.lua
@@ -10,20 +10,62 @@ end)
 -- When you don't have mason.nvim installed
 -- You'll need to list the servers installed in your system
 lsp.setup_servers({
-  'tsserver', 
-  'eslint', 
-  'hls', 
-  'pyright', 
-  'nil_ls', 
-  'volar', 
-  'cssls', 
+  'tsserver',
+  'eslint',
+  'hls',
+  'pyright',
+  'nil_ls',
+  'volar',
+  'cssls',
   'html',
   'jsonls',
-  'diagnosticls', 
-  'lua_ls'
+  'diagnosticls',
+  'lua_ls',
+  'marksman'
 })
 
 -- (Optional) Configure lua language server for neovim
 require('lspconfig').lua_ls.setup(lsp.nvim_lua_ls())
 
 lsp.setup()
+
+local cmp = require'cmp'
+cmp.setup {
+  snippet = {
+    expand = function(args)
+      require('luasnip').lsp_expand(args.body)
+    end,
+  },
+  sources = {
+    { name = 'nvim_lsp' },
+    { name = 'luasnip' },
+    -- other sources...
+  },
+  -- other configurations...
+}
+
+local luasnip = require'luasnip'
+
+cmp.setup {
+  -- other configurations...
+  mapping = {
+    ['<Tab>'] = cmp.mapping(function(fallback)
+      if vim.fn.pumvisible() == 1 then
+        vim.fn.feedkeys(vim.api.nvim_replace_termcodes('<C-n>', true, true, true), 'n')
+      elseif luasnip.expand_or_jumpable() then
+        vim.fn.feedkeys(vim.api.nvim_replace_termcodes('<Plug>luasnip-expand-or-jump', true, true, true), '')
+      else
+        fallback()
+      end
+    end, { 'i', 's' }),
+    ['<S-Tab>'] = cmp.mapping(function(fallback)
+      if vim.fn.pumvisible() == 1 then
+        vim.fn.feedkeys(vim.api.nvim_replace_termcodes('<C-p>', true, true, true), 'n')
+      elseif luasnip.jumpable(-1) then
+        vim.fn.feedkeys(vim.api.nvim_replace_termcodes('<Plug>luasnip-jump-prev', true, true, true), '')
+      else
+        fallback()
+      end
+    end, { 'i', 's' }),
+  },
+}
diff --git a/homeConfig/home.nix b/homeConfig/home.nix
index b8faa3e..d77c6e0 100644
--- a/homeConfig/home.nix
+++ b/homeConfig/home.nix
@@ -66,10 +66,8 @@
     nodejs
     gcc
 
-# Haskell
     ghc
     cabal-install
-    haskell-language-server
     haskellPackages.hoogle
     cabal2nix
 
@@ -77,15 +75,17 @@
     python311Packages.pip
 
 # LSPs
-  nodePackages.vscode-langservers-extracted
-  nodePackages.prettier
-  nodePackages.typescript-language-server
-  nodePackages.diagnostic-languageserver
-  nodePackages.volar
-  nodePackages.pyright
-  haskell-language-server
-  nil
-  sumneko-lua-language-server
+    nodePackages.vscode-langservers-extracted
+    nodePackages.prettier
+    nodePackages.typescript-language-server
+    nodePackages.diagnostic-languageserver
+    nodePackages.volar
+    nodePackages.pyright
+    haskell-language-server
+    nil
+    marksman
+    sumneko-lua-language-server
+
   ];
 
 # PROGRAM CONFIGS