Commit ec5ca4433b8b

@@ -10,8 +10,6 @@
     ../profiles/dev.nix
     ../profiles/containerd.nix
     ../profiles/buildkitd.nix
-    ../profiles/wireguard.nix
-    ../service/wireguard.client.nix
     ../location/home.nix
     ../hardware/thinkpad-x220.nix
   ];

@@ -11,8 +11,6 @@
     ../profiles/avahi.nix
     ../profiles/containerd.nix
     ../profiles/syncthing.nix
-    ../profiles/wireguard.nix
-    ../service/wireguard.client.nix
     ../location/home.nix
   ];
 

@@ -12,8 +12,6 @@
     ../profiles/virtualization.nix
     ../profiles/dockerization.nix
     ../profiles/gaming.nix
-    ../profiles/wireguard.nix
-    ../service/wireguard.client.nix
     ../location/home.nix
   ];
 

@@ -11,7 +11,6 @@
     ../profiles/containerd.nix
     ../profiles/dockerization.nix
     ../profiles/virtualization.nix
-    ../profiles/wireguard.nix
     ../location/docker.nix
     ../location/home.nix
     ../hardware/thinkpad-t460s.nix

@@ -49,6 +49,8 @@ in
     };
   };
   config = mkIf cfg.enable {
+    boot.extraModulePackages = [ config.boot.kernelPackages.wireguard ];
+    environment.systemPackages = [ pkgs.wireguard ];
     networking.wireguard.interfaces = {
       wg0 = {
         ips = cfg.ips;

@@ -3,5 +3,9 @@
 {
   imports = [
     ./programs/podman.nix
+    ./services/wireguard.client.nix
+    ./virtualisation/buildkit.nix
+    ./virtualisation/containerd.nix
+    ./virtualisation/docker.nix
   ];
 }

@@ -1,7 +1,7 @@
 { config, pkgs, ... }:
 
 {
-  imports = [ ./containerd.nix ../service/buildkit.nix ];
+  imports = [ ./containerd.nix ];
   environment.systemPackages = with pkgs; [
     buildkit
   ];

@@ -1,7 +1,6 @@
 { config, pkgs, ... }:
 
 {
-  imports = [ ../service/containerd.nix ];
   environment.systemPackages = with pkgs; [
     cni
     cni-plugins

@@ -2,11 +2,6 @@
 { config, pkgs, ...}:
 
 {
-  imports = [
-    ../service/docker.nix
-    # Remove once containerd module is upstream
-    ../service/containerd.nix
-  ];
   environment.systemPackages = with pkgs; [
     python27Packages.docker_compose
     docker-machine

@@ -1,6 +0,0 @@
-{ config, pkgs, ... }:
-
-{
-  boot.extraModulePackages = [ config.boot.kernelPackages.wireguard ];
-  environment.systemPackages = [ pkgs.wireguard ];
-}

@@ -1,10 +1,8 @@
 { config, pkgs, ... }:
 
-{
-  imports = [
-    ./wireguard.nix
-  ];
-  
+{  
+  boot.extraModulePackages = [ config.boot.kernelPackages.wireguard ];
+  environment.systemPackages = [ pkgs.wireguard ];
   boot.kernel.sysctl."net.ipv4.ip_forward" = 1;
   networking.firewall.extraCommands = ''
     iptables -t nat -A POSTROUTING -s10.100.0.0/24 -j MASQUERADE