diff options
| author | tv <tv@krebsco.de> | 2020-07-14 19:31:19 +0200 |
|---|---|---|
| committer | tv <tv@krebsco.de> | 2020-07-14 19:31:19 +0200 |
| commit | 75340366685c47ddc649bcbd1b06666e09d3cf85 (patch) | |
| tree | c40e7b72d6d336c0c61ae3d94eb678c4273fce77 /lass/1systems | |
| parent | ef4572145301e3daba853a1b67c963472fbb828c (diff) | |
| parent | dbee272de6f3dae261ac6e15992b91cd3c1d02ed (diff) | |
Merge remote-tracking branches 'gum/master' and 'prism/master'
Diffstat (limited to 'lass/1systems')
| -rw-r--r-- | lass/1systems/mors/physical.nix | 4 | ||||
| -rw-r--r-- | lass/1systems/skynet/config.nix | 5 |
2 files changed, 3 insertions, 6 deletions
diff --git a/lass/1systems/mors/physical.nix b/lass/1systems/mors/physical.nix index 6828d70de..2f3a68442 100644 --- a/lass/1systems/mors/physical.nix +++ b/lass/1systems/mors/physical.nix @@ -23,7 +23,7 @@ services.udev.extraRules = '' SUBSYSTEM=="net", DEVPATH=="/devices/pci*/*1c.1/*/net/*", NAME="wl0" - SUBSYSTEM=="net", ATTR{address}=="f0:de:f1:c4:7a:f1", NAME="et0" + SUBSYSTEM=="net", ATTR{address}=="3c:97:0e:4f:42:35", NAME="et0" ''; #TODO activationScripts seem broken, fix them! @@ -37,12 +37,10 @@ echo 'auto' > '/sys/bus/pci/devices/0000:00:1f.2/power/control' echo 'auto' > '/sys/bus/pci/devices/0000:00:1f.0/power/control' echo 'auto' > '/sys/bus/pci/devices/0000:00:1d.0/power/control' - echo 'auto' > '/sys/bus/pci/devices/0000:00:1c.3/power/control' echo 'auto' > '/sys/bus/pci/devices/0000:00:1c.0/power/control' echo 'auto' > '/sys/bus/pci/devices/0000:00:1b.0/power/control' echo 'auto' > '/sys/bus/pci/devices/0000:00:1a.0/power/control' echo 'auto' > '/sys/bus/pci/devices/0000:00:19.0/power/control' echo 'auto' > '/sys/bus/pci/devices/0000:00:1c.1/power/control' - echo 'auto' > '/sys/bus/pci/devices/0000:00:1c.4/power/control' ''; } diff --git a/lass/1systems/skynet/config.nix b/lass/1systems/skynet/config.nix index 70787e514..1bc440a98 100644 --- a/lass/1systems/skynet/config.nix +++ b/lass/1systems/skynet/config.nix @@ -36,7 +36,6 @@ with import <stockholm/lib>; networking.wireless.enable = false; networking.networkmanager.enable = true; - services.logind.extraConfig = '' - HandleLidSwitch=ignore - ''; + services.logind.lidSwitch = "ignore"; + services.logind.lidSwitchDocked = "ignore"; } |