summaryrefslogtreecommitdiffstats
path: root/modules/uriel/default.nix
diff options
context:
space:
mode:
authortv <tv@shackspace.de>2015-06-14 19:22:37 +0200
committertv <tv@shackspace.de>2015-06-14 19:22:37 +0200
commitbff3b50dddb1bb37831d9f17ca25ccab7f7476fe (patch)
tree6a36b91b0ed33ba90b4da32d1fa995789f923a8d /modules/uriel/default.nix
parent78c3c09f1579d1f8132d95d260e9ed8789d3dfc5 (diff)
parentafa7f0b98d89c9746c204e4ee0dd79e7ae4eb23f (diff)
Merge remote-tracking branch 'mors/master' into mors-staging
Diffstat (limited to 'modules/uriel/default.nix')
-rw-r--r--modules/uriel/default.nix6
1 files changed, 4 insertions, 2 deletions
diff --git a/modules/uriel/default.nix b/modules/uriel/default.nix
index bfdc02256..a54dfa7ec 100644
--- a/modules/uriel/default.nix
+++ b/modules/uriel/default.nix
@@ -16,13 +16,14 @@
../../secrets/uriel-pw.nix
../lass/sshkeys.nix
../lass/bird.nix
+ ./repos.nix
];
+
nixpkgs = {
url = "https://github.com/Lassulus/nixpkgs";
- rev = "b42ecfb8c61e514bf7733b4ab0982d3e7e27dacb";
+ rev = "b74c8eeb73a75eb61148c190df4733474a99a205";
};
-
networking.hostName = "uriel";
networking.wireless.enable = true;
nix.maxJobs = 2;
@@ -104,6 +105,7 @@
environment.systemPackages = with pkgs; [
];
+
#users.extraGroups = {
# loot = {
# members = [