From f3df47f424383089baadb19c5a4c1974904d3e2f Mon Sep 17 00:00:00 2001
From: Salar Rahmanian <code@softinio.com>
Date: Tue, 7 Sep 2021 08:04:39 -0700
Subject: [PATCH] Updates

---
 home.nix                 | 39 ++++++++++++++++++++----
 programs/neovim/init.lua | 64 ++++++++++++++++++++--------------------
 2 files changed, 65 insertions(+), 38 deletions(-)

diff --git a/home.nix b/home.nix
index 7c69417..272c850 100644
--- a/home.nix
+++ b/home.nix
@@ -24,17 +24,17 @@
       enable = true;
   };
 
-  programs.fzf = {
-    enable = true;
-    enableFishIntegration = true;
-  };
-
   programs.direnv = {
     enable = true;
     enableFishIntegration = true;
     nix-direnv.enable = true;
   };
 
+  programs.fzf = {
+    enable = true;
+    enableFishIntegration = true;
+  };
+
   programs.gh = {
     enable = true;
     editor = "nvim";
@@ -74,6 +74,27 @@
     };
   };
 
+  programs.vscode = {
+    enable = true;
+    extensions = [
+      pkgs.vscode-extensions.scalameta.metals
+      pkgs.vscode-extensions.usernamehw.errorlens
+      pkgs.vscode-extensions.golang.Go
+      pkgs.vscode-extensions.redhat.java
+      pkgs.vscode-extensions.xyz.local-history
+      pkgs.vscode-extensions.yzhang.markdown-all-in-one
+      pkgs.vscode-extensions.svsool.markdown-memo
+      pkgs.vscode-extensions.github.vscode-pull-request-github
+      pkgs.vscode-extensions.github.github-vscode-theme
+      pkgs.vscode-extensions.jnoortheen.nix-ide
+      pkgs.vscode-extensions.timonwong.shellcheck
+    ];
+    userSettings = {
+      telemetry.enableTelemetry = false;
+      workbench.colorTheme = "GitHub Dark Default";
+    };
+  };
+
   programs.fish = {
     enable = true;
 
@@ -123,6 +144,8 @@
 
       set -xg PATH $HOME/bin $PATH
 
+      set -xg PATH /Users/salar/.luarocks/bin:/nix/store/95wpywsjf5iiw77f6n9rw347lk1sly15-luarocks-3.2.1/bin:/Users/salar/bin:/Users/salar/.nix-profile/bin:/nix/var/nix/profiles/default/bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/Library/Apple/usr/bin:/nix/store/3qp71mhrpxxg080yc82k51nx7b5hkajr-kitty-0.21.2/Applications/kitty.app/Contents/MacOS $PATH
+
       set -xg JAVA_HOME /Users/salar/.nix-profile/bin
 
       set -xg JDTLS_CONFIG /Users/salar/.config/jdt-language-server/config_mac
@@ -138,6 +161,10 @@
       set -xg TOOLCHAINS swift
 
       set -xg XDG_CONFIG_HOME $HOME/.config
+
+      set -xg LUA_PATH "/nix/store/95wpywsjf5iiw77f6n9rw347lk1sly15-luarocks-3.2.1/share/lua/5.1/?.lua;/nix/store/95wpywsjf5iiw77f6n9rw347lk1sly15-luarocks-3.2.1/share/lua/5.1/?/init.lua;/Users/salar/.luarocks/share/lua/5.1/?.lua;/Users/salar/.luarocks/share/lua/5.1/?/init.lua"
+
+      set -xg LUA_CPATH "?.so;/nix/store/95wpywsjf5iiw77f6n9rw347lk1sly15-luarocks-3.2.1/share/lua/5.1/?/init.lua;/Users/salar/.luarocks/lib/lua/5.1/?.so;/nix/store/95wpywsjf5iiw77f6n9rw347lk1sly15-luarocks-3.2.1/lib/lua/5.1/?.so"
       '';
 
     promptInit = ''
@@ -219,6 +246,7 @@
     pkgs.jansson
     pkgs.luajit
     pkgs.luajitPackages.luarocks
+    pkgs.luajitPackages.luasocket
     pkgs.maven
     pkgs.multimarkdown
     pkgs.ncdu
@@ -250,7 +278,6 @@
     pkgs.tokei
     pkgs.tree
     pkgs.universal-ctags
-    pkgs.vscodium
     pkgs.wget
     pkgs.xz
     pkgs.yq
diff --git a/programs/neovim/init.lua b/programs/neovim/init.lua
index a06be39..06a6209 100644
--- a/programs/neovim/init.lua
+++ b/programs/neovim/init.lua
@@ -53,8 +53,6 @@ _G.load_config = function()
     indent_blankline_use_treesitter = true
   })
 
-  local luadev = require('lua-dev').setup()
-
   -- nvim-autopairs
   require('nvim-autopairs').setup()
   require('nvim-autopairs.completion.compe').setup({
@@ -324,42 +322,44 @@ _G.load_config = function()
   table.insert(runtime_path, 'lua/?.lua')
   table.insert(runtime_path, 'lua/?/init.lua')
 
-  require('lspconfig').sumneko_lua.setup {
-    cmd = { sumneko_binary },
-    commands = {
-      Format = {
-        function()
-          require('stylua-nvim').format_file()
-        end,
+  local luadev = require('lua-dev').setup{
+    lspconfig = {
+      cmd = { sumneko_binary },
+      commands = {
+        Format = {
+          function()
+            require('stylua-nvim').format_file()
+          end,
+        },
       },
-    },
-    on_attach = on_attach,
-    settings = {
-      Lua = {
-        runtime = {
-          -- Tell the language server which version of Lua you're using (most likely LuaJIT in the case of Neovim)
-          version = 'LuaJIT',
-          -- Setup your lua path
-          path = runtime_path,
-        },
-        diagnostics = {
-          -- Get the language server to recognize the `vim` global
-          globals = { 'vim' },
-        },
-        workspace = {
-          -- Make the server aware of Neovim runtime files
-          library = {
-            vim.api.nvim_get_runtime_file('', true),
-            luadev,
+      on_attach = on_attach,
+      settings = {
+        Lua = {
+          runtime = {
+            -- Tell the language server which version of Lua you're using (most likely LuaJIT in the case of Neovim)
+            version = 'LuaJIT',
+            -- Setup your lua path
+            path = runtime_path,
+          },
+          diagnostics = {
+            -- Get the language server to recognize the `vim` global
+            globals = { 'vim' },
+          },
+          workspace = {
+            -- Make the server aware of Neovim runtime files
+            library = {
+              vim.api.nvim_get_runtime_file('', true),
+            },
+          },
+          -- Do not send telemetry data containing a randomized but unique identifier
+          telemetry = {
+            enable = false,
           },
-        },
-        -- Do not send telemetry data containing a randomized but unique identifier
-        telemetry = {
-          enable = false,
         },
       },
     },
   }
+  require('lspconfig').sumneko_lua.setup(luadev)
 
   -- metals
   vim.g.metals_server_version = '0.10.5+64-3c83447e-SNAPSHOT'