diff --git a/config/config.nix b/config/config.nix
deleted file mode 100644
index 0c7e5db..0000000
--- a/config/config.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ ... }:
-{
-  colorschemes.catppuccin = {
-    enable = true;
-    settings.flavour = "latte";
-  };
-
-  globalOpts = {
-    number = true;
-    relativenumber = true;
-
-    signcolumn = "yes";
-
-    # Tab defaults (might get overwritten by an LSP server)
-    tabstop = 2;
-    shiftwidth = 2;
-    softtabstop = 0;
-    expandtab = true;
-    smarttab = true;
-  };
-
-  globals.mapleader = " ";
-}
diff --git a/config/default.nix b/config/default.nix
index 39ffac1..eb4d76f 100644
--- a/config/default.nix
+++ b/config/default.nix
@@ -3,7 +3,26 @@
   imports = [
     ./bufferline.nix
     ./plugins.nix
-    ./config.nix
-    ./keys.nix
   ];
+
+  colorschemes.catppuccin = {
+    enable = true;
+    settings.flavour = "latte";
+  };
+
+  globalOpts = {
+    number = true;
+    relativenumber = true;
+
+    signcolumn = "yes";
+
+    # Tab defaults (might get overwritten by an LSP server)
+    tabstop = 4;
+    shiftwidth = 4;
+    softtabstop = 0;
+    expandtab = true;
+    smarttab = true;
+  };
+
+  globals.mapleader = " ";
 }
diff --git a/config/keys.nix b/config/keys.nix
index da2e4b9..9d0261e 100644
--- a/config/keys.nix
+++ b/config/keys.nix
@@ -2,13 +2,11 @@
   keymaps = [
     # chad tree
     {
-      mode = "n";
       action = "<cmd>CHADopen<cr>";
       key = "<leader>e";
       options = {
         desc = "Open ChadTree";
       };
     }
-
   ];
 }
diff --git a/config/plugins.nix b/config/plugins.nix
index f419ae7..3b6bf91 100644
--- a/config/plugins.nix
+++ b/config/plugins.nix
@@ -12,11 +12,7 @@
         asm_lsp.enable = true;
         gopls.enable = true;
         java_language_server.enable = true;
-        rust_analyzer = {
-          enable = true;
-          installRustc = true;
-          installCargo = true;
-        };
+        rust-analyzer.enable = true;
         nil_ls.enable = true;
         marksman.enable = true;
       };
@@ -78,8 +74,6 @@
       enable = true;
     };
 
-    lualine.enable = true;
-
     neotest = {
       enable = true;
       adapters = {
@@ -89,7 +83,5 @@
         go.enable = true;
       };
     };
-
-    lsp-lines.enable = true;
   };
 }