Commit d5d7fdb27ecc

Vincent Demeester <vincent@sbr.pm>
2018-12-04 19:44:09
Less with import 👼
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
main
1 parent 2b17cc3
Changed files (7)
machine
carthage.nix
hokkaido.nix
honshu.nix
kerkouane.nix
massimo.nix
shikoku.nix
wakasu.nix
machine/carthage.nix
@@ -1,6 +1,6 @@
 { config, pkgs, ... }:
 
-{
+with import ../assets/machines.nix; {
   imports = [
     ../networking.nix # generated at runtime by nixos-infect
   ];
@@ -19,10 +19,10 @@
   };
   networking.firewall.allowPing = true;
   services = {
-    openssh.ports = with import ../assets/machines.nix; [ ssh.carthage.port ];
+    openssh.ports = [ ssh.carthage.port ];
     openssh.permitRootLogin = "without-password";
-    syncthing-edge.guiAddress = with import ../assets/machines.nix; "${wireguard.ips.carthage}:8384";
-    wireguard = with import ../assets/machines.nix; {
+    syncthing-edge.guiAddress = "${wireguard.ips.carthage}:8384";
+    wireguard = {
       enable = true;
       ips = [ "${wireguard.ips.carthage}/24" ];
       endpoint = wg.endpointIP;
machine/hokkaido.nix
@@ -1,6 +1,6 @@
 { config, pkgs, ... }:
 
-{
+with import ../assets/machines.nix; {
   imports = [ ../hardware/thinkpad-x220.nix ];
   time.timeZone = "Europe/Paris";
   profiles = {
@@ -34,8 +34,8 @@
         /auto/sshfs file:${mapConfSsh} uid=1000,gid=100,--timeout=30,--ghost
       '';
     };
-    syncthing-edge.guiAddress = with import ../assets/machines.nix; "${wireguard.ips.hokkaido}:8384";
-    wireguard = with import ../assets/machines.nix; {
+    syncthing-edge.guiAddress = "${wireguard.ips.hokkaido}:8384";
+    wireguard = {
       enable = true;
       ips = [ "${wireguard.ips.hokkaido}/24" ];
       endpoint = wg.endpointIP;
machine/honshu.nix
@@ -1,6 +1,6 @@
 { config, pkgs, ... }:
 
-{
+with import ../assets/machines.nix; {
   imports = [ ../hardware/dell-latitude-e6540.nix ];
   time.timeZone = "Europe/Paris";
   profiles = {
@@ -16,8 +16,8 @@
   };
   services = {
     logind.extraConfig = "HandleLidSwitch=ignore";
-    syncthing-edge.guiAddress = with import ../assets/machines.nix; "${wireguard.ips.honshu}:8384";
-    wireguard = with import ../assets/machines.nix; {
+    syncthing-edge.guiAddress = "${wireguard.ips.honshu}:8384";
+    wireguard = {
       enable = true;
       ips = [ "${wireguard.ips.honshu}/24" ];
       endpoint = wg.endpointIP;
machine/kerkouane.nix
@@ -1,6 +1,6 @@
 { config, pkgs, ... }:
 
-{
+with import ../assets/machines.nix; {
   imports = [ ../networking.nix ];
   time.timeZone = "Europe/Paris";
   boot = {
@@ -14,7 +14,7 @@
   };
   networking.firewall.allowPing = true;
   services = {
-    openssh.ports = with import ../assets/machines.nix; [ ssh.kerkouane.port ];
+    openssh.ports = [ ssh.kerkouane.port ];
     openssh.permitRootLogin = "without-password";
   };
   users.users.root.openssh.authorizedKeys.keys = [
machine/massimo.nix
@@ -1,6 +1,6 @@
 { config, pkgs, ... }:
 
-{
+with import ../assets/machines.nix; {
   time.timeZone = "Europe/Paris";
   boot = {
     cleanTmpDir = true;
@@ -13,8 +13,8 @@
   networking.firewall.allowPing = true;
   services = {
     logind.extraConfig = "HandleLidSwitch=ignore";
-    syncthing-edge.guiAddress = with import ../assets/machines.nix; "${wireguard.ips.massimo}:8384";
-    wireguard = with import ../assets/machines.nix; {
+    syncthing-edge.guiAddress = "${wireguard.ips.massimo}:8384";
+    wireguard = {
       enable = true;
       ips = [ "${wireguard.ips.massimo}/24" ];
       endpoint = wg.endpointIP;
machine/shikoku.nix
@@ -1,6 +1,6 @@
 { config, pkgs, ... }:
 
-{
+with import ../assets/machines.nix; {
   time.timeZone = "Europe/Paris";
   profiles = {
     buildkit.enable = true;
@@ -42,8 +42,8 @@
     firewall.allowedTCPPorts = [ 7946 9000 5000 ];
   };
   services = {
-    syncthing-edge.guiAddress = with import ../assets/machines.nix; "${wireguard.ips.shikoku}:8384";
-    wireguard = with import ../assets/machines.nix; {
+    syncthing-edge.guiAddress = "${wireguard.ips.shikoku}:8384";
+    wireguard = {
       enable = true;
       ips = [ "${wireguard.ips.shikoku}/24" ];
       endpoint = wg.endpointIP;
machine/wakasu.nix
@@ -1,6 +1,6 @@
 { config, pkgs, ... }:
 
-{
+with import ../assets/machines.nix; {
   imports = [ ../hardware/lenovo-p50.nix ];
   time.timeZone = "Europe/Paris";
   profiles = {
@@ -24,8 +24,8 @@
       HandleLidSwitchExternalPower=ignore
       HandleLidSwitchDocked=ignore
     '';
-    syncthing-edge.guiAddress = with import ../assets/machines.nix; "${wireguard.ips.wakasu}:8384";
-    wireguard = with import ../assets/machines.nix; {
+    syncthing-edge.guiAddress = "${wireguard.ips.wakasu}:8384";
+    wireguard = {
       enable = true;
       ips = [ "${wireguard.ips.wakasu}/24" ];
       endpoint = wg.endpointIP;