From defbc1320fc39dec5c82cfdb7704012c8b735840 Mon Sep 17 00:00:00 2001
From: Rudis Muiznieks <rudis@sitosis.com>
Date: Sat, 14 Jan 2023 07:51:16 -0600
Subject: [PATCH] switched nvim to luasnip

---
 herbstluftwm/autostart    |  1 +
 nvim/lua/plugins-conf.lua | 10 ++++++++--
 nvim/lua/plugins.lua      | 16 ++++++++++------
 nvim/snippets/cs.snippets | 11 +++++++++++
 4 files changed, 30 insertions(+), 8 deletions(-)
 create mode 100644 nvim/snippets/cs.snippets

diff --git a/herbstluftwm/autostart b/herbstluftwm/autostart
index d3d54d9..7450a56 100755
--- a/herbstluftwm/autostart
+++ b/herbstluftwm/autostart
@@ -157,6 +157,7 @@ hc rule class='nvim-zen' fullscreen=on
 hc rule class='mpv' floating=on
 hc rule class='sim_arduboy' floating=on
 hc rule class='XNots' floating=on
+hc rule class='Pithos' floating=on
 
 hc set tree_style '╾│ ├└╼─┐'
 
diff --git a/nvim/lua/plugins-conf.lua b/nvim/lua/plugins-conf.lua
index 50c7fa7..afe08ca 100644
--- a/nvim/lua/plugins-conf.lua
+++ b/nvim/lua/plugins-conf.lua
@@ -12,6 +12,11 @@ vim.g.catppuccin_flavour = 'mocha'
 require('catppuccin').setup()
 vim.cmd [[colorscheme catppuccin]]
 
+-- load snippets
+require('luasnip.loaders.from_snipmate').lazy_load({
+  paths = "~/.config/nvim/snippets"
+})
+
 -- replace built in selector with telescope
 require('telescope').setup {
   extensions = {
@@ -29,7 +34,7 @@ local cmp = require 'cmp'
 cmp.setup {
   snippet = {
     expand = function(args)
-      vim.fn["vsnip#anonymous"](args.body)
+      require'luasnip'.lsp_expand(args.body)
     end,
   },
   mapping = {
@@ -43,7 +48,8 @@ cmp.setup {
   preselect = cmp.PreselectMode.None,
   confirmation = { get_commit_characters = function(_) return {} end },
   sources = {
-    { name = 'nvim_lsp',  },
+    { name = 'luasnip' },
+    { name = 'nvim_lsp' },
     { name = 'buffer' },
     { name = 'path' },
   },
diff --git a/nvim/lua/plugins.lua b/nvim/lua/plugins.lua
index 2f844db..be2f6b8 100644
--- a/nvim/lua/plugins.lua
+++ b/nvim/lua/plugins.lua
@@ -15,12 +15,16 @@ return require('packer').startup(function()
   use 'nvim-telescope/telescope-ui-select.nvim' -- selector
   use 'gpanders/editorconfig.nvim'
   use 'neovim/nvim-lspconfig'
-  use 'hrsh7th/nvim-cmp' -- autocomplete
-  use 'hrsh7th/cmp-vsnip' -- autocomplete
-  use 'hrsh7th/vim-vsnip' -- autocomplete
-  use 'hrsh7th/cmp-nvim-lsp' -- lsp autocomplete
-  use 'hrsh7th/cmp-buffer' -- buffer autocomplete
-  use 'hrsh7th/cmp-path' -- path autocompletes
+  use 'L3MON4D3/LuaSnip' -- snipets
+  use {
+    'hrsh7th/nvim-cmp', -- autocomplete
+    requires = {
+      {'saadparwaiz1/cmp_luasnip'}, -- autocomplete snips
+      {'hrsh7th/cmp-nvim-lsp'}, -- lsp autocomplete
+      {'hrsh7th/cmp-buffer'}, -- buffer autocomplete
+      {'hrsh7th/cmp-path'}, -- path autocompletes
+    }
+  }
   use { -- gitgutter replacement
     'lewis6991/gitsigns.nvim',
     requires = {
diff --git a/nvim/snippets/cs.snippets b/nvim/snippets/cs.snippets
new file mode 100644
index 0000000..709e565
--- /dev/null
+++ b/nvim/snippets/cs.snippets
@@ -0,0 +1,11 @@
+# inline xml documentation
+snippet ///
+	/// <summary>
+	/// ${0}
+	/// </summary>
+snippet <p
+	<param name="${1}">${2:$1}</param>
+snippet <r
+	<returns>${1}</returns>
+snippet <rem
+	<remarks>${1}</remarks>