summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregor Kleen <pngwjpgh@users.noreply.github.com>2016-09-13 04:24:17 +0200
committerGregor Kleen <pngwjpgh@users.noreply.github.com>2016-09-13 04:24:17 +0200
commit951fc190e9c24bd426454849e2b3500229fdde33 (patch)
tree08e31303c0d0723efb81117f384c8e678ca1dc5e
parentee6301b54c5558f2b3182a4affec460b8f3451d4 (diff)
downloadnixos-951fc190e9c24bd426454849e2b3500229fdde33.tar
nixos-951fc190e9c24bd426454849e2b3500229fdde33.tar.gz
nixos-951fc190e9c24bd426454849e2b3500229fdde33.tar.bz2
nixos-951fc190e9c24bd426454849e2b3500229fdde33.tar.xz
nixos-951fc190e9c24bd426454849e2b3500229fdde33.zip
factorio credentials
-rw-r--r--.gitignore1
-rw-r--r--customized/fetch.sh2
-rw-r--r--ymir/factorio.nix2
3 files changed, 4 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index d155d8f7..15eafda5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
1configuration.nix 1configuration.nix
2config.nix 2config.nix
3**/\#*\# 3**/\#*\#
4factorio-credentials.nix \ No newline at end of file
diff --git a/customized/fetch.sh b/customized/fetch.sh
index 30d9c9fd..a470b942 100644
--- a/customized/fetch.sh
+++ b/customized/fetch.sh
@@ -37,7 +37,7 @@ if grep -q 'Location: https://' headers; then
37 set +x 37 set +x
38else 38else
39 set +x 39 set +x
40 echo 'Login failed' 40 echo "Login failed (username: ‘$username’)"
41 echo 'Please set username and password with config.nix,' 41 echo 'Please set username and password with config.nix,'
42 echo 'or /etc/nix/nixpkgs-config.nix if on NixOS.' 42 echo 'or /etc/nix/nixpkgs-config.nix if on NixOS.'
43 echo 43 echo
diff --git a/ymir/factorio.nix b/ymir/factorio.nix
index 8fb6c44b..bc47be79 100644
--- a/ymir/factorio.nix
+++ b/ymir/factorio.nix
@@ -65,6 +65,8 @@ let
65 }; 65 };
66 }; 66 };
67in { 67in {
68 imports = [ ./factorio-credentials.nix ];
69
68 services.factorio = { 70 services.factorio = {
69 enable = true; 71 enable = true;
70 saveName = config.networking.hostName; 72 saveName = config.networking.hostName;