diff --git a/flake.nix b/flake.nix
index f3c258e..23e653c 100644
--- a/flake.nix
+++ b/flake.nix
@@ -14,6 +14,8 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
+    nixvim.url = "github:nix-community/nixvim";
+
     plasma-manager = {
       url = "github:pjones/plasma-manager";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -27,7 +29,6 @@
     # everything match nicely? Try nix-colors!
     nix-colors.url = "github:misterio77/nix-colors";
 
-    nixvim.url = "github:nix-community/nixvim";
 
   };
 
@@ -35,6 +36,7 @@
     self,
     nixpkgs,
     home-manager,
+    nixvim,
     plasma-manager,
     ros,
     agenix,
diff --git a/home-manager/traverseda/home.nix b/home-manager/traverseda/home.nix
index 243e67f..9dfe57f 100644
--- a/home-manager/traverseda/home.nix
+++ b/home-manager/traverseda/home.nix
@@ -10,14 +10,7 @@
 }: {
   # You can import other home-manager modules here
   imports = [
-    # If you want to use modules your own flake exports (from modules/home-manager):
-    # outputs.homeManagerModules.example
-
-    # Or modules exported from other flakes (such as nix-colors):
-    # inputs.nix-colors.homeManagerModules.default
-
-    # You can also split up your configuration and import pieces of it here:
-    # ./nvim.nix
+    inputs.nixvim.homeManagerModules.nixvim
   ];
 
   nixpkgs = {
@@ -82,19 +75,38 @@
     };
   };
 
-  programs.neovim = {
+  programs.nixvim = {
     enable = true;
     defaultEditor = true; 
     viAlias = true;
     vimAlias = true;
-    vimdiffAlias = true;
-    plugins = with pkgs.vimPlugins; [
-      nvim-lspconfig
-      nvim-treesitter.withAllGrammars 
-      vim-bufferline
-      tokyonight-nvim
+    plugins.bufferline.enable = true;
+    plugins.which-key.enable = true;
+    globals.mapleader = " ";
+    keymaps = [
       {
-        plugin = which-key-nvim;
+        mode = "n";
+        key = "<C-a>c";
+        options = { noremap = true; desc = "Open new terminal"; };
+        action = "<cmd>:term<cr>";
+      }
+      {
+        mode = "n";
+        key = "<C-a>x";
+        options = { noremap = true; desc = "Close tab"; };
+        action = "<cmd>:bd<cr>";
+      }
+      {
+        mode = "n";
+        key = "<C-a>s";
+        options = { noremap = true; desc = "Pick buffer"; };
+        action = "<cmd>:BufferLinePick<CR>";
+      }
+      {
+        mode = "t";
+        key = "<Esc><Esc>";
+        options = { noremap = true; };
+        action = "<C-\\><C-n>";
       }
     ];
   };
@@ -135,6 +147,7 @@
     pkgs.wl-clipboard
     pkgs.atool
     pkgs.zig
+    pkgs.comma
 
     (pkgs.nerdfonts.override { fonts = [ "FiraCode" "DroidSansMono" "Hack"]; })
 
diff --git a/home-manager/traverseda/kde-desktop.nix b/home-manager/traverseda/kde-desktop.nix
index 716bfb0..2002071 100644
--- a/home-manager/traverseda/kde-desktop.nix
+++ b/home-manager/traverseda/kde-desktop.nix
@@ -19,7 +19,7 @@
     #   colorScheme = "BreezeDark";
     # };
     shortcuts = {
-      "services.org.kde.konsole.desktop"."NewWindow" = "Meta+Return";
+      "services/org.kde.konsole.desktop"."_launch" = ["Meta+Return" "Ctrl+Alt+T"];
       "kwin"."Window Close" = ["Meta+Shift+C" "Alt+F4"];
       "kwin"."Cube" = "Meta+C";
     };
@@ -59,6 +59,7 @@
     configFile = {
       "kwinrc"."Desktops"."Number"."value" = 10;
       "kwinrc"."Desktops"."Rows"."value" = 2;
+      "kwinrc"."Plugins"."cubeEnabled" = true;
     };
   };
 }