From 95999d2ef4b426c68c5d4875554ff8c3e10669e0 Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Sat, 31 Oct 2015 15:09:11 +0100
Subject: l 1 prism: add git.nix

---
 lass/1systems/prism.nix | 1 +
 1 file changed, 1 insertion(+)

(limited to 'lass/1systems')

diff --git a/lass/1systems/prism.nix b/lass/1systems/prism.nix
index 570cdfb7c..bb22b471f 100644
--- a/lass/1systems/prism.nix
+++ b/lass/1systems/prism.nix
@@ -8,6 +8,7 @@ in {
   imports = [
     ../2configs/base.nix
     ../2configs/downloading.nix
+    ../2configs/git.nix
     {
       users.extraGroups = {
         # ● systemd-tmpfiles-setup.service - Create Volatile Files and Directories
-- 
cgit v1.2.3


From a7621594563dc92684e0b9cc31a85645a4b8d3fd Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Sun, 1 Nov 2015 19:58:59 +0100
Subject: l 1 prism: activate ts3 server

---
 lass/1systems/prism.nix | 1 +
 1 file changed, 1 insertion(+)

(limited to 'lass/1systems')

diff --git a/lass/1systems/prism.nix b/lass/1systems/prism.nix
index bb22b471f..ae90251cc 100644
--- a/lass/1systems/prism.nix
+++ b/lass/1systems/prism.nix
@@ -9,6 +9,7 @@ in {
     ../2configs/base.nix
     ../2configs/downloading.nix
     ../2configs/git.nix
+    ../2configs/ts3.nix
     {
       users.extraGroups = {
         # ● systemd-tmpfiles-setup.service - Create Volatile Files and Directories
-- 
cgit v1.2.3


From cb5e5f452c320d0f75bd46a82fd6afc96e11d73e Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Sun, 1 Nov 2015 20:00:19 +0100
Subject: l 1 mors: add hashPassword to systemPackages

---
 lass/1systems/mors.nix | 1 +
 1 file changed, 1 insertion(+)

(limited to 'lass/1systems')

diff --git a/lass/1systems/mors.nix b/lass/1systems/mors.nix
index b0b8ff573..7db3f8333 100644
--- a/lass/1systems/mors.nix
+++ b/lass/1systems/mors.nix
@@ -156,6 +156,7 @@
     get
     genid
     teamspeak_client
+    hashPassword
   ];
 
   #TODO: fix this shit
-- 
cgit v1.2.3


From fd42a107a517d0f67005efcd9ed4f1400ffdb154 Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Sun, 1 Nov 2015 20:00:43 +0100
Subject: l 1 prism: allowUnfree for ts3

---
 lass/1systems/prism.nix | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'lass/1systems')

diff --git a/lass/1systems/prism.nix b/lass/1systems/prism.nix
index ae90251cc..87334c3c2 100644
--- a/lass/1systems/prism.nix
+++ b/lass/1systems/prism.nix
@@ -84,6 +84,9 @@ in {
       #workaround for server dying after 6-7h
       boot.kernelPackages = pkgs.linuxPackages_4_2;
     }
+    {
+      nixpkgs.config.allowUnfree = true;
+    }
   ];
 
   krebs.build.host = config.krebs.hosts.prism;
-- 
cgit v1.2.3