Merge pull request #77 from Mic92/fix-flakes

Fix flakes

Author: Mic92

README.md

@@ -67,6 +67,7 @@ If an attribute _name_ is given, `nixos-shell` tries the following flake output
 - `nixosConfigurations.<name>`
 - `nixosModules.<name>`
 
+
 ## Terminating the virtual machine
 
 Type `Ctrl-a x` to exit the virtual machine.
@@ -247,6 +248,40 @@ To avoid having to download a nix-channel every time the VM is reset, you can us
 
 This will add the nixpkgs that is used for the VM in the NIX_PATH of login shell.
 
+## Embedding nixos-shell in your own nixos-configuration
+
+Instead of using the cli, it's also possible to include the `nixos-shell` NixOS module in your own NixOS configuration.
+
+Add this to your `flake.nix`:
+
+```nix
+{
+  inputs.nixos-shell.url = "github:Mic92/nixos-shell";
+}
+```
+
+And this to your nixos configuration defined in your flake:
+
+```nix
+{
+  imports = [ inputs.nixos-shell.nixosModules.nixos-shell ];
+}
+```
+
+Afterwards you can start your nixos configuration with nixos-shell with one of the two following variants:
+
+For the pure version (doesn't set SHELL or mount /home):
+
+```
+nix run .#nixosConfigurations.<yourmachine>.config.system.build.nixos-shell
+```
+
+Or for a version closer to `nixos-shell`:
+
+```
+nix run .#nixosConfigurations.<yourmachine>.config.system.build.nixos-shell
+```
+
 ## More configuration
 
 Have a look at the [virtualisation] options NixOS provides.

flake.nix

@@ -37,7 +37,7 @@
           removeAttrs configs.vm [ "extendModules" "override" ];
       };
 
-    nixosModules.nixos-shell = import ./share/modules/nixos-shell.nix;
+    nixosModules.nixos-shell.imports = [ ./share/modules/nixos-shell.nix ];
   }
 
   //

share/modules/nixos-shell.nix

@@ -1,4 +1,4 @@
-{ lib, modulesPath, ... }:
+{ lib, modulesPath, pkgs, extendModules, ... }:
 
 {
   imports = [
@@ -59,4 +59,14 @@
       };
     };
   };
+
+  config = let
+    vmSystem = extendModules {
+      modules = [
+        ./nixos-shell-config.nix
+      ];
+    };
+  in {
+    system.build.nixos-shell = vmSystem.config.system.build.vm;
+  };
 }

share/nixos-shell.nix

@@ -9,9 +9,6 @@
 let
   lib = flake.inputs.nixpkgs.lib or (import nixpkgs { }).lib;
 
-  nixos-shell = import ./modules/nixos-shell.nix;
-  nixos-shell-config = import ./modules/nixos-shell-config.nix;
-
   defaultTo = default: e: if e == null then default else e;
 
   getFlakeOutput = path: lib.attrByPath path null flake.outputs;
@@ -20,8 +17,8 @@ let
     inherit system;
     modules = [
       config
-      nixos-shell
-      nixos-shell-config
+      ./modules/nixos-shell.nix
+      ./modules/nixos-shell-config.nix
     ];
   };
 
@@ -33,11 +30,10 @@ let
 
   flakeModule = getFlakeOutput [ "nixosModules" "${flakeAttr}" ];
 
-  nixosShellModules =
-    if flakeSystem ? options.nixos-shell then
-      [ nixos-shell-config ]
-    else
-      [ nixos-shell nixos-shell-config ];
+  nixosShellModules = [
+    ./modules/nixos-shell.nix
+    ./modules/nixos-shell-config.nix
+  ];
 in
 if flakeUri != null then
   if flakeSystem != null then