From 67526d6c0849d9abc60c9a4cbee28e3a2dc707ce Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Mon, 25 May 2015 19:32:54 +0200
Subject: activate gitolite config

---
 modules/mors/default.nix | 1 +
 1 file changed, 1 insertion(+)

(limited to 'modules/mors/default.nix')

diff --git a/modules/mors/default.nix b/modules/mors/default.nix
index 8768cd1ec..c7d1f1b9a 100644
--- a/modules/mors/default.nix
+++ b/modules/mors/default.nix
@@ -24,6 +24,7 @@
     ../lass/binary-caches.nix
     ../lass/ircd.nix
     ../../secrets/mors-pw.nix
+    ./repos.nix
   ];
   nixpkgs = {
     url = "https://github.com/Lassulus/nixpkgs";
-- 
cgit v1.2.3


From bcd6a13478397310a2d69c39bfc9ebff5a1c0ade Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Mon, 25 May 2015 19:33:15 +0200
Subject: cleanup code & update hashes

---
 modules/mors/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'modules/mors/default.nix')

diff --git a/modules/mors/default.nix b/modules/mors/default.nix
index c7d1f1b9a..6dfd05039 100644
--- a/modules/mors/default.nix
+++ b/modules/mors/default.nix
@@ -28,7 +28,7 @@
   ];
   nixpkgs = {
     url = "https://github.com/Lassulus/nixpkgs";
-    rev = "eba85883a07a9fc414d7860f8d6fee4d9f09b2ac";
+    rev = "0b1dfed50d9ec2222b94d68f84376f66e82d19e3";
   };
 
   networking.hostName = "mors";
@@ -55,8 +55,6 @@
     initrd.availableKernelModules = [ "xhci_hcd" "ehci_pci" "ahci" "usb_storage" ];
     #kernelModules = [ "kvm-intel" "msr" ];
     kernelModules = [ "msr" ];
-    extraModprobeConfig = ''
-    '';
   };
   fileSystems = {
     "/" = {
@@ -146,7 +144,6 @@
   '';
 
   services.xserver = {
-
     videoDriver = "intel";
     vaapiDrivers = [ pkgs.vaapiIntel ];
     deviceSection = ''
-- 
cgit v1.2.3


From afa7f0b98d89c9746c204e4ee0dd79e7ae4eb23f Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Wed, 10 Jun 2015 00:21:12 +0200
Subject: mors & uriel: update revs

---
 modules/mors/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'modules/mors/default.nix')

diff --git a/modules/mors/default.nix b/modules/mors/default.nix
index 6dfd05039..d9ddd285b 100644
--- a/modules/mors/default.nix
+++ b/modules/mors/default.nix
@@ -26,9 +26,10 @@
     ../../secrets/mors-pw.nix
     ./repos.nix
   ];
+
   nixpkgs = {
     url = "https://github.com/Lassulus/nixpkgs";
-    rev = "0b1dfed50d9ec2222b94d68f84376f66e82d19e3";
+    rev = "b74c8eeb73a75eb61148c190df4733474a99a205";
   };
 
   networking.hostName = "mors";
-- 
cgit v1.2.3