machines/devhell: Remove syncthing dataDir

This doesn't seem to work properly, Syncthing will still add its default
`Sync` directory.

4 files changed, 97 insertions, 101 deletions

diff --git a/machines/devhell/eir.nix b/machines/devhell/eir.nix
index a6650725..4a41f586 100644
--- a/machines/devhell/eir.nix
+++ b/machines/devhell/eir.nix
@@ -97,7 +97,6 @@
     syncthing = {
       enable = true;
       user = "dev";
-      dataDir = "/home/dev/syncthing/";
     };
   };
 
diff --git a/machines/devhell/herja.nix b/machines/devhell/herja.nix
index d8612afe..f428f7fa 100644
--- a/machines/devhell/herja.nix
+++ b/machines/devhell/herja.nix
@@ -120,7 +120,6 @@
     syncthing = {
       enable = true;
       user = "dev";
-      dataDir = "/home/dev/syncthing/";
     };
   };
 
diff --git a/machines/devhell/hildr.nix b/machines/devhell/hildr.nix
index cf68098f..0c2a2b05 100644
--- a/machines/devhell/hildr.nix
+++ b/machines/devhell/hildr.nix
@@ -111,7 +111,6 @@
     syncthing = {
       enable = true;
       user = "dev";
-      dataDir = "/home/dev/syncthing/";
     };
   };
 
diff --git a/machines/devhell/sigrun.nix b/machines/devhell/sigrun.nix
index d6677ddf..232d2d57 100644
--- a/machines/devhell/sigrun.nix
+++ b/machines/devhell/sigrun.nix
@@ -1,117 +1,116 @@
-{ config, pkgs, lib, ... }:
-
-{
-  vuizvui.user.devhell.profiles.base.enable = true;
-  vuizvui.system.kernel.bfq.enable = true;
-
-  boot = {
-    loader.grub = {
-      enable = true;
-      version = 2;
-      devices = [
-        "/dev/disk/by-id/ata-ST31500541AS_6XW0NK21"
-        "/dev/disk/by-id/ata-ST31500541AS_6XW0P0CW"
-        "/dev/disk/by-id/ata-Samsung_SSD_850_EVO_250GB_S21PNSAG848626F"
-        "/dev/disk/by-id/ata-Samsung_SSD_850_EVO_250GB_S21PNSAG848674K"
-      ];
+  { config, pkgs, lib, ... }:
+
+  {
+    vuizvui.user.devhell.profiles.base.enable = true;
+    vuizvui.system.kernel.bfq.enable = true;
+
+    boot = {
+      loader.grub = {
+        enable = true;
+        version = 2;
+        devices = [
+          "/dev/disk/by-id/ata-ST31500541AS_6XW0NK21"
+          "/dev/disk/by-id/ata-ST31500541AS_6XW0P0CW"
+          "/dev/disk/by-id/ata-Samsung_SSD_850_EVO_250GB_S21PNSAG848626F"
+          "/dev/disk/by-id/ata-Samsung_SSD_850_EVO_250GB_S21PNSAG848674K"
+        ];
+      };
+
+      initrd = {
+        availableKernelModules = [ "ehci_pci" "ahci" "firewire_ohci" "usbhid" "usb_storage" ];
+        kernelModules = [ "fuse" ];
+      };
+
+      kernelParams = [ "pci=noaer" ];
+      kernelModules = [ "kvm-intel" ];
+      extraModulePackages = [ ];
+      blacklistedKernelModules = [ "pcspkr" ];
     };
 
-    initrd = {
-      availableKernelModules = [ "ehci_pci" "ahci" "firewire_ohci" "usbhid" "usb_storage" ];
-      kernelModules = [ "fuse" ];
+    hardware = {
+      cpu.intel.updateMicrocode = true;
+      opengl = {
+        extraPackages = [ pkgs.vaapiVdpau ];
+      };
     };
 
-    kernelParams = [ "pci=noaer" ];
-    kernelModules = [ "kvm-intel" ];
-    extraModulePackages = [ ];
-    blacklistedKernelModules = [ "pcspkr" ];
-  };
-
-  hardware = {
-    cpu.intel.updateMicrocode = true;
-    opengl = {
-      extraPackages = [ pkgs.vaapiVdpau ];
+    fileSystems."/" = {
+      label = "nixos";
+      fsType = "btrfs";
+      options = [
+        "autodefrag"
+        "space_cache"
+        "compress=lzo"
+        "noatime"
+        "ssd"
+      ];
     };
-  };
 
-  fileSystems."/" = {
-    label = "nixos";
-    fsType = "btrfs";
-    options = [
-      "autodefrag"
-      "space_cache"
-      "compress=lzo"
-      "noatime"
-      "ssd"
-    ];
-  };
+    fileSystems."/home" = {
+      label = "home";
+      fsType = "btrfs";
+      options = [
+        "autodefrag"
+        "space_cache"
+        "compress=lzo"
+        "noatime"
+      ];
+    };
 
-  fileSystems."/home" = {
-    label = "home";
-    fsType = "btrfs";
-    options = [
-      "autodefrag"
-      "space_cache"
-      "compress=lzo"
-      "noatime"
+    swapDevices = [
+      { device = "/dev/disk/by-uuid/16bd9abd-6af5-4a24-8ea5-58adc51e9641"; }
+      { device = "/dev/disk/by-uuid/279708cb-f9c3-4a37-a064-80ff85a66f88"; }
+      { device = "/dev/disk/by-uuid/0c2409c3-e824-4759-a9ad-9bfcea1e73bb"; }
+      { device = "/dev/disk/by-uuid/3f1835a8-5587-4963-9b6c-66ecb36059de"; }
     ];
-  };
-
-  swapDevices = [
-    { device = "/dev/disk/by-uuid/16bd9abd-6af5-4a24-8ea5-58adc51e9641"; }
-    { device = "/dev/disk/by-uuid/279708cb-f9c3-4a37-a064-80ff85a66f88"; }
-    { device = "/dev/disk/by-uuid/0c2409c3-e824-4759-a9ad-9bfcea1e73bb"; }
-    { device = "/dev/disk/by-uuid/3f1835a8-5587-4963-9b6c-66ecb36059de"; }
-  ];
-
-  networking.hostName = "sigrun";
-  networking.wireless.enable = false;
-  networking.useNetworkd = true;
-
-  nix.maxJobs = 8;
 
-  i18n = {
-    defaultLocale = "en_US.UTF-8";
-  };
+    networking.hostName = "sigrun";
+    networking.wireless.enable = false;
+    networking.useNetworkd = true;
 
-  console = {
-    font = "Lat2-Terminus16";
-    keyMap = "dvorak";
-  };
+    nix.maxJobs = 8;
 
-  powerManagement.powerUpCommands = ''
-    ${pkgs.hdparm}/sbin/hdparm -B 255 \
-  /dev/disk/by-id/ata-ST31500541AS_6XW0NK21
-    ${pkgs.hdparm}/sbin/hdparm -B 255 \
-  /dev/disk/by-id/ata-ST31500541AS_6XW0P0CW
-  '';
+    i18n = {
+      defaultLocale = "en_US.UTF-8";
+    };
 
-  #### Machine-specific service configuration ####
+    console = {
+      font = "Lat2-Terminus16";
+      keyMap = "dvorak";
+    };
 
-  vuizvui.user.devhell.profiles.services.enable = true;
+    powerManagement.powerUpCommands = ''
+      ${pkgs.hdparm}/sbin/hdparm -B 255 \
+    /dev/disk/by-id/ata-ST31500541AS_6XW0NK21
+      ${pkgs.hdparm}/sbin/hdparm -B 255 \
+    /dev/disk/by-id/ata-ST31500541AS_6XW0P0CW
+    '';
 
-  services = {
-    printing = {
-      enable = true;
-      drivers = [ pkgs.hplipWithPlugin ];
-    };
-    thermald.enable = true;
-    timesyncd.enable = true;
-    resolved.enable = true;
-    canto-daemon.enable = true;
-    offlineimap = {
-      enable = true;
-      install = true;
-      path = [ pkgs.notmuch ];
+    #### Machine-specific service configuration ####
+
+    vuizvui.user.devhell.profiles.services.enable = true;
+
+    services = {
+      printing = {
+        enable = true;
+        drivers = [ pkgs.hplipWithPlugin ];
+      };
+      thermald.enable = true;
+      timesyncd.enable = true;
+      resolved.enable = true;
+      canto-daemon.enable = true;
+      offlineimap = {
+        enable = true;
+        install = true;
+        path = [ pkgs.notmuch ];
+      };
+      syncthing = {
+        enable = true;
+        user = "dev";
+      };
     };
-    syncthing = {
-      enable = true;
-      user = "dev";
-      dataDir = "/home/dev/syncthing/";
-    };
-  };
 
-  services.xserver = {
+    services.xserver = {
     enable = true;
     layout = "dvorak";
     videoDrivers = [ "ati" ];