flake.nix

@@ -98,11 +98,6 @@
               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

hosts/nixos-laptop/default.nix

@@ -27,19 +27,16 @@
 
   users.users.moritz.packages = [ pkgs.poetry ];
 
-  home-manager.users.moritz.services.kanshi.settings = [
-    {
-      profile.name = "undocked";
-      profile.outputs = [
+  home-manager.users.moritz.services.kanshi.profiles = {
+    undocked = {
+      outputs = [
         {
           criteria = "eDP-1";
         }
       ];
-
-    }
-    {
-      profile.name = "docked";
-      profile.outputs = [
+    };
+    docked = {
+      outputs = [
         {
           criteria = "eDP-1";
           position = "640,1800"; # NOTE: 2160 / 1.2 = 1800
@@ -50,9 +47,8 @@
           position = "0,0";
         }
       ];
-
-    }
-  ];
+    };
+  };
 
   services.kanata = {
     enable = true;

modules/programs/nvim/default.nix

@@ -46,7 +46,6 @@ in
         package = inputs.neovim-nightly-overlay.packages.${pkgs.system}.default;
         vimAlias = true;
         extraConfigLuaPre = readFile ./options.lua;
-        luaLoader.enable = true;
         performance = {
           byteCompileLua = {
             enable = true;

modules/programs/nvim/new_plugins/other.nix

@@ -29,6 +29,41 @@ 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; }
       {
@@ -49,10 +84,6 @@ in
       { plugins.friendly-snippets.enable = true; }
       { plugins.direnv.enable = true; }
       { plugins.crates-nvim.enable = true; }
-      {
-        plugins.helpview.enable = true;
-        performance.combinePlugins.standalonePlugins = [ "helpview.nvim" ];
-      }
     ];
   };
 }

modules/programs/nvim/new_plugins/telescope.nix

@@ -1,39 +0,0 @@
-_:
-
-{
-  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;
-    };
-  };
-}

modules/programs/river/default.nix

@@ -273,5 +273,27 @@ 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;
   };
 }