going to barcelona for work, gotta push

Author: tjdevries

xdg_config/nvim/after/ftplugin/typescript.vim

@@ -1,8 +1,8 @@
 
-augroup MyTypescriptCommands
-  au!
-  " autocmd BufWritePost <buffer>  :silent! !prettier --write %
-augroup END
+" augroup MyTypescriptCommands
+"   au!
+"   autocmd BufWritePost <buffer>  :silent! Prettier
+" augroup END
 
 setlocal shiftwidth=4
 setlocal formatoptions-=o

xdg_config/nvim/after/plugin/lsiftyped.lua

@@ -3,10 +3,10 @@ if not ok then
   return
 end
 
-local group = vim.api.nvim_create_augroup("LsifTyped", { clear = true })
+local group = vim.api.nvim_create_augroup("scip", { clear = true })
 vim.api.nvim_create_autocmd("BufReadCmd", {
   group = group,
-  pattern = "*.lsif-typed",
+  pattern = "*.scip",
   callback = function()
     local bufnr = vim.api.nvim_get_current_buf()
     local file = vim.fn.expand "<afile>"
@@ -17,9 +17,9 @@ vim.api.nvim_create_autocmd("BufReadCmd", {
     Job
       :new({
         "protoc",
-        "--decode=lib.codeintel.lsiftyped.Index",
-        "--proto_path=/home/tjdevries/sourcegraph/sourcegraph.git/main/proto/lib/codeintel/lsiftyped",
-        "lsif.proto",
+        "--decode=scip.Index",
+        "--proto_path=/home/tjdevries/sourcegraph/scip/",
+        "scip.proto",
 
         writer = Job:new { "cat", file },
 

xdg_config/nvim/after/plugin/sourcegraph.lua

@@ -0,0 +1,8 @@
+if vim.g.dbs == nil then
+  vim.g.dbs = vim.empty_dict()
+end
+
+local dbs = vim.g.dbs
+dbs["sg-local"] = "postgres://sourcegraph:sourcegraph@localhost:5432/sourcegraph"
+
+vim.g.dbs = dbs

xdg_config/nvim/after/plugin/statusline.lua

@@ -110,7 +110,7 @@ require("el").setup {
       { " " },
       { sections.split, required = true },
       { git_icon },
-      { sections.maximum_width(builtin.make_responsive_file(140, 90), 0.40), required = true },
+      { sections.maximum_width(builtin.file_relative, 0.60), required = true },
       { sections.collapse_builtin { { " " }, { builtin.modified_flag } } },
       { sections.split, required = true },
       { diagnostic_display },

xdg_config/nvim/after/plugin/treesitter.lua

@@ -17,6 +17,14 @@ list.sql = {
   },
 }
 
+list.rsx = {
+  install_info = {
+    url = "https://github.com/tjdevries/tree-sitter-rsx",
+    files = { "src/parser.c", "src/scanner.cc" },
+    branch = "master",
+  },
+}
+
 -- list.lua = nil
 
 -- :h nvim-treesitter-query-extensions
@@ -58,6 +66,7 @@ local _ = require("nvim-treesitter.configs").setup {
     "go",
     "html",
     "javascript",
+    "json",
     "markdown",
     "python",
     "query",
@@ -70,7 +79,7 @@ local _ = require("nvim-treesitter.configs").setup {
   highlight = {
     enable = true,
     use_languagetree = false,
-    disable = { "json" },
+    -- disable = { "json" },
     custom_captures = custom_captures,
   },
 

xdg_config/nvim/init.lua

@@ -61,6 +61,12 @@ if require "tj.first_load"() then
   return
 end
 
+if vim.g.neovide then
+  vim.g.neovide_cursor_trail_legnth = 0
+  vim.g.neovide_cursor_animation_length = 0
+  vim.o.guifont = "Jetbrains Mono"
+end
+
 -- Leader key -> ","
 --
 -- In general, it's a good idea to set this early in your config, because otherwise

xdg_config/nvim/lua/tj/lsp/init.lua

@@ -23,7 +23,6 @@ local ts_util = require "nvim-lsp-ts-utils"
 -- require("vim.lsp.log").set_level "trace"
 
 local status = require "tj.lsp.status"
-print("STATUS", status)
 if status then
   status.activate()
 end
@@ -33,32 +32,49 @@ local custom_init = function(client)
   client.config.flags.allow_incremental_sync = true
 end
 
+local augroup_format = vim.api.nvim_create_augroup("my_lsp_format", { clear = true })
+local autocmd_format = function(async, filter)
+  vim.api.nvim_clear_autocmds { buffer = 0, group = augroup_format }
+  vim.api.nvim_create_autocmd("BufWritePre", {
+    buffer = 0,
+    callback = function()
+      vim.lsp.buf.format { async = async, filter = filter }
+    end,
+  })
+end
+
 local filetype_attach = setmetatable({
-  go = function(client)
-    vim.cmd [[
-      augroup lsp_buf_format
-        au! BufWritePre <buffer>
-        autocmd BufWritePre <buffer> :lua vim.lsp.buf.formatting_sync()
-      augroup END
-    ]]
+  go = function()
+    autocmd_format(false)
+  end,
+
+  scss = function()
+    autocmd_format(false)
+  end,
+
+  css = function()
+    autocmd_format(false)
   end,
 
   rust = function()
+    -- vim.cmd [[
+    --   autocmd BufEnter,BufWritePost <buffer> :lua require('lsp_extensions.inlay_hints').request {aligned = true, prefix = " » "}
+    -- ]]
+
     telescope_mapper("<space>wf", "lsp_workspace_symbols", {
       ignore_filename = true,
       query = "#",
     }, true)
 
-    -- vim.cmd [[
-    --   autocmd BufEnter,BufWritePost <buffer> :lua require('lsp_extensions.inlay_hints').request {aligned = true, prefix = " » "}
-    -- ]]
+    autocmd_format(false)
+  end,
 
-    vim.cmd [[
-      augroup lsp_buf_format
-        au! BufWritePre <buffer>
-        autocmd BufWritePre <buffer> :lua vim.lsp.buf.formatting_sync()
-      augroup END
-    ]]
+  typescript = function()
+    autocmd_format(false, function(clients)
+      return vim.tbl_filter(function(client)
+        return client.name ~= "tsserver"
+      end, clients)
+    end)
   end,
 }, {
   __index = function()
@@ -117,6 +133,8 @@ local custom_attach = function(client)
 
   -- Set autocommands conditional on server_capabilities
   if client.server_capabilities.documentHighlightProvider then
+    P(client.server_capabilities.documentHighlightProvider)
+
     vim.cmd [[
       augroup lsp_document_highlight
         autocmd! * <buffer>
@@ -213,12 +231,9 @@ local servers = {
   rust_analyzer = {
     cmd = { "rustup", "run", "nightly", "rust-analyzer" },
   },
-  --   settings = {
-  --     ["rust-analyzer"] = {
-  --     },
-  -- },
 
   elmls = true,
+  cssls = true,
 
   tsserver = {
     init_options = ts_util.init_options,
@@ -348,14 +363,15 @@ end
 -- }
 
 -- Set up null-ls
-local use_null = false
+local use_null = true
 if use_null then
   require("null-ls").setup {
     sources = {
       -- require("null-ls").builtins.formatting.stylua,
       -- require("null-ls").builtins.diagnostics.eslint,
       -- require("null-ls").builtins.completion.spell,
-      require("null-ls").builtins.diagnostics.selene,
+      -- require("null-ls").builtins.diagnostics.selene,
+      require("null-ls").builtins.formatting.prettierd,
     },
   }
 end

xdg_config/nvim/lua/tj/plugins.lua

@@ -1,6 +1,11 @@
 _ = vim.cmd [[packadd packer.nvim]]
 _ = vim.cmd [[packadd vimball]]
 
+-- vim.api.nvim_cmd({
+--   cmd = "packadd",
+--   args = { "packer.vim" },
+-- }, {})
+
 local has = function(x)
   return vim.fn.has(x) == 1
 end
@@ -51,8 +56,10 @@ return require("packer").startup {
     end
 
     use "wbthomason/packer.nvim"
+
+    -- Alternative to impatient, uses sqlite. Faster ;)
+    -- use https://github.com/tami5/impatient.nvim
     -- use "lewis6991/impatient.nvim"
-    -- use "camspiers/snap"
 
     -- My Plugins
     local_use("ThePrimeagen", "refactoring.nvim")
@@ -171,6 +178,15 @@ return require("packer").startup {
       use { "nvim-telescope/telescope-arecibo.nvim", rocks = { "openssl", "lua-http-parser" } }
     end
 
+    if executable "jq" then
+      use {
+        "NTBBloodbath/rest.nvim",
+        config = function()
+          require("rest-nvim").setup()
+        end,
+      }
+    end
+
     use {
       "antoinemadec/FixCursorHold.nvim",
       run = function()

xdg_config/nvim/lua/tj/snips/ft/rust.lua

@@ -1,8 +1,10 @@
 local ls = require "luasnip"
+local snippet_collection = require "luasnip.session.snippet_collection"
 
 -- local snippet = ls.s
 -- local snippet_from_nodes = ls.sn
 
+local s = ls.s
 local i = ls.insert_node
 local t = ls.text_node
 -- local d = ls.dynamic_node
@@ -13,67 +15,74 @@ local fmt = require("luasnip.extras.fmt").fmt
 local shared = R "tj.snips"
 local same = shared.same
 
-return {
-  main = fmt(
-    [[
+-- ls.cl
+snippet_collection.clear_snippets "rust"
+ls.add_snippets("rust", {
+  s(
+    "main",
+    fmt(
+      [[
     fn main() {{
     }}
     ]],
-    {}
+      {}
+    )
   ),
-
-  modtest = fmt(
-    [[
+  s(
+    "modtest",
+    fmt(
+      [[
       #[cfg(test)]
       mod test {{
           use super::*;
 
           {}
       }}
     ]],
-    i(0)
+      i(0)
+    )
   ),
-
-  test = fmt(
-    [[
-      #[test]
-      fn {}(){}{{
-          {}
-      }}
-    ]],
-    {
-      i(1, "testname"),
-      c(2, {
-        t "",
-        t " -> Result<()> ",
-        -- fmt(" -> {}<()> ", { i(nil, "Result") }),
-      }),
-      i(0),
-    }
+  s(
+    { trig = "test" },
+    fmt(
+      [[
+  #[test]
+  fn {}(){}{{
+    {}
+  }}
+  ]],
+      {
+        i(1, "testname"),
+        c(2, {
+          t "",
+          t " -> Result<()> ",
+          -- fmt(" -> {}<()> ", { i(nil, "Result") }),
+        }),
+        i(0),
+      }
+    )
   ),
-
-  eq = fmt("assert_eq!({}, {});{}", { i(1), i(2), i(0) }),
-
-  enum = {
+  s("eq", fmt("assert_eq!({}, {});{}", { i(1), i(2), i(0) })),
+  s("enum", {
     t { "#[derive(Debug, PartialEq)]", "enum " },
     i(1, "Name"),
     t { " {", "  " },
     i(0),
     t { "", "}" },
-  },
+  }),
 
-  struct = {
+  s("struct", {
     t { "#[derive(Debug, PartialEq)]", "struct " },
     i(1, "Name"),
     t { " {", "    " },
     i(0),
     t { "", "}" },
-  },
+  }),
 
-  pd = fmt([[println!("{}: {{:?}}", {});]], { same(1), i(1) }),
+  s("pd", fmt([[println!("{}: {{:?}}", {});]], { same(1), i(1) })),
   -- _pd = {
   --   t [[println!("{:?}", ]],
   --   i(1),
   --   t [[);]],
   -- },
-}
+})

xdg_config/nvim/lua/tj/telescope/mappings.lua

@@ -31,6 +31,7 @@ vim.api.nvim_set_keymap("c", "<c-r><c-r>", "<Plug>(TelescopeFuzzyCommandSearch)"
 -- Dotfiles
 map_tele("<leader>en", "edit_neovim")
 map_tele("<leader>ez", "edit_zsh")
+map_tele("<space><space>d", "diagnostics")
 
 -- Search
 -- TODO: I would like to completely remove _mock from my search results here when I'm in SG/SG