From 94c04950e14301a33a0a3abb9414e0f92d9895eb Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Tue, 18 Feb 2020 10:20:59 +0100
Subject: Use nix-shell to run node2nix

---
 system/settings/hardware/qwerty.nix | 9 ---------
 user/packages/node2nix/Makefile     | 2 +-
 2 files changed, 1 insertion(+), 10 deletions(-)
 delete mode 100644 system/settings/hardware/qwerty.nix

diff --git a/system/settings/hardware/qwerty.nix b/system/settings/hardware/qwerty.nix
deleted file mode 100644
index c967d561..00000000
--- a/system/settings/hardware/qwerty.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ config, pkgs, ... }:
-
-{
-  services.xserver = {
-    layout = "us";
-    xkbVariant = "intl-unicode";
-    xkbOptions = "altwin:prtsc_rwin,caps:escape";
-  };
-}
diff --git a/user/packages/node2nix/Makefile b/user/packages/node2nix/Makefile
index a3ae0505..740012ed 100644
--- a/user/packages/node2nix/Makefile
+++ b/user/packages/node2nix/Makefile
@@ -1,5 +1,5 @@
 default.nix: node-packages.json
-	node2nix --nodejs-12 --input $<
+	nix-shell -p nodePackages.node2nix --run "node2nix --nodejs-12 --input $<"
 
 install: default.nix
 	nix-env -f default.nix -i
-- 
cgit 1.4.1