From c4ca4be05a6e6885cc338c0cfb92f9b2d95434cb Mon Sep 17 00:00:00 2001
From: Craige McWhirter <craige@mcwhirter.io>
Date: Mon, 9 Dec 2019 14:57:53 +1000
Subject: [PATCH] Corrected formatting and removed cruft

---
 hosts/cuallaidh.nix | 48 ++++++++++++++++++++-------------------------
 1 file changed, 21 insertions(+), 27 deletions(-)

diff --git a/hosts/cuallaidh.nix b/hosts/cuallaidh.nix
index d483674..e9e5924 100644
--- a/hosts/cuallaidh.nix
+++ b/hosts/cuallaidh.nix
@@ -1,36 +1,30 @@
 # NixOps configuration for cuallaidh
 
+{ config, pkgs, lib, ... }:
+
 {
-  cuallaidh =
-    { config, pkgs, lib, ... }:
 
-    {
+  imports =
+    [
+      ../clusters/linode.nix
+      ../roles/gitea.nix
+      ../roles/hydra.nix
+      ../roles/iohk.nix
+      ../roles/matrix.nix
+      ../roles/nixpkgs-dev.nix
+      ../roles/taskserver.nix
+      ../roles/tt-rss.nix
+      ../secrets/gitea.nix
+      ../secrets/tt-rss.nix
+    ];
 
-      imports =
-        [
-          ../roles/gitea.nix
-          ../roles/hydra.nix
-          ../roles/iohk.nix
-          ../roles/matrix.nix
-          ../roles/nixpkgs-dev.nix
-          #../roles/jormungandr.nix
-          #../roles/syncserver.nix
-          ../roles/taskserver.nix
-          ../roles/tt-rss.nix
-          ../secrets/gitea.nix
-          #../secrets/syncserver.nix
-          ../secrets/tt-rss.nix
-          #/home/craige/source/IOHK/cardano-explorer/nix/nixos/cardano-explorer-fe.nix
-        ];
+  deployment.targetHost = "172.105.171.16";
 
-      deployment.targetHost = "172.105.171.16";
+  networking.hostName = "cuallaidh";   # Define your hostname.
 
-      networking.hostName = "cuallaidh";   # Define your hostname.
+  nix.nixPath = [
+    "nixpkgs=https://nixos.org/channels/nixos-19.09/nixexprs.tar.xz"
+  ];
 
-      nix.nixPath = [
-        "nixpkgs=https://nixos.org/channels/nixos-19.09/nixexprs.tar.xz"
-      ];
-
-      system.stateVersion = "19.03";       # The version of NixOS originally installed
-    };
+  system.stateVersion = "19.03";       # The version of NixOS originally installed
 }