diff --git a/nvim/after/lsp/cfn-lint.lua b/nvim/after/lsp/cfn-lint.lua
index e69de29..a564707 100644
--- a/nvim/after/lsp/cfn-lint.lua
+++ b/nvim/after/lsp/cfn-lint.lua
@@ -0,0 +1 @@
+return {}
diff --git a/nvim/after/lsp/ts_ls.lua b/nvim/after/lsp/ts_ls.lua
index e69de29..a564707 100644
--- a/nvim/after/lsp/ts_ls.lua
+++ b/nvim/after/lsp/ts_ls.lua
@@ -0,0 +1 @@
+return {}
diff --git a/nvim/after/lsp/yamlls.lua b/nvim/after/lsp/yamlls.lua
index fad7dde..3da2393 100644
--- a/nvim/after/lsp/yamlls.lua
+++ b/nvim/after/lsp/yamlls.lua
@@ -3,6 +3,30 @@ return {
         yaml = {
             schemaStore = {
                 enable = true
+            },
+            format = {
+                enable = true,
+                singleQuote = true
+            },
+            customTags = {
+                "!fn",
+                "!And",
+                "!If",
+                "!Not",
+                "!Equals",
+                "!Or",
+                "!FindInMap sequence",
+                "!Base64",
+                "!Cidr",
+                "!Ref",
+                "!Ref Scalar",
+                "!Sub",
+                "!GetAtt",
+                "!GetAZs",
+                "!ImportValue",
+                "!Select",
+                "!Split",
+                "!Join sequence"
             }
         }
     }
diff --git a/nvim/lua/plugins.lua b/nvim/lua/plugins.lua
index b83c8dd..05c398d 100644
--- a/nvim/lua/plugins.lua
+++ b/nvim/lua/plugins.lua
@@ -22,7 +22,8 @@ require('lazy').setup({
     require('plugins.dap-python'),       -- Debug plugin settings specifically for python
     require('plugins.treesitter'),       -- Treesitter syntax highlighting and tree support
     require('plugins.gitsigns'),         -- Gutter symbols for Git status and quick actions for Git operations
-    require('plugins.luasnip'),          -- Snippet enging
+    require('plugins.luasnip'),          -- Snippet engine
+    -- require('plugins.nvim-lint'),        -- Linter loader
     require('plugins.nvim-cmp'),         -- Autocompletion engine
     require('plugins.lualine'),          -- Status line
     require('plugins.telekasten'),       -- Note taking setup
diff --git a/nvim/lua/plugins/dap.lua b/nvim/lua/plugins/dap.lua
index f29c0cf..ab42709 100644
--- a/nvim/lua/plugins/dap.lua
+++ b/nvim/lua/plugins/dap.lua
@@ -1,12 +1,8 @@
 return {
     'mfussenegger/nvim-dap',
     dependencies = {
-        {
-            'jay-babu/mason-nvim-dap.nvim'
-        },
-        {
-            'nvim-neotest/nvim-nio',
-        },
+        { 'jay-babu/mason-nvim-dap.nvim' },
+        { 'nvim-neotest/nvim-nio' },
         {
             'rcarriga/nvim-dap-ui',
             config = function()
@@ -140,8 +136,6 @@ return {
                 }
             }
         }
-
-        -- require('dap.ext.vscode').load_launchjs('.launch.json', {})
     end,
     keys = {
         {
diff --git a/nvim/lua/plugins/lspconfig.lua b/nvim/lua/plugins/lspconfig.lua
index eafa1fa..b15ae8f 100644
--- a/nvim/lua/plugins/lspconfig.lua
+++ b/nvim/lua/plugins/lspconfig.lua
@@ -21,7 +21,6 @@ return {
                 local bufopts = { noremap = true, silent = true, buffer = bufnr }
                 vim.keymap.set('n', '<C-[>', vim.diagnostic.goto_prev, bufopts)
                 vim.keymap.set('n', '<C-]>', vim.diagnostic.goto_next, bufopts)
-                -- vim.keymap.set('n', 'gl', vim.diagnostic.open_float, bufopts)
                 vim.keymap.set('n', 'ga', vim.lsp.buf.code_action, bufopts)
                 vim.keymap.set('n', 'gD', vim.lsp.buf.declaration, bufopts)
                 vim.keymap.set('n', 'gd', vim.lsp.buf.definition, bufopts)
diff --git a/nvim/lua/plugins/nvim-cmp.lua b/nvim/lua/plugins/nvim-cmp.lua
index a209e2e..bd3d637 100644
--- a/nvim/lua/plugins/nvim-cmp.lua
+++ b/nvim/lua/plugins/nvim-cmp.lua
@@ -65,26 +65,11 @@ return {
         })
     end,
     dependencies = {
-        {
-            'hrsh7th/cmp-nvim-lsp',
-            lazy = false,
-        },
-        {
-            'hrsh7th/cmp-buffer',
-            lazy = false,
-        },
-        {
-            'hrsh7th/cmp-path',
-            lazy = false,
-        },
-        {
-            'hrsh7th/cmp-cmdline',
-            lazy = false,
-        },
-        {
-            'L3MON4D3/LuaSnip',
-            lazy = false,
-        },
+        { 'hrsh7th/cmp-nvim-lsp', lazy = false },
+        { 'hrsh7th/cmp-buffer',   lazy = false },
+        { 'hrsh7th/cmp-path',     lazy = false },
+        { 'hrsh7th/cmp-cmdline',  lazy = false },
+        { 'L3MON4D3/LuaSnip',     lazy = false },
     },
     event = 'InsertEnter',
     lazy = false,
diff --git a/nvim/lua/plugins/nvim-lint.lua b/nvim/lua/plugins/nvim-lint.lua
new file mode 100644
index 0000000..7fd2836
--- /dev/null
+++ b/nvim/lua/plugins/nvim-lint.lua
@@ -0,0 +1,8 @@
+return {
+    'mfussenegger/nvim-lint',
+    config = function()
+        require('lint').linters_by_ft = {
+            yaml = {'cfn-lint'}
+        }
+    end,
+}
diff --git a/nvim/snippets/python.lua b/nvim/snippets/python.lua
index 014e499..97dfd2f 100644
--- a/nvim/snippets/python.lua
+++ b/nvim/snippets/python.lua
@@ -1,10 +1,10 @@
-local ls = require('plugins.luasnip')
+local ls = require('luasnip')
 local s = ls.snippet
 local i = ls.insert_node
 local t = ls.text_node
-local l = require('plugins.luasnip.extras').lambda
-local fmt = require('plugins.luasnip.extras.fmt').fmt
-local ts_post  = require('plugins.luasnip.extras.treesitter_postfix').treesitter_postfix
+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({
@@ -21,15 +21,14 @@ return {
     }, fmt([[
         ''' {}
 
-        Parameters:
-            {} () -
+        Keyword arguments:
+        {} () -
 
         Returns:
-            {} -
-            {}
+        {} - {}
         '''
     ]], {
-        i(1),
+        i(1, 'Description'),
         l(l.LS_TSCAPTURE_PARAMS),
         l(l.LS_TSCAPTURE_RETURN),
         l(l.LS_TSDATA),
diff --git a/zsh/zshrc b/zsh/zshrc
index 5f64495..2e87cca 100644
--- a/zsh/zshrc
+++ b/zsh/zshrc
@@ -3,6 +3,8 @@
 # zmodload zsh/zprof
 
 path=(
+    /opt/homebrew/bin
+    /opt/homebrew/sbin
     $GOPATH/bin
     $HOME/.cargo/bin
     $HOME/.local/bin