Merge branch 'main' into get-edgy

* docs: fix declerations

* fix: formatting for your baldness

docs/default.nix

@@ -74,7 +74,7 @@
                   (lib.removePrefix (toString ../.))
                   (lib.removePrefix "/")
                   (x: {
-                    url = "https://github.com/NotAShelf/nvf/blob/main/${decl}";
+                    url = "https://github.com/NotAShelf/nvf/blob/main/${x}";
                     name = "<nvf/${x}>";
                   })
                 ]

modules/modules.nix

@@ -8,7 +8,7 @@
     # The core neovim modules.
     # Contains configuration for core neovim features
     # such as spellchecking, mappings, and the init script (init.vim).
-    neovim = map (p: "${./neovim}/${p}") [
+    neovim = map (p: ./neovim + "/${p}") [
       "init"
       "mappings"
     ];
@@ -16,7 +16,7 @@
     # Individual plugin modules, separated by the type of plugin.
     # While adding a new type, you must make sure your type is
     # included in the list below.
-    plugins = map (p: "${./plugins}/${p}") [
+    plugins = map (p: ./plugins + "/${p}") [
       "assistant"
       "autopairs"
       "comments"
@@ -46,7 +46,7 @@
 
     # The neovim wrapper, used to build a wrapped neovim package
     # using the configuration passed in `neovim` and `plugins` modules.
-    wrapper = map (p: "${./wrapper}/${p}") [
+    wrapper = map (p: ./wrapper + "/${p}") [
       "build"
       "rc"
       "warnings"
@@ -54,7 +54,7 @@
 
     # Extra modules, such as deprecation warnings
     # or renames in one place.
-    extra = map (p: "${./extra}/${p}") [
+    extra = map (p: ./extra + "/${p}") [
       "deprecations.nix"
     ];
   in

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

@@ -14,16 +14,15 @@ in {
     vim = {
       startPlugins = ["edgy-nvim"];
       pluginRC.edgy-nvim = entryBefore ["basic"] ''
+        require('edgy').setup(${toLuaObject cfg.setupOpts})
+
         ${optionalString cfg.setRecommendedNeovimOpts ''
-          -- Neovim options recommended by upstream.
-          -- Views can only be fully collapsed with the global statusline.
-          vim.o.laststatus = 3
+          -- views can only be fully collapsed with the global statusline
+          vim.opt.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"
+          vim.opt.splitkeep = "screen"
         ''}
-
-        require('edgy').setup(${toLuaObject cfg.setupOpts})
       '';
     };
   };