summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorAlan Pearce2020-02-18 10:20:59 +0100
committerAlan Pearce2020-02-18 10:20:59 +0100
commit94c04950e14301a33a0a3abb9414e0f92d9895eb (patch)
tree4821143717f28ad010d1cff06d5c387a466fbef0
parent50129a90b692af5c0561bd8e13f557db1516e5a1 (diff)
downloadnixfiles-94c04950e14301a33a0a3abb9414e0f92d9895eb.tar.lz
nixfiles-94c04950e14301a33a0a3abb9414e0f92d9895eb.tar.zst
nixfiles-94c04950e14301a33a0a3abb9414e0f92d9895eb.zip
Use nix-shell to run node2nix
-rw-r--r--system/settings/hardware/qwerty.nix9
-rw-r--r--user/packages/node2nix/Makefile2
2 files changed, 1 insertions, 10 deletions
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