summaryrefslogtreecommitdiffstats
path: root/lass/1systems/mors
diff options
context:
space:
mode:
authortv <tv@krebsco.de>2017-08-24 17:39:53 +0200
committertv <tv@krebsco.de>2017-08-24 17:39:53 +0200
commitfd69096a27575b9d4d87a10af1492b273dad167c (patch)
treeaa3e7dc121d3188a16a37a6751ec774abcc0df81 /lass/1systems/mors
parentb9a4e834c06bc32fa38389e13c0ec42467c0fc46 (diff)
parentfd6b42355907de5313ea3576e5d1bfa549433099 (diff)
Merge remote-tracking branch 'prism/master'
Diffstat (limited to 'lass/1systems/mors')
-rw-r--r--lass/1systems/mors/config.nix7
1 files changed, 3 insertions, 4 deletions
diff --git a/lass/1systems/mors/config.nix b/lass/1systems/mors/config.nix
index 2cb6a7519..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!
@@ -139,7 +139,6 @@ with import <stockholm/lib>;
urban
mk_sql_pair
remmina
- thunderbird
iodine