diff options
| author | jeschli <jeschli@gmail.com> | 2019-06-25 22:43:02 +0200 |
|---|---|---|
| committer | jeschli <jeschli@gmail.com> | 2019-06-25 22:43:02 +0200 |
| commit | 1cfc265bbfa14b7d9fc6479bcd9cf541e7cdd5eb (patch) | |
| tree | 18b95faba964f8072d23afcadcadda4f3eb276af /lass/1systems/mors | |
| parent | 8079877eee34d0a658e8419adfa8987e648388a8 (diff) | |
| parent | 1d23dceb5d2c536790a00fcde30743b958f1018f (diff) | |
Merge branch 'master' of prism.r:stockholm
Diffstat (limited to 'lass/1systems/mors')
| -rw-r--r-- | lass/1systems/mors/config.nix | 31 | ||||
| -rw-r--r-- | lass/1systems/mors/physical.nix | 2 |
2 files changed, 25 insertions, 8 deletions
diff --git a/lass/1systems/mors/config.nix b/lass/1systems/mors/config.nix index f911b79d6..5076beeef 100644 --- a/lass/1systems/mors/config.nix +++ b/lass/1systems/mors/config.nix @@ -49,14 +49,31 @@ with import <stockholm/lib>; ]; } { - krebs.syncthing.folders."the_playlist" = { - path = "/home/lass/tmp/the_playlist"; - peers = [ "mors" "phone" "prism" ]; + krebs.syncthing = { + peers.schasch.addresses = [ "schasch.r:22000" ]; + folders = { + the_playlist = { + path = "/home/lass/tmp/the_playlist"; + peers = [ "mors" "phone" "prism" ]; + }; + free_music = { + id = "mu9mn-zgvsw"; + path = "/home/lass/tmp/free_music"; + peers = [ "mors" "schasch" ]; + }; + }; }; - krebs.permown."/home/lass/tmp/the_playlist" = { - owner = "lass"; - group = "syncthing"; - umask = "0007"; + krebs.permown = { + "/home/lass/tmp/free_music" = { + owner = "lass"; + group = "syncthing"; + umask = "0007"; + }; + "/home/lass/tmp/the_playlist" = { + owner = "lass"; + group = "syncthing"; + umask = "0007"; + }; }; } { diff --git a/lass/1systems/mors/physical.nix b/lass/1systems/mors/physical.nix index 25425f146..6828d70de 100644 --- a/lass/1systems/mors/physical.nix +++ b/lass/1systems/mors/physical.nix @@ -22,7 +22,7 @@ }; services.udev.extraRules = '' - SUBSYSTEM=="net", ATTR{address}=="10:0b:a9:72:f4:88", NAME="wl0" + SUBSYSTEM=="net", DEVPATH=="/devices/pci*/*1c.1/*/net/*", NAME="wl0" SUBSYSTEM=="net", ATTR{address}=="f0:de:f1:c4:7a:f1", NAME="et0" ''; |