From 89c239667ab2fa0a047640f931b3f8e897af9857 Mon Sep 17 00:00:00 2001
From: Ivan Dimitrov <ivan@idimitrov.dev>
Date: Sat, 15 Jul 2023 12:53:42 +0300
Subject: [PATCH] eslint

---
 cfg/nvim/init.lua | 25 ++++++++++++++++++-------
 home.nix          |  5 ++++-
 2 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/cfg/nvim/init.lua b/cfg/nvim/init.lua
index b14d575..cad3a09 100644
--- a/cfg/nvim/init.lua
+++ b/cfg/nvim/init.lua
@@ -1,8 +1,8 @@
-vim.wo.number = true -- show numbers
-vim.o.scrolloff = 15 -- scrll if n lines left
-vim.o.hlsearch = false -- highlight search
+vim.wo.number = true                                                -- show numbers
+vim.o.scrolloff = 15                                                -- scrll if n lines left
+vim.o.hlsearch = false                                              -- highlight search
 
-vim.g.mapleader = " " -- leader space
+vim.g.mapleader = " "                                               -- leader space
 vim.g.maplocalleader = " "
 vim.keymap.set({ "n", "v" }, "<Space>", "<Nop>", { silent = true }) -- nop leader
 
@@ -14,6 +14,8 @@ nmap("<Tab>", "<cmd>BufferNext<cr>")
 nmap("<S-Tab>", "<cmd>BufferPrevious<cr>")
 nmap("<leader>x", "<cmd>BufferClose<cr>")
 
+nmap("<leader>r", "<cmd>!%:p<cr>")
+
 nmap("<leader>ff", require("telescope.builtin").find_files)
 nmap("<leader>fw", require("telescope.builtin").live_grep)
 
@@ -23,7 +25,15 @@ nmap("<leader>e", vim.diagnostic.open_float)
 
 local cmp = require("cmp")
 local lspconfig = require("lspconfig")
-local servers = { tsserver = {}, pylsp = {}, lua_ls = {}, rnix = {} }
+local servers = {
+	tsserver = {},
+	pylsp = {},
+	lua_ls = {},
+	rnix = {},
+	eslint = {
+		cmd = { "eslint", "--stdin", "--stdin-filename", "%:p" }
+	}
+}
 local cmp_capabilities = require("cmp_nvim_lsp").default_capabilities()
 local on_attach = function(_, bufnr)
 	nmap("<leader>ca", vim.lsp.buf.code_action)
@@ -44,9 +54,10 @@ cmp.setup({
 	sources = cmp.config.sources({ { name = "nvim_lsp" }, { name = "luasnip" } }, { { name = "buffer" } }),
 })
 
-for server, settings in pairs(servers) do
+for server, cfg in pairs(servers) do
 	lspconfig[server].setup({
-		settings = settings,
+		cmd = cfg.cmd,
+		settings = cfg.settings,
 		capabilities = cmp_capabilities,
 		on_attach = on_attach,
 	})
diff --git a/home.nix b/home.nix
index f977092..2faddf3 100644
--- a/home.nix
+++ b/home.nix
@@ -47,11 +47,14 @@
       enable = true;
       viAlias = true;
       extraPackages = with pkgs; [
+	nodePackages_latest.eslint
+	nodePackages_latest.prettier
+	nodePackages_latest.typescript
+	nodePackages_latest.typescript-language-server
         alejandra
         libclang
         lua
         lua-language-server
-        nodePackages_latest.typescript-language-server
         python311Packages.python-lsp-black
         python311Packages.python-lsp-server
         ripgrep