diff --git a/helpers.nix b/helpers.nix
index 968e8d8..d67b96c 100644
--- a/helpers.nix
+++ b/helpers.nix
@@ -46,7 +46,7 @@ with inputs.nixpkgs.lib; {
     };
   in
     {
-      nixosConfigurations.${hostname} = nixosSystem {
+      nixosConfigurations.${hostname} = nixosSystem rec {
         inherit system pkgs;
 
         specialArgs = {
diff --git a/suites/common.nix b/suites/common.nix
index 26ca255..750581a 100644
--- a/suites/common.nix
+++ b/suites/common.nix
@@ -109,11 +109,11 @@ with lib; {
 
       keymaps = [
         {
-          key = "<Leader>tt";
-          action = "<cmd> ToggleTerm direction=float <CR>";
+          key = "<Leader>t";
+          action = "<cmd> ToggleTerm direction=horizontal <CR>";
         }
         {
-          key = "<Leader>xx";
+          key = "<Leader>x";
           action = "<cmd> Trouble diagnostics toggle focus=false<CR>";
         }
       ];
@@ -139,6 +139,7 @@ with lib; {
         colorizer.enable = true;
         comment.enable = true;
         gitsigns.enable = true;
+        lazygit.enable = true;
         lsp-format.enable = true;
         notify.enable = true;
         nvim-autopairs.enable = true;
@@ -175,18 +176,8 @@ with lib; {
                 "fallback"
               ];
             };
-            completion = {
-              menu.auto_show = true;
-              documentation.auto_show = true;
-              list.selection.preselect = false;
-            };
-            cmdline = {
-              keymap.preset = "inherit";
-              completion = {
-                menu.auto_show = true;
-                list.selection.preselect = false;
-              };
-            };
+            completion.menu.auto_show = true;
+            completion.documentation.auto_show = true;
           };
         };