Added vatnajokull NAS as a separate module

hosts/reykjavik/default.nix

@@ -63,6 +63,8 @@ in
     system.pass.enable = true;
     system.sshfs.enable = true;
 
+    server.vatnajokull.enable = true;
+
     # - Desktop ----------------------------------
     desktop = {
       inherit wallpaper;

hosts/reykjavik/hardware.nix

@@ -22,13 +22,6 @@
       device = "/dev/disk/by-label/BOOT";
       fsType = "vfat";
     };
-
-    "/mnt/vatnajokull" = {
-      device = "vatnajokull:/mnt/raid1";
-      fsType = "nfs";
-      options = [ "x-systemd.automount" "noauto" "noatime" "x-systemd.idle-timeout=600"];
-    };
-
   };
 
   swapDevices = [

hosts/thingvellir/default.nix

@@ -61,6 +61,7 @@ with lib;
       server = true;
       host-config = ../../config/nomad.d/host-thingvellir.hcl;
     };
+    server.vatnajokull.enable = true;
 
     # - Editors and development ------------------
     dev.git.userName = "marc";

hosts/thingvellir/hardware.nix

@@ -17,13 +17,6 @@
       device = "/dev/disk/by-label/nixos";
       fsType = "ext4";
     };
-
-    "/mnt/vatnajokull" = {
-      # device = "vatnajokull:/mnt/raid1";
-      device = "100.89.248.65:/mnt/raid1";
-      fsType = "nfs";
-      options = [ "x-systemd.automount" "noauto" "noatime" "x-systemd.idle-timeout=600"];
-    };
   };
 
   swapDevices = [

modules/server/vatnajokull.nix

@@ -0,0 +1,21 @@
+{ config, lib, pkgs, self, ... }:
+
+let
+  vatnajokull-ip = "100.89.248.65";
+  cfg = config.samfelag.modules.server.vatnajokull;
+in
+{
+  options.samfelag.modules.server.vatnajokull = {
+    enable = lib.mkEnableOption "Vatnajokull NAS";
+  };
+  config = lib.mkIf cfg.enable {
+
+    fileSystems = {
+      "/mnt/vatnajokull" = {
+        device = "${vatnajokull-ip}:/mnt/raid1";
+        fsType = "nfs";
+        options = [ "x-systemd.automount" "noauto" "noatime" "x-systemd.idle-timeout=600"];
+      };
+    };
+  };
+}