From dd63dfd57e41ccb47c8c3fd5a5bcdea6126ee329 Mon Sep 17 00:00:00 2001
From: FaultyBranches <contact@faultybranches.net>
Date: Tue, 7 Apr 2026 08:03:21 -0500
Subject: [PATCH] fix: Removing several bits that were superfluous or were
 causing issues. Disabling nvim-lint and calls to cfn-lint for now. Found and
 removed the issue with completion causing odd failures on expansion.

---
 nvim/after/lsp/yamlls.lua      |  6 +++---
 nvim/lua/plugins/lspconfig.lua |  2 +-
 nvim/lua/plugins/lualine.lua   |  7 +++++++
 nvim/lua/plugins/nvim-cmp.lua  |  6 ------
 nvim/lua/plugins/nvim-lint.lua |  2 +-
 nvim/snippets/python.lua       | 32 ++++++++++++++++----------------
 6 files changed, 28 insertions(+), 27 deletions(-)

diff --git a/nvim/after/lsp/yamlls.lua b/nvim/after/lsp/yamlls.lua
index 3da2393..37e648e 100644
--- a/nvim/after/lsp/yamlls.lua
+++ b/nvim/after/lsp/yamlls.lua
@@ -1,9 +1,9 @@
 return {
     settings = {
         yaml = {
-            schemaStore = {
-                enable = true
-            },
+            -- schemaStore = {
+                -- enable = true
+            -- },
             format = {
                 enable = true,
                 singleQuote = true
diff --git a/nvim/lua/plugins/lspconfig.lua b/nvim/lua/plugins/lspconfig.lua
index b15ae8f..fc7f34c 100644
--- a/nvim/lua/plugins/lspconfig.lua
+++ b/nvim/lua/plugins/lspconfig.lua
@@ -35,6 +35,6 @@ return {
         })
 
         vim.lsp.enable('gdscript')
-        vim.lsp.enable('cfn-lint')
+        -- vim.lsp.enable('cfn-lint')
     end
 }
diff --git a/nvim/lua/plugins/lualine.lua b/nvim/lua/plugins/lualine.lua
index 3d6b5b4..45a804d 100644
--- a/nvim/lua/plugins/lualine.lua
+++ b/nvim/lua/plugins/lualine.lua
@@ -2,6 +2,13 @@ return {
     'nvim-lualine/lualine.nvim',
     config = function()
         require('lualine').setup {
+            -- options = {
+                -- component_separators = { left = '\\', right = '/' },
+                -- component_separators = { left = '⧹', right = '⧸' },
+                -- section_separators = { left = '', right = '' },
+                -- globalstatus = true,
+                -- theme = 'gruvbox',
+            -- },
             tabline = {
                 lualine_a = {
                     'tabs',
diff --git a/nvim/lua/plugins/nvim-cmp.lua b/nvim/lua/plugins/nvim-cmp.lua
index bd3d637..b7305f1 100644
--- a/nvim/lua/plugins/nvim-cmp.lua
+++ b/nvim/lua/plugins/nvim-cmp.lua
@@ -3,11 +3,6 @@ return {
     config = function()
         local cmp = require('cmp')
         cmp.setup {
-            snippet = {
-                expand = function(args)
-                    require('plugins.luasnip').lsp_expand(args.body)
-                end,
-            },
             completion = {
                 completeopt = 'menu,menuone,noinsert',
             },
@@ -51,7 +46,6 @@ return {
             mapping = cmp.mapping.preset.cmdline(),
             sources = cmp.config.sources({
                 { name = 'path' },
-                -- { name = 'buffer' },
             }, {
                 { name = 'cmdline' },
             })
diff --git a/nvim/lua/plugins/nvim-lint.lua b/nvim/lua/plugins/nvim-lint.lua
index 7fd2836..031d84a 100644
--- a/nvim/lua/plugins/nvim-lint.lua
+++ b/nvim/lua/plugins/nvim-lint.lua
@@ -2,7 +2,7 @@ return {
     'mfussenegger/nvim-lint',
     config = function()
         require('lint').linters_by_ft = {
-            yaml = {'cfn-lint'}
+            -- yaml = {'cfn-lint'}
         }
     end,
 }
diff --git a/nvim/snippets/python.lua b/nvim/snippets/python.lua
index 97dfd2f..6bbd1ba 100644
--- a/nvim/snippets/python.lua
+++ b/nvim/snippets/python.lua
@@ -1,10 +1,10 @@
-local ls = require('luasnip')
-local s = ls.snippet
-local i = ls.insert_node
-local t = ls.text_node
-local l = require('luasnip.extras').lambda
-local fmt = require('luasnip.extras.fmt').fmt
-local ts_post  = require('luasnip.extras.treesitter_postfix').treesitter_postfix
+local ls      = require('luasnip')
+local s       = ls.snippet
+local i       = ls.insert_node
+local t       = ls.text_node
+local l       = require('luasnip.extras').lambda
+local fmt     = require('luasnip.extras.fmt').fmt
+local ts_post = require('luasnip.extras.treesitter_postfix').treesitter_postfix
 
 return {
     ts_post({
@@ -24,7 +24,7 @@ return {
         Keyword arguments:
         {} () -
 
-        Returns:
+        Return:
         {} - {}
         '''
     ]], {
@@ -33,12 +33,12 @@ return {
         l(l.LS_TSCAPTURE_RETURN),
         l(l.LS_TSDATA),
     })),
-    s(
-        { trig = "thingy" },
-        { t('Woot!') }
-    ),
-    s(
-        { trig = 'thingy2' },
-        { t('Woot2!') }
-    )
+    -- s(
+        -- { trig = "thingy" },
+        -- { t('Woot!') }
+    -- ),
+    -- s(
+        -- { trig = 'thingy2' },
+        -- { t('Woot2!') }
+    -- )
 }