1 files changed, 17 insertions, 11 deletions

diff --git a/flake.nix b/flake.nix
index 44f4394..c06def2 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,14 +2,18 @@
   description = "My NixOS configurations";
 
   inputs.nixpkgs.url = "github:NixOS/nixpkgs/release-20.09";
-  inputs.nixpkgs-unstable.url = "github:NixOS/nixpkgs/master";
+  inputs.nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
   inputs.flake-utils.url = "github:numtide/flake-utils";
   inputs.home-manager = {
     url = "github:nix-community/home-manager/release-20.09";
     inputs.nixpkgs.follows = "nixpkgs";
   };
+  inputs.neovim-master = {
+    url = "github:neovim/neovim?dir=contrib";
+    inputs.nixpkgs.follows = "nixpkgs-unstable";
+  };
 
-  outputs = inputs @ { self, nixpkgs, nixpkgs-unstable, flake-utils, home-manager }: {
+  outputs = inputs @ { self, nixpkgs, home-manager, ... }: {
 
     nixosModules = {
       default = { ... }: {
@@ -59,6 +63,7 @@
 
       usecases.desktop = {
         default = (import ./usecases/desktop/default.nix inputs);
+        development = (import ./usecases/desktop/development.nix inputs);
         networkManager = (import ./usecases/desktop/networking/network-manager.nix inputs);
       };
 
@@ -82,19 +87,20 @@
         ];
       };
 
-      testDesktop = nixpkgs.lib.nixosSystem {
+      testPlainDesktop = nixpkgs.lib.nixosSystem {
+        system = "x86_64-linux";
+        modules = [
+          self.nixosModules.test
+          self.nixosModules.profiles.desktop
+        ];
+      };
+
+      testDevDesktop = nixpkgs.lib.nixosSystem {
         system = "x86_64-linux";
         modules = [
           self.nixosModules.test
           self.nixosModules.profiles.desktop
-          ({ modulesPath, ... }: {
-            imports = [ (modulesPath + "/virtualisation/qemu-vm.nix") ];
-
-            virtualisation = {
-              memorySize = 2048;
-              cores = 3;
-            };
-          })
+          self.nixosModules.usecases.desktop.development
         ];
       };