diff --git a/configs/nixvim/fiesta/modules/setups/completion.nix b/configs/nixvim/fiesta/modules/setups/completion.nix
index fc232f49..ebc18e27 100644
--- a/configs/nixvim/fiesta/modules/setups/completion.nix
+++ b/configs/nixvim/fiesta/modules/setups/completion.nix
@@ -36,17 +36,15 @@ in
             groupIndex = 1;
           }
 
-          (lib.mkIf nixvimCfg.setups.snippets.enable {
-            name = "luasnip";
-            groupIndex = 2;
-          })
-
-          { name = "buffer"; }
-
           {
             name = "path";
             groupIndex = 3;
           }
+
+          {
+            name = "buffer";
+            groupIndex = 4;
+          }
         ];
       };
 
@@ -61,6 +59,19 @@ in
       plugins.cmp-dap.enable = true;
     })
 
+    (lib.mkIf nixvimCfg.setups.snippets.enable {
+      plugins.nvim-cmp.extraOptions.snippet.expand.__raw = ''
+        function(args)
+          require('luasnip').lsp_expand(args.body)
+        end
+      '';
+
+      plugins.nvim-cmp.sources = [{
+        name = "luasnip";
+        groupIndex = 2;
+      }];
+    })
+
     (lib.mkIf nixvimCfg.setups.treesitter.enable {
       plugins.cmp-treesitter.enable = true;
     })
diff --git a/configs/nixvim/fiesta/modules/setups/lsp.nix b/configs/nixvim/fiesta/modules/setups/lsp.nix
index e80dd4ec..6b3f5432 100644
--- a/configs/nixvim/fiesta/modules/setups/lsp.nix
+++ b/configs/nixvim/fiesta/modules/setups/lsp.nix
@@ -18,7 +18,7 @@ in
     plugins.lsp.enable = true;
 
     # Keymaps for moving around in the buffer.
-    plugins.keymaps.lspBuf = {
+    plugins.lsp.keymaps.lspBuf = {
       K = "hover";
       gD = "references";
       gd = "definition";
@@ -27,7 +27,7 @@ in
     };
 
     # Keymaps for moving around with the doctor.
-    plugins.keymaps.diagnostic = {
+    plugins.lsp.keymaps.diagnostic = {
       "<leader>j" = "goto_next";
       "<leader>k" = "goto_prev";
     };
diff --git a/configs/nixvim/fiesta/modules/setups/treesitter.nix b/configs/nixvim/fiesta/modules/setups/treesitter.nix
index 5edc17d3..a8837070 100644
--- a/configs/nixvim/fiesta/modules/setups/treesitter.nix
+++ b/configs/nixvim/fiesta/modules/setups/treesitter.nix
@@ -30,7 +30,7 @@ in
     plugins.treesitter-context = {
       enable = true;
       lineNumbers = true;
-      maxLines = 10;
+      maxLines = 7;
       mode = "cursor";
       separator = "*";
     };
diff --git a/configs/nixvim/fiesta/modules/setups/ui.nix b/configs/nixvim/fiesta/modules/setups/ui.nix
index 349cede4..4c9c21e4 100644
--- a/configs/nixvim/fiesta/modules/setups/ui.nix
+++ b/configs/nixvim/fiesta/modules/setups/ui.nix
@@ -31,7 +31,6 @@ in
     # Show them hidden suckers.
     options.list = true;
     options.listchars = {
-      eol = "↵";
       tab = "↦ *";
       trail = "·";
       nbsp = "%";
@@ -55,7 +54,6 @@ in
 
       sections = {
         lualine_a = [ "mode" ];
-        lualine_b = [ "filename" ];
         lualine_z = [ "location" ];
       };
     };