Merge c6c1094ed9 into c957b23aaa

.github/CONTRIBUTING.md

@@ -16,7 +16,7 @@ If you have any questions regarding those files, feel free to open an issue or [
 
 ## Contributing
 
-The contribution process is mostly documented in the [pull request template](.github/pull_request_template.md). You will find a checklist of items to complete before submitting a pull request. Please make sure you complete it before submitting a pull request. If you are unsure about any of the items, please ask.
+The contribution process is mostly documented in the [pull request template](pull_request_template.md). You will find a checklist of items to complete before submitting a pull request. Please make sure you complete it before submitting a pull request. If you are unsure about any of the items, please ask.
 
 ### Guidelines
 

modules/plugins/ui/edgy-nvim/config.nix

@@ -4,7 +4,8 @@
   ...
 }: let
   inherit (lib.modules) mkIf;
-  inherit (lib.nvim.dag) entryAnywhere;
+  inherit (lib.strings) optionalString;
+  inherit (lib.nvim.dag) entryBefore;
   inherit (lib.nvim.lua) toLuaObject;
 
   cfg = config.vim.ui.edgy-nvim;
@@ -12,7 +13,18 @@ in {
   config = mkIf cfg.enable {
     vim = {
       startPlugins = ["edgy-nvim"];
-      pluginRC.edgy-nvim = entryAnywhere "require('edgy').setup(${toLuaObject cfg.setupOpts})";
+      pluginRC.edgy-nvim = entryBefore ["basic"] ''
+        ${optionalString cfg.setRecommendedNeovimOpts ''
+          -- Neovim options recommended by upstream.
+          -- Views can only be fully collapsed with the global statusline.
+          vim.o.laststatus = 3
+          -- Default splitting will cause your main splits to jump when opening an edgebar.
+          -- To prevent this, set `splitkeep` to either `screen` or `topline`.
+          vim.o.splitkeep = "screen"
+        ''}
+
+        require('edgy').setup(${toLuaObject cfg.setupOpts})
+      '';
     };
   };
 }