From 2fa3c56b10508400c2290937564bdd1c30b0c1d0 Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Fri, 13 Nov 2015 01:01:45 +0100
Subject: l 2 base: nixpkgs rev 6d31e9b -> 7ae05ed

---
 lass/2configs/base.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lass/2configs/base.nix')

diff --git a/lass/2configs/base.nix b/lass/2configs/base.nix
index 11bc4f089..944db83e0 100644
--- a/lass/2configs/base.nix
+++ b/lass/2configs/base.nix
@@ -48,7 +48,7 @@ with lib;
       source = {
         git.nixpkgs = {
           url = https://github.com/Lassulus/nixpkgs;
-          rev = "6d31e9b81dcd4ab927bb3dc91b612dd5abfa2f80";
+          rev = "7ae05edcdd14f6ace83ead9bf0d114e97c89a83a";
         };
         dir.secrets = {
           host = config.krebs.hosts.mors;
-- 
cgit v1.2.3


From bd71d3367b73eafb1bb6c59e858c195f6cf9952a Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Fri, 13 Nov 2015 11:10:34 +0100
Subject: l 2 base: add monitoring tools

---
 lass/2configs/base.nix | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'lass/2configs/base.nix')

diff --git a/lass/2configs/base.nix b/lass/2configs/base.nix
index 944db83e0..a76ed4d6b 100644
--- a/lass/2configs/base.nix
+++ b/lass/2configs/base.nix
@@ -92,6 +92,10 @@ with lib;
     most
     rxvt_unicode.terminfo
 
+  #monitoring tools
+    htop
+    iotop
+
   #network
     iptables
 
-- 
cgit v1.2.3


From 88e0f5b0370efe9b93493c21d487917a29e44a1c Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Fri, 13 Nov 2015 14:54:52 +0100
Subject: l 2 base: nixpkgs 7ae05ed -> 8d1ce12

---
 lass/2configs/base.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lass/2configs/base.nix')

diff --git a/lass/2configs/base.nix b/lass/2configs/base.nix
index a76ed4d6b..61023057b 100644
--- a/lass/2configs/base.nix
+++ b/lass/2configs/base.nix
@@ -48,7 +48,7 @@ with lib;
       source = {
         git.nixpkgs = {
           url = https://github.com/Lassulus/nixpkgs;
-          rev = "7ae05edcdd14f6ace83ead9bf0d114e97c89a83a";
+          rev = "8d1ce129361312334bf914ce0d27e463cb0bb21b";
         };
         dir.secrets = {
           host = config.krebs.hosts.mors;
-- 
cgit v1.2.3


From 576483bc63e1c6e5531f90ebd2133a29a7923943 Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Sat, 12 Dec 2015 17:56:49 +0100
Subject: l 2 base: remove video permission for gm

---
 lass/2configs/base.nix | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'lass/2configs/base.nix')

diff --git a/lass/2configs/base.nix b/lass/2configs/base.nix
index 61023057b..fa5ee4f19 100644
--- a/lass/2configs/base.nix
+++ b/lass/2configs/base.nix
@@ -17,6 +17,7 @@ with lib;
         root = {
           openssh.authorizedKeys.keys = [
             config.krebs.users.lass.pubkey
+            config.krebs.users.uriel.pubkey
           ];
         };
         mainUser = {
@@ -30,6 +31,7 @@ with lib;
           ];
           openssh.authorizedKeys.keys = [
             config.krebs.users.lass.pubkey
+            config.krebs.users.uriel.pubkey
           ];
         };
       };
-- 
cgit v1.2.3


From 43613fa6fca279301fcf0d014c0c9f71f394d9a1 Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Sat, 12 Dec 2015 18:23:32 +0100
Subject: l 2 base: nixpkgs 8d1ce12 -> 363c843

---
 lass/2configs/base.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lass/2configs/base.nix')

diff --git a/lass/2configs/base.nix b/lass/2configs/base.nix
index fa5ee4f19..40f4e12c7 100644
--- a/lass/2configs/base.nix
+++ b/lass/2configs/base.nix
@@ -50,7 +50,7 @@ with lib;
       source = {
         git.nixpkgs = {
           url = https://github.com/Lassulus/nixpkgs;
-          rev = "8d1ce129361312334bf914ce0d27e463cb0bb21b";
+          rev = "363c8430f1efad8b03d5feae6b3a4f2fe7b29251";
         };
         dir.secrets = {
           host = config.krebs.hosts.mors;
-- 
cgit v1.2.3