diff --git a/flake.nix b/flake.nix
index ec41ffd..1beea8b 100644
--- a/flake.nix
+++ b/flake.nix
@@ -98,6 +98,11 @@
               help = "wrapper for nixos-rebuild switch";
               command = "sudo nixos-rebuild boot --flake . $@";
             }
+            {
+              name = "vim-startuptime";
+              help = "test vim startup time";
+              command = "${pkgs.lib.getExe pkgs.hyperfine} --warmup 5 --prepare 'sleep 2' 'vim -c exit'";
+            }
           ];
           packages = with pkgs; [
             stylua
diff --git a/hosts/nixos-laptop/default.nix b/hosts/nixos-laptop/default.nix
index 10754e9..14ac222 100644
--- a/hosts/nixos-laptop/default.nix
+++ b/hosts/nixos-laptop/default.nix
@@ -27,16 +27,19 @@
 
   users.users.moritz.packages = [ pkgs.poetry ];
 
-  home-manager.users.moritz.services.kanshi.profiles = {
-    undocked = {
-      outputs = [
+  home-manager.users.moritz.services.kanshi.settings = [
+    {
+      profile.name = "undocked";
+      profile.outputs = [
         {
           criteria = "eDP-1";
         }
       ];
-    };
-    docked = {
-      outputs = [
+
+    }
+    {
+      profile.name = "docked";
+      profile.outputs = [
         {
           criteria = "eDP-1";
           position = "640,1800"; # NOTE: 2160 / 1.2 = 1800
@@ -47,8 +50,9 @@
           position = "0,0";
         }
       ];
-    };
-  };
+
+    }
+  ];
 
   services.kanata = {
     enable = true;
diff --git a/modules/programs/nvim/default.nix b/modules/programs/nvim/default.nix
index 7e26b6e..458c420 100644
--- a/modules/programs/nvim/default.nix
+++ b/modules/programs/nvim/default.nix
@@ -46,6 +46,7 @@ in
         package = inputs.neovim-nightly-overlay.packages.${pkgs.system}.default;
         vimAlias = true;
         extraConfigLuaPre = readFile ./options.lua;
+        luaLoader.enable = true;
         performance = {
           byteCompileLua = {
             enable = true;
diff --git a/modules/programs/nvim/new_plugins/other.nix b/modules/programs/nvim/new_plugins/other.nix
index 1b5d7c4..a65cd02 100644
--- a/modules/programs/nvim/new_plugins/other.nix
+++ b/modules/programs/nvim/new_plugins/other.nix
@@ -29,41 +29,6 @@ in
         ];
       }
       { plugins.oil.enable = true; }
-      {
-        plugins = {
-          telescope = {
-            enable = true;
-            extensions.fzf-native.enable = true;
-            keymaps = {
-              "<leader>ff" = {
-                action = "find_files";
-                options.desc = "Find files";
-              };
-              "<leader>fb" = {
-                action = "buffers";
-                options.desc = "Find buffers";
-              };
-              "<leader>fl" = {
-                action = "current_buffer_fuzzy_find";
-                options.desc = "Search lines";
-              };
-              "<leader>fg" = {
-                action = "live_grep";
-                options.desc = "Live grep";
-              };
-              "<leader>fh" = {
-                action = "help_tags";
-                options.desc = "Help tags";
-              };
-              "<leader>fr" = {
-                action = "oldfiles";
-                options.desc = "Recent files";
-              };
-            };
-          };
-          web-devicons.enable = true;
-        };
-      }
       { plugins.nvim-autopairs.enable = true; }
       { plugins.vim-surround.enable = true; }
       {
@@ -84,6 +49,10 @@ in
       { plugins.friendly-snippets.enable = true; }
       { plugins.direnv.enable = true; }
       { plugins.crates-nvim.enable = true; }
+      {
+        plugins.helpview.enable = true;
+        performance.combinePlugins.standalonePlugins = [ "helpview.nvim" ];
+      }
     ];
   };
 }
diff --git a/modules/programs/nvim/new_plugins/telescope.nix b/modules/programs/nvim/new_plugins/telescope.nix
new file mode 100644
index 0000000..a0f6b4b
--- /dev/null
+++ b/modules/programs/nvim/new_plugins/telescope.nix
@@ -0,0 +1,39 @@
+_:
+
+{
+  home-manager.users.moritz.programs.nixvim = {
+    plugins = {
+      telescope = {
+        enable = true;
+        extensions.fzf-native.enable = true;
+        keymaps = {
+          "<leader>ff" = {
+            action = "find_files";
+            options.desc = "Find files";
+          };
+          "<leader>fb" = {
+            action = "buffers";
+            options.desc = "Find buffers";
+          };
+          "<leader>fl" = {
+            action = "current_buffer_fuzzy_find";
+            options.desc = "Search lines";
+          };
+          "<leader>fg" = {
+            action = "live_grep";
+            options.desc = "Live grep";
+          };
+          "<leader>fh" = {
+            action = "help_tags";
+            options.desc = "Help tags";
+          };
+          "<leader>fr" = {
+            action = "oldfiles";
+            options.desc = "Recent files";
+          };
+        };
+      };
+      web-devicons.enable = true;
+    };
+  };
+}
diff --git a/modules/programs/river/default.nix b/modules/programs/river/default.nix
index 9117504..774d1cb 100644
--- a/modules/programs/river/default.nix
+++ b/modules/programs/river/default.nix
@@ -273,27 +273,5 @@ in
       };
     };
     security.rtkit.enable = true;
-
-    home-manager.users.moritz.systemd.user.services =
-      let
-        units = [ "waybar" ];
-        mkAfter = _: {
-          Unit = {
-            After = [ "river-session.target" ];
-            Wants = [ "river-session.target" ];
-          };
-        };
-      in
-      lib.genAttrs units mkAfter;
-
-    systemd.user.services =
-      let
-        units = [ "pipewire" "xdg-desktop-portal" "wireplumber" ];
-        mkAfter = _: {
-          after = [ "river-session.target" ];
-          wants = [ "river-session.target" ];
-        };
-      in
-      lib.genAttrs units mkAfter;
   };
 }