Server config cleanup

1 files changed, 6 insertions, 17 deletions

diff --git a/host/Rory-nginx/services/containers/draupnir-linux-mint/container.nix b/host/Rory-nginx/services/containers/draupnir-linux-mint/container.nix
index 57a14bf..6a126f1 100755
--- a/host/Rory-nginx/services/containers/draupnir-linux-mint/container.nix
+++ b/host/Rory-nginx/services/containers/draupnir-linux-mint/container.nix
@@ -1,9 +1,4 @@
-{
-  pkgs,
-  lib,
-  nixpkgs-Draupnir,
-  ...
-}:
+{ nixpkgs-Draupnir, ... }:
 
 {
   privateNetwork = true;
@@ -12,21 +7,15 @@
     inherit nixpkgs-Draupnir;
   };
   config =
+    { lib, pkgs, ... }:
     {
-      lib,
-      pkgs,
-      ...
-    }:
-    {
-      imports = [ 
+      imports = [
+        ../shared.nix
         ./root.nix
+        ./services/draupnir.nix
         "${nixpkgs-Draupnir}/nixos/modules/services/matrix/draupnir.nix"
       ];
-      nixpkgs.overlays = [
-        (final: prev: {
-          draupnir = nixpkgs-Draupnir.legacyPackages.${pkgs.stdenv.hostPlatform.system}.draupnir;
-        })
-      ];
+      nixpkgs.overlays = [ (final: prev: { draupnir = nixpkgs-Draupnir.legacyPackages.${pkgs.stdenv.hostPlatform.system}.draupnir; }) ];
     };
   hostAddress = "192.168.100.18";
   localAddress = "192.168.100.19";