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/config.nix')

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/config.nix')

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