From 22b94883629dd81d87c61695a3d54edd62458af2 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Mon, 14 Aug 2017 23:34:53 +0200
Subject: l mors.r: remove thunderbird

---
 lass/1systems/mors/config.nix | 1 -
 1 file changed, 1 deletion(-)

(limited to 'lass/1systems/mors')

diff --git a/lass/1systems/mors/config.nix b/lass/1systems/mors/config.nix
index 2cb6a7519..5bc52d633 100644
--- a/lass/1systems/mors/config.nix
+++ b/lass/1systems/mors/config.nix
@@ -139,7 +139,6 @@ with import <stockholm/lib>;
     urban
     mk_sql_pair
     remmina
-    thunderbird
 
     iodine
 
-- 
cgit v1.2.3


From a70fc9b95abf47aca54d39076529b3718adeb7cc Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Mon, 21 Aug 2017 12:36:04 +0200
Subject: l: mors <-> daedalus

---
 lass/1systems/mors/config.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'lass/1systems/mors')

diff --git a/lass/1systems/mors/config.nix b/lass/1systems/mors/config.nix
index 5bc52d633..bb6f84c7b 100644
--- a/lass/1systems/mors/config.nix
+++ b/lass/1systems/mors/config.nix
@@ -5,7 +5,7 @@ with import <stockholm/lib>;
   imports = [
     <stockholm/lass>
     <stockholm/lass/2configs/hw/x220.nix>
-    <stockholm/lass/2configs/boot/coreboot.nix>
+    <stockholm/lass/2configs/boot/stock-x220.nix>
 
     <stockholm/lass/2configs/mouse.nix>
     <stockholm/lass/2configs/retiolum.nix>
@@ -104,8 +104,8 @@ with import <stockholm/lib>;
   };
 
   services.udev.extraRules = ''
-    SUBSYSTEM=="net", ATTR{address}=="08:11:96:0a:5d:6c", NAME="wl0"
-    SUBSYSTEM=="net", ATTR{address}=="f0:de:f1:71:cb:35", NAME="et0"
+    SUBSYSTEM=="net", ATTR{address}=="00:24:d7:f0:e8:c8", NAME="wl0"
+    SUBSYSTEM=="net", ATTR{address}=="f0:de:f1:8f:8a:78", NAME="et0"
   '';
 
   #TODO activationScripts seem broken, fix them!
-- 
cgit v1.2.3


From 76415ff3cd74b4469087d0c8ee2b5062147b40d2 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Fri, 25 Aug 2017 23:43:19 +0200
Subject: l mors.r: remove deprecated zalando stuff

---
 lass/1systems/mors/config.nix | 9 ---------
 1 file changed, 9 deletions(-)

(limited to 'lass/1systems/mors')

diff --git a/lass/1systems/mors/config.nix b/lass/1systems/mors/config.nix
index bb6f84c7b..5995e5ec9 100644
--- a/lass/1systems/mors/config.nix
+++ b/lass/1systems/mors/config.nix
@@ -39,15 +39,6 @@ with import <stockholm/lib>;
         enable = true;
       };
     }
-    {
-      #zalando project
-      services.postgresql = {
-        enable = true;
-        package = pkgs.postgresql;
-      };
-      virtualisation.docker.enable = true;
-      #users.users.mainUser.extraGroups = [ "docker" ];
-    }
     {
       lass.umts = {
         enable = true;
-- 
cgit v1.2.3


From eb6fab7527c0bd8d5193ca2adcba420d73c03501 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Fri, 25 Aug 2017 23:43:43 +0200
Subject: l mors.r: enable mongodb

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

(limited to 'lass/1systems/mors')

diff --git a/lass/1systems/mors/config.nix b/lass/1systems/mors/config.nix
index 5995e5ec9..58f55ce68 100644
--- a/lass/1systems/mors/config.nix
+++ b/lass/1systems/mors/config.nix
@@ -82,6 +82,9 @@ with import <stockholm/lib>;
         client.enable = true;
       };
     }
+    {
+      services.mongodb.enable = true;
+    }
   ];
 
   krebs.build.host = config.krebs.hosts.mors;
-- 
cgit v1.2.3


From 8c131beb3ab6011276e3f123b8fea50fe8c7d91c Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Sat, 2 Sep 2017 21:41:00 +0200
Subject: l mors.r: remove elasticsearch

---
 lass/1systems/mors/config.nix | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'lass/1systems/mors')

diff --git a/lass/1systems/mors/config.nix b/lass/1systems/mors/config.nix
index 58f55ce68..a0e0f90a2 100644
--- a/lass/1systems/mors/config.nix
+++ b/lass/1systems/mors/config.nix
@@ -34,11 +34,6 @@ with import <stockholm/lib>;
         { predicate = "-p tcp --dport 11100"; target = "ACCEPT"; }
       ];
     }
-    {
-      services.elasticsearch = {
-        enable = true;
-      };
-    }
     {
       lass.umts = {
         enable = true;
-- 
cgit v1.2.3


From 6ab81a2797d5bc58dbe3acfb0a3c268baf159220 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Sun, 3 Sep 2017 10:36:14 +0200
Subject: l mors.r: add c-base config

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

(limited to 'lass/1systems/mors')

diff --git a/lass/1systems/mors/config.nix b/lass/1systems/mors/config.nix
index a0e0f90a2..53854d3be 100644
--- a/lass/1systems/mors/config.nix
+++ b/lass/1systems/mors/config.nix
@@ -28,6 +28,7 @@ with import <stockholm/lib>;
     <stockholm/lass/2configs/logf.nix>
     <stockholm/lass/2configs/syncthing.nix>
     <stockholm/lass/2configs/otp-ssh.nix>
+    <stockholm/lass/2configs/c-base.nix>
     {
       #risk of rain port
       krebs.iptables.tables.filter.INPUT.rules = [
-- 
cgit v1.2.3


From 2855881c732c041d9b6cd9c830d6ac4b84157b17 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Mon, 4 Sep 2017 00:16:54 +0200
Subject: move news & deps: echelon.r -> puyak.r

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

(limited to 'lass/1systems/mors')

diff --git a/lass/1systems/mors/config.nix b/lass/1systems/mors/config.nix
index 53854d3be..4d2f8b0f8 100644
--- a/lass/1systems/mors/config.nix
+++ b/lass/1systems/mors/config.nix
@@ -24,7 +24,7 @@ with import <stockholm/lib>;
     <stockholm/lass/2configs/fetchWallpaper.nix>
     <stockholm/lass/2configs/mail.nix>
     <stockholm/lass/2configs/repo-sync.nix>
-    <stockholm/lass/2configs/ircd.nix>
+    <stockholm/krebs/2configs/ircd.nix>
     <stockholm/lass/2configs/logf.nix>
     <stockholm/lass/2configs/syncthing.nix>
     <stockholm/lass/2configs/otp-ssh.nix>
-- 
cgit v1.2.3