Fix server config

2 files changed, 21 insertions, 9 deletions

diff --git a/flake.nix b/flake.nix

index 2d98cfa..f1cf8e9 100755
--- a/flake.nix
+++ b/flake.nix
@@ -166,6 +166,7 @@
             inherit grapevine;
             inherit conduit;
             inherit nixpkgs-Draupnir;
+            inherit nixpkgs-DraupnirPkg;
             inherit cgit-magenta;
 
             inherit (inputs) draupnirSrc;
diff --git a/host/Rory-ovh/configuration.nix b/host/Rory-ovh/configuration.nix

index 6be6b1f..7efa89b 100755
--- a/host/Rory-ovh/configuration.nix
+++ b/host/Rory-ovh/configuration.nix
@@ -1,11 +1,8 @@
 {
   pkgs,
-  config,
   lib,
-  grapevine,
-  conduit,
-  conduwuit,
   nixpkgs-Draupnir,
+  nixpkgs-DraupnirPkg,
   ...
 }:
 
@@ -55,7 +52,12 @@
       name = "enp98s0f0";
       DHCP = "no";
       #gateway = [ "51.210.113.254" ];
-      routes = [ { Gateway = "51.210.113.254"; GatewayOnLink = true; } ];
+      routes = [
+        {
+          Gateway = "51.210.113.254";
+          GatewayOnLink = true;
+        }
+      ];
       address = [ "51.210.113.110/32" ];
     };
   };
@@ -79,19 +81,28 @@
   services.irqbalance.enable = true;
 
   environment.memoryAllocator.provider = "jemalloc";
-  
+
   containers."draupnir-cme" = import ./services/containers/draupnir-cme/container.nix {
-    inherit pkgs lib nixpkgs-Draupnir;
+    inherit
+      pkgs
+      lib
+      nixpkgs-Draupnir
+      nixpkgs-DraupnirPkg
+      ;
   };
   containers."draupnir-fedora" = import ./services/containers/draupnir-fedora/container.nix {
-    inherit pkgs lib nixpkgs-Draupnir;
+    inherit
+      pkgs
+      lib
+      nixpkgs-Draupnir
+      nixpkgs-DraupnirPkg
+      ;
   };
 
   system.stateVersion = "22.11"; # DO NOT EDIT!
 
   environment.systemPackages = with pkgs; [ waypipe ];
 
-
   nix.nrBuildUsers = 128;
   services.owncast = {
     enable = true;