yayayayayayayyayayayayayaya i love theprimeagen yayayayayayaya

Author: tjdevries

xdg_config/nvim/.gdb_history

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

xdg_config/nvim/after/ftplugin/typescript.vim

@@ -31,9 +31,11 @@ local cmp = require "cmp"
 
 cmp.setup {
   mapping = {
+    ["<C-n>"] = cmp.mapping.select_next_item { behavior = cmp.SelectBehavior.Insert },
+    ["<C-p>"] = cmp.mapping.select_prev_item { behavior = cmp.SelectBehavior.Insert },
     ["<C-d>"] = cmp.mapping.scroll_docs(-4),
     ["<C-f>"] = cmp.mapping.scroll_docs(4),
-    ["<C-e>"] = cmp.mapping.close(),
+    ["<C-e>"] = cmp.mapping.abort(),
     ["<c-y>"] = cmp.mapping(
       cmp.mapping.confirm {
         behavior = cmp.ConfirmBehavior.Insert,

xdg_config/nvim/after/plugin/completion.lua

@@ -2,6 +2,8 @@ if vim.g.snippets ~= "luasnip" or not pcall(require, "luasnip") then
   return
 end
 
+local make = R("tj.snips").make
+
 local ls = require "luasnip"
 local types = require "luasnip.util.types"
 
@@ -77,44 +79,18 @@ local events = require "luasnip.util.events"
 --   return ls.parser.parse_snippet({ trig = trig }, expanded)
 -- end
 
-local shortcut = function(val)
-  if type(val) == "string" then
-    return { t { val }, i(0) }
-  end
-
-  if type(val) == "table" then
-    for k, v in ipairs(val) do
-      if type(v) == "string" then
-        val[k] = t { v }
-      end
-    end
-  end
-
-  return val
-end
-
-local make = function(tbl)
-  local result = {}
-  for k, v in pairs(tbl) do
-    table.insert(result, (snippet({ trig = k, desc = v.desc }, shortcut(v))))
-  end
-
-  return result
-end
-
 local same = function(index)
   return f(function(args)
     return args[1]
   end, { index })
 end
 
-local snippets = {}
-
 local toexpand_count = 0
 
 -- `all` key means for all filetypes.
 -- Shared between all filetypes. Has lower priority than a particular ft tho
-snippets.all = {
+-- snippets.all = {
+ls.add_snippets(nil, {
   -- basic, don't need to know anything else
   --    arg 1: string
   --    arg 2: a node
@@ -202,31 +178,25 @@ snippets.all = {
 
   --
   -- ls.parser.parse_snippet({trig = "lsp"}, "$1 is ${2|hard,easy,challenging|}")
-}
-
-table.insert(snippets.all, ls.parser.parse_snippet("example", "-- $TM_FILENAME\nfunc $1($2) $3 {\n\t$0\n}"))
-
--- luasnip.lua
--- func() {}
-
-table.insert(
-  snippets.all,
-  snippet("cond", {
-    t "will only expand in c-style comments",
-  }, {
-    condition = function(
-      line_to_cursor --[[ , matched_trigger, captures ]]
-    )
-      local commentstring = "%s*" .. vim.bo.commentstring:gsub("%%s", "")
-      -- optional whitespace followed by //
-      return line_to_cursor:match(commentstring)
-    end,
-  })
-)
+})
+
+-- table.insert(
+--   snippets.all,
+--   snippet("cond", {
+--     t "will only expand in c-style comments",
+--   }, {
+--     condition = function(
+--       line_to_cursor --[[ , matched_trigger, captures ]]
+--     )
+--       local commentstring = "%s*" .. vim.bo.commentstring:gsub("%%s", "")
+--       -- optional whitespace followed by //
+--       return line_to_cursor:match(commentstring)
+--     end,
+--   })
+-- )
 
 -- Make sure to not pass an invalid command, as io.popen() may write over nvim-text.
-table.insert(
-  snippets.all,
+ls.add_snippets(nil, {
   snippet(
     { trig = "$$ (.*)", regTrig = true },
     f(function(_, snip, command)
@@ -247,30 +217,8 @@ table.insert(
         return false
       end,
     }
-  )
-)
-
--- Lambda example
-table.insert(
-  snippets.all,
-  snippet("transform2", {
-    i(1, "initial text here"),
-    t " :: ",
-    i(2, "replacement for text"),
-    t " :: ",
-    -- t { "", "" },
-    -- Lambdas can also apply transforms USING the text of other nodes:
-    l(l._1:gsub("text", l._2), { 1, 2 }),
-  })
-)
-
--- initial text :: this is going to be replaced :: initial tthis is going to be replacedxt
--- this is where we have text :: TEXT :: this is where we have TEXT
-
-for _, ft_path in ipairs(vim.api.nvim_get_runtime_file("lua/tj/snips/ft/*.lua", true)) do
-  local ft = vim.fn.fnamemodify(ft_path, ":t:r")
-  snippets[ft] = make(loadfile(ft_path)())
-end
+  ),
+})
 
 local js_attr_split = function(args)
   local val = args[1][1]
@@ -294,32 +242,31 @@ local fill_line = function(char)
   end
 end
 
-snippets.rst = make {
-  jsa = {
-    ":js:attr:`",
-    d(2, js_attr_split, { 1 }),
-    " <",
-    i(1),
-    ">",
-    "`",
-  },
-
-  link = { ".. _", i(1), ":" },
+ls.add_snippets(
+  "rst",
+  make {
+    jsa = {
+      ":js:attr:`",
+      d(2, js_attr_split, { 1 }),
+      " <",
+      i(1),
+      ">",
+      "`",
+    },
 
-  head = f(fill_line "=", {}),
-  sub = f(fill_line "-", {}),
-  subsub = f(fill_line "^", {}),
+    link = { ".. _", i(1), ":" },
 
-  ref = { ":ref:`", same(1), " <", i(1), ">`" },
-}
+    head = f(fill_line "=", {}),
+    sub = f(fill_line "-", {}),
+    subsub = f(fill_line "^", {}),
 
-ls.snippets = snippets
+    ref = { ":ref:`", same(1), " <", i(1), ">`" },
+  }
+)
 
-ls.autosnippets = {
-  all = {
-    ls.parser.parse_snippet("$file$", "$TM_FILENAME"),
-  },
-}
+for _, ft_path in ipairs(vim.api.nvim_get_runtime_file("lua/tj/snips/ft/*.lua", true)) do
+  loadfile(ft_path)()
+end
 
 -- <c-k> is my expansion key
 -- this will expand the current item or jump to the next item within the snippet.

xdg_config/nvim/after/plugin/luasnip.lua

@@ -84,3 +84,7 @@ require "tj.lsp"
 -- Telescope BTW
 require "tj.telescope.setup"
 require "tj.telescope.mappings"
+
+vim.keymap.set("n", "<space>hello", function()
+  print "live demos!!"
+end)

xdg_config/nvim/init.lua

@@ -86,7 +86,7 @@ local custom_attach = function(client)
   buf_inoremap { "<c-s>", vim.lsp.buf.signature_help }
 
   buf_nnoremap { "<space>cr", vim.lsp.buf.rename }
-  telescope_mapper("<space>ca", "lsp_code_actions", nil, true)
+  buf_nnoremap { "<space>ca", vim.lsp.buf.code_action }
 
   buf_nnoremap { "gd", vim.lsp.buf.definition }
   buf_nnoremap { "gD", vim.lsp.buf.declaration }
@@ -119,13 +119,15 @@ local custom_attach = function(client)
   end
 
   if client.resolved_capabilities.code_lens then
-    vim.cmd [[
-      augroup lsp_document_codelens
-        au! * <buffer>
-        autocmd BufEnter ++once         <buffer> lua require"vim.lsp.codelens".refresh()
-        autocmd BufWritePost,CursorHold <buffer> lua require"vim.lsp.codelens".refresh()
-      augroup END
-    ]]
+    if filetype ~= "elm" then
+      vim.cmd [[
+        augroup lsp_document_codelens
+          au! * <buffer>
+          autocmd BufEnter ++once         <buffer> lua require"vim.lsp.codelens".refresh()
+          autocmd BufWritePost,CursorHold <buffer> lua require"vim.lsp.codelens".refresh()
+        augroup END
+      ]]
+    end
   end
 
   -- Attach any filetype specific options to the client
@@ -206,6 +208,8 @@ local servers = {
   --     },
   -- },
 
+  elmls = true,
+
   tsserver = {
     init_options = ts_util.init_options,
     cmd = { "typescript-language-server", "--stdio" },

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

@@ -1,8 +1,11 @@
 local ls = require "luasnip"
 
+require("luasnip.session.snippet_collection").clear_snippets "go"
+
 -- 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
@@ -11,6 +14,7 @@ local fmt = require("luasnip.extras.fmt").fmt
 
 local shared = R "tj.snips"
 local same = shared.same
+local make = shared.make
 
 local ts_locals = require "nvim-treesitter.locals"
 local ts_utils = require "nvim-treesitter.ts_utils"
@@ -104,44 +108,47 @@ local go_ret_vals = function(args)
   )
 end
 
-local M = {
-  main = {
-    t { "func main() {", "\t" },
-    i(0),
-    t { "", "}" },
-  },
-
-  ef = {
-    i(1, { "val" }),
-    t ", err := ",
-    i(2, { "f" }),
-    t "(",
-    i(3),
-    t ")",
-    i(0),
-  },
-
-  efi = {
-    i(1, { "val" }),
-    ", ",
-    i(2, { "err" }),
-    " := ",
-    i(3, { "f" }),
-    "(",
-    i(4),
-    ")",
-    t { "", "if " },
-    same(2),
-    t { " != nil {", "\treturn " },
-    d(5, go_ret_vals, { 2, 3 }),
-    t { "", "}" },
-    i(0),
-  },
-
-  -- TODO: Fix this up so that it actually uses the tree sitter thing
-  ie = { "if err != nil {", "\treturn err", i(0), "}" },
-}
-
-M.f = fmt("func {}({}) {} {{\n\t{}\n}}", { i(1, "name"), i(2), i(3), i(0) })
+ls.add_snippets(
+  "go",
+  make {
+    main = {
+      t { "func main() {", "\t" },
+      i(0),
+      t { "", "}" },
+    },
+
+    ef = {
+      i(1, { "val" }),
+      t ", err := ",
+      i(2, { "f" }),
+      t "(",
+      i(3),
+      t ")",
+      i(0),
+    },
+
+    efi = {
+      i(1, { "val" }),
+      ", ",
+      i(2, { "err" }),
+      " := ",
+      i(3, { "f" }),
+      "(",
+      i(4),
+      ")",
+      t { "", "if " },
+      same(2),
+      t { " != nil {", "\treturn " },
+      d(5, go_ret_vals, { 2, 3 }),
+      t { "", "}" },
+      i(0),
+    },
+
+    -- TODO: Fix this up so that it actually uses the tree sitter thing
+    ie = { "if err != nil {", "\treturn err", i(0), "}" },
+  }
+)
 
-return M
+ls.add_snippets("go", {
+  s("f", fmt("func {}({}) {} {{\n\t{}\n}}", { i(1, "name"), i(2), i(3), i(0) })),
+})