diff options
Diffstat (limited to 'lass')
| -rw-r--r-- | lass/1systems/mors/physical.nix | 4 | ||||
| -rw-r--r-- | lass/1systems/skynet/config.nix | 5 | ||||
| -rw-r--r-- | lass/2configs/nfs-dl.nix | 8 |
3 files changed, 8 insertions, 9 deletions
diff --git a/lass/1systems/mors/physical.nix b/lass/1systems/mors/physical.nix index 6828d70d..2f3a6844 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 70787e51..1bc440a9 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"; } diff --git a/lass/2configs/nfs-dl.nix b/lass/2configs/nfs-dl.nix index ba53321b..91b02645 100644 --- a/lass/2configs/nfs-dl.nix +++ b/lass/2configs/nfs-dl.nix @@ -3,17 +3,19 @@ device = "prism.w:/export/download"; fsType = "nfs"; options = [ - "timeo=14" + #"timeo=14" "noauto" "noatime" "nodiratime" - "noac" - "nocto" + #"noac" + #"nocto" "x-systemd.automount" "x-systemd.device-timeout=1" "x-systemd.idle-timeout=1min" "x-systemd.requires=retiolum.service" "x-systemd.requires=wpa_supplicant.service" + "user" + "_netdev" ]; }; } |