diff options
| author | jeschli <jeschli@gmail.com> | 2019-04-02 19:38:35 +0200 |
|---|---|---|
| committer | jeschli <jeschli@gmail.com> | 2019-04-02 19:38:35 +0200 |
| commit | f8b88080d5bb27e4a6b35b26d6036de40517ba57 (patch) | |
| tree | f8a077997ca889950daa0cb5ec11cc486f420bbe /lass/1systems | |
| parent | 17712c90772d68f174f579e570fa23a8fa674245 (diff) | |
| parent | 6654f03b09b7b80e3ee6339c92e6172579349744 (diff) | |
:Merge branch 'master' of prism.r:stockholm
Diffstat (limited to 'lass/1systems')
| -rw-r--r-- | lass/1systems/blue/config.nix | 1 | ||||
| -rw-r--r-- | lass/1systems/icarus/config.nix | 1 | ||||
| -rw-r--r-- | lass/1systems/icarus/physical.nix | 2 | ||||
| -rw-r--r-- | lass/1systems/littleT/config.nix | 1 | ||||
| -rw-r--r-- | lass/1systems/skynet/config.nix | 1 |
5 files changed, 6 insertions, 0 deletions
diff --git a/lass/1systems/blue/config.nix b/lass/1systems/blue/config.nix index a84bb37f6..d740403da 100644 --- a/lass/1systems/blue/config.nix +++ b/lass/1systems/blue/config.nix @@ -8,6 +8,7 @@ with import <stockholm/lib>; <stockholm/lass/2configs/exim-retiolum.nix> <stockholm/lass/2configs/blue.nix> + <stockholm/lass/2configs/syncthing.nix> ]; krebs.build.host = config.krebs.hosts.blue; diff --git a/lass/1systems/icarus/config.nix b/lass/1systems/icarus/config.nix index d2d4bd3eb..868d75083 100644 --- a/lass/1systems/icarus/config.nix +++ b/lass/1systems/icarus/config.nix @@ -17,6 +17,7 @@ <stockholm/lass/2configs/backup.nix> <stockholm/lass/2configs/wine.nix> <stockholm/lass/2configs/blue-host.nix> + <stockholm/lass/2configs/syncthing.nix> ]; krebs.build.host = config.krebs.hosts.icarus; diff --git a/lass/1systems/icarus/physical.nix b/lass/1systems/icarus/physical.nix index 6cc77a47d..d764dabc1 100644 --- a/lass/1systems/icarus/physical.nix +++ b/lass/1systems/icarus/physical.nix @@ -17,4 +17,6 @@ SUBSYSTEM=="net", ATTR{address}=="00:24:d7:f0:a0:0c", NAME="wl0" SUBSYSTEM=="net", ATTR{address}=="f0:de:f1:71:cb:35", NAME="et0" ''; + + services.thinkfan.enable = true; } diff --git a/lass/1systems/littleT/config.nix b/lass/1systems/littleT/config.nix index 7fe143c3c..eee23ee60 100644 --- a/lass/1systems/littleT/config.nix +++ b/lass/1systems/littleT/config.nix @@ -7,6 +7,7 @@ with import <stockholm/lib>; <stockholm/lass/2configs/retiolum.nix> <stockholm/lass/2configs/blue-host.nix> + <stockholm/lass/2configs/syncthing.nix> ]; networking.networkmanager.enable = true; diff --git a/lass/1systems/skynet/config.nix b/lass/1systems/skynet/config.nix index 4b806af7b..0bf3e6b4d 100644 --- a/lass/1systems/skynet/config.nix +++ b/lass/1systems/skynet/config.nix @@ -7,6 +7,7 @@ with import <stockholm/lib>; <stockholm/lass/2configs/retiolum.nix> <stockholm/lass/2configs/blue-host.nix> <stockholm/lass/2configs/power-action.nix> + <stockholm/lass/2configs/syncthing.nix> { services.xserver.enable = true; services.xserver.desktopManager.xfce.enable = true; |