Allow plain file imports

docs/reference/yaml-options.md

@@ -42,6 +42,7 @@ inputs:
 imports:
   - ./frontend
   - ./backend
+  . ./mymodule.nix
   - myproject
   - myproject/relative/path
 ```

examples/imports/.test.sh

@@ -0,0 +1,2 @@
+env | grep "FILE=1"
+env | grep "FOLDER=1"

examples/imports/devenv.nix

@@ -0,0 +1 @@
+{ }

examples/imports/devenv.yaml

@@ -0,0 +1,3 @@
+imports:
+- ./file.nix
+- ./folder/

examples/imports/file.nix

@@ -0,0 +1,3 @@
+{
+  env.FILE = "1";
+}

examples/imports/folder/devenv.nix

@@ -0,0 +1,3 @@
+{
+  env.FOLDER = "1";
+}

mkdocs.yml

@@ -42,7 +42,7 @@ nav:
       - Common Patterns: common-patterns.md
     - Writing devenv.yaml:
       - Inputs: inputs.md
-      - Composing Using Imports: composing-using-imports.md
+      - Imports: composing-using-imports.md
     - Overview:
       - Automatic Shell Activation: automatic-shell-activation.md
       - Garbage Collection: garbage-collection.md

src/flake.nix

@@ -31,7 +31,9 @@
         lib = pkgs.lib;
         importModule = path:
           if lib.hasPrefix "./" path
-          then ./. + (builtins.substring 1 255 path) + "/devenv.nix"
+          then if lib.hasSuffix ".nix" path
+               then ./. + (builtins.substring 1 255 path)
+               else ./. + (builtins.substring 1 255 path) + "/devenv.nix"
           else if lib.hasPrefix "../" path 
               then throw "devenv: ../ is not supported for imports"
               else let