still working

modules/nvim/default.nix

@@ -8,7 +8,7 @@ let cfg = config.modules.neovim;
       src = pkgs.fetchFromGithub {
         owner = "projekt0n";
         repo = "github-nvim-theme";
-        rev = "62b7b54a90c70c20cd1641f9facfced46bdd3561";
+        rev = "ea713c37691b2519f56cd801a2330bdf66393d0f";
         sha256 = "0cwr3b5r2ac7aizxmwb3mlhdc2sh0pw670vcwps79x9jp52yrj2y";
       };
     };
@@ -27,7 +27,6 @@ in {
         vimAlias = true;
 
         plugins = with pkgs.vimPlugins; [
-          
           {
             plugin = github-theme;
             config = '' 
@@ -37,13 +36,15 @@ in {
             '';
           }
 
-          lazygit.nvim
+          { plugin = lazygit.nvim; }
+
           {
             plugin = LazyVim;
             config = '' 
             lua << EOF
               return {
                 {'williamboman/mason.nvim', enabled = false },
+                {'williamboman/mason-lspconfig.nvim', enabled = false },
                 {'nvim-treesitter/nvim-treesitter', enabled = false },
               } 
             EOF
@@ -65,19 +66,162 @@ in {
           }
 
           {
-            plugin = nvim-treesitter.withAllGrammars
+            plugin = nvim-treesitter.withAllGrammars;
             config = '' 
               lua << EOF
-                
+                require'nvim-treesitter.configs'.setup {
+                  highlight = {
+                    enable = true,
+                  },
+                }
               EOF
             '';
           }
         ];
+       
+        extraLuaConfig = ''
+        lua << EOF
+          vim.opt.tabstop = 2
+          vim.opt.shiftwidth = 2
+          vim.opt.expandtab = true 
+
+          vim.o.clipboard = "unnamedplus"
+        EOF
+        '';
+
+        generatedConfigs = {
+          lua = ''
+            require("config.lazy")
+
+            local lsp = require("lsp-zero").preset({})
+
+            lsp.on_attach(function(client, bufnr)
+              lsp.default_keymaps({ buffer = bufnr })
+            end)
+
+            lsp.setup_servers({
+              "tsserver",
+              "eslint",
+              "hls",
+              "pyright",
+              "nil_ls",
+              "cssls",
+              "html",
+              "jsonls",
+              "diagnosticls",
+              "lua_ls",
+              "marksman",
+              "purescriptls",
+              "tailwindcss",
+              "bashls",
+            })
+
+            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" },
+              },
+            })
+
+            vim.cmd([[
+              au BufRead,BufNewFile *.purs set filetype=purescript
+            ]])
+
+            local has_words_before = function()
+              unpack = unpack or table.unpack
+              local line, col = unpack(vim.api.nvim_win_get_cursor(0))
+              return col ~= 0 and vim.api.nvim_buf_get_lines(0, line - 1, line, true)[1]:sub(col, col):match("%s") == nil
+            end
+
+            local luasnip = require("luasnip")
+
+            cmp.setup({
+              enabled = function()
+                -- disable completion in comments
+                local context = require("cmp.config.context")
+                -- keep command mode completion enabled when cursor is in a comment
+                if vim.api.nvim_get_mode().mode == "c" then
+                  return true
+                else
+                  return not context.in_treesitter_capture("comment") and not context.in_syntax_group("Comment")
+                end
+              end,
+              mapping = {
+                ["<Tab>"] = cmp.mapping(function(fallback)
+                  if cmp.visible() then
+                    cmp.select_next_item()
+                  -- You could replace the expand_or_jumpable() calls with expand_or_locally_jumpable()
+                  -- they way you will only jump inside the snippet region
+                  elseif luasnip.expand_or_jumpable() then
+                    luasnip.expand_or_jump()
+                  elseif has_words_before() then
+                    cmp.complete()
+                  else
+                    fallback()
+                  end
+                end, { "i", "s" }),
+
+                ["<S-Tab>"] = cmp.mapping(function(fallback)
+                  if cmp.visible() then
+                    cmp.select_prev_item()
+                  elseif luasnip.jumpable(-1) then
+                    luasnip.jump(-1)
+                  else
+                    fallback()
+                  end
+                end, { "i", "s" }),
+
+                ["<CR>"] = cmp.mapping({
+                  i = function(fallback)
+                    if cmp.visible() and cmp.get_active_entry() then
+                      cmp.confirm({ behavior = cmp.ConfirmBehavior.Replace, select = false })
+                    else
+                      fallback()
+                    end
+                  end,
+                  s = cmp.mapping.confirm({ select = true }),
+                  c = cmp.mapping.confirm({ behavior = cmp.ConfirmBehavior.Replace, select = true }),
+                }),
+              },
+            })
+
+            vim.lsp.handlers["textDocument/publishDiagnostics"] = vim.lsp.with(vim.lsp.diagnostic.on_publish_diagnostics, {
+              -- Disable virtual_text
+              virtual_text = false,
+            })
+
+            require("notify").setup({
+              background_colour = "#000000",
+            })
+          ''; 
+        };
       };
 
       home.packages = with pkgs; [
+        nodePackages.eslint
+        nodePackages.vscode-langservers-extracted
+        nodePackages.typescript-language-server
+        nodePackages.diagnostic-languageserver
+        nodePackages.pyright
+        nodePackages.purescript-language-server
+        nodePackages."@tailwindcss/language-server"
+        nodePackages.bash-language-server
+        marksman
+
         nil nixfmt
+
         sumneko-lua-language-server stylua
+
         haskell-language-server hlint
       ];
   };