From 7efa5bc380c4b8afcce61f9f4d6d52096b05f5e2 Mon Sep 17 00:00:00 2001
From: rasmus-kirk <mail@rasmuskirk.com>
Date: Sat, 26 Oct 2024 10:21:49 +0000
Subject: [PATCH] Reintegrating submerger

---
 flake.lock         | 30 +++++++++++++++---------------
 flake.nix          | 22 +++++++++++-----------
 nixarr/default.nix |  6 ++----
 3 files changed, 28 insertions(+), 30 deletions(-)

diff --git a/flake.lock b/flake.lock
index 6ea6013..5697e95 100644
--- a/flake.lock
+++ b/flake.lock
@@ -8,11 +8,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1727826117,
-        "narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=",
+        "lastModified": 1717285511,
+        "narHash": "sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1",
+        "rev": "2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8",
         "type": "github"
       },
       "original": {
@@ -23,11 +23,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1726583932,
-        "narHash": "sha256-zACxiQx8knB3F8+Ze+1BpiYrI+CbhxyWpcSID9kVhkQ=",
+        "lastModified": 1729850857,
+        "narHash": "sha256-WvLXzNNnnw+qpFOmgaM3JUlNEH+T4s22b5i2oyyCpXE=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "658e7223191d2598641d50ee4e898126768fe847",
+        "rev": "41dea55321e5a999b17033296ac05fe8a8b5a257",
         "type": "github"
       },
       "original": {
@@ -52,11 +52,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1726626348,
-        "narHash": "sha256-sYV7e1B1yLcxo8/h+/hTwzZYmaju2oObNiy5iRI0C30=",
+        "lastModified": 1729909612,
+        "narHash": "sha256-eXqxxbOagphPfjPptSlv0pQONB3fH15CQ4G8uCu1BW4=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "6fd52ad8bd88f39efb2c999cc971921c2fb9f3a2",
+        "rev": "17cadbc36da05e75197d082decb382a5f4208e30",
         "type": "github"
       },
       "original": {
@@ -73,11 +73,11 @@
         "rust-overlay": "rust-overlay"
       },
       "locked": {
-        "lastModified": 1726842908,
-        "narHash": "sha256-sn3oWKcdXmy42wsBg1yCFBHHRCKVkQ+D8YnlLY/RX3A=",
+        "lastModified": 1729941594,
+        "narHash": "sha256-edy337w7tQ8dsEEl/gHfgyXCufghUVh3/plT+wqZOZ4=",
         "owner": "rasmus-kirk",
         "repo": "submerger",
-        "rev": "6ffa3b28017d9d67c48a2f9de98788da05aa5ba2",
+        "rev": "9956bc9e91a5bcc56c63bb0a6cbb39b1632b49c6",
         "type": "github"
       },
       "original": {
@@ -94,11 +94,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1725824375,
-        "narHash": "sha256-c0nVYn1Jcjqt7XLXRM7jBmkvwMu+qcUVO7AL8+ZwiaQ=",
+        "lastModified": 1728856097,
+        "narHash": "sha256-GcheritdNs1AHFWksLWZOe48J0NXUibiZVSewqWfo44=",
         "owner": "Maroka-chan",
         "repo": "VPN-Confinement",
-        "rev": "0fc1023446e906094fef69ccd6991d8659b34d42",
+        "rev": "eb39d4c45db70818d58239454fd7747aab5e1871",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 382f1a0..8dde94a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -7,14 +7,14 @@
     vpnconfinement.url = "github:Maroka-chan/VPN-Confinement";
     vpnconfinement.inputs.nixpkgs.follows = "nixpkgs";
 
-    #submerger.url = "github:rasmus-kirk/submerger";
-    #submerger.inputs.nixpkgs.follows = "nixpkgs";
+    submerger.url = "github:rasmus-kirk/submerger";
+    submerger.inputs.nixpkgs.follows = "nixpkgs";
   };
 
   outputs = {
     nixpkgs,
     vpnconfinement,
-    #submerger,
+    submerger,
     ...
   } @ inputs:
     let
@@ -31,10 +31,11 @@
         pkgs = import nixpkgs { inherit system; };
       });
     in {
-      nixosModules = rec {
-        nixarr = import ./nixarr vpnconfinement; #submerger vpnconfinement;
-        imports = [ vpnconfinement.nixosModules.default ];
-        default = nixarr;
+      nixosModules = {
+        default = {
+          config._module.args = {inherit submerger;};
+          imports = [ ./nixarr vpnconfinement.nixosModules.default ];
+        };
       };
 
       devShells = forAllSystems ({ pkgs } : {
@@ -46,11 +47,10 @@
         };
       });
 
-      packages = forAllSystems ({ pkgs } : rec {
-        docs = pkgs.callPackage ./mkDocs.nix {inherit inputs;};
-        default = docs;
+      packages = forAllSystems ({ pkgs } : {
+        default = pkgs.callPackage ./mkDocs.nix {inherit inputs;};
       });
 
-      formatter = forAllSystems ({pkgs}: pkgs.alejandra);
+      formatter = forAllSystems ({ pkgs }: pkgs.alejandra);
     };
 }
diff --git a/nixarr/default.nix b/nixarr/default.nix
index 1e0c37f..4a4e76e 100644
--- a/nixarr/default.nix
+++ b/nixarr/default.nix
@@ -1,9 +1,7 @@
-#submerger: vpnconfinement: { pkgs, ... }: {
-vpnconfinement: { pkgs, ... }: {
+{ submerger, pkgs, ... }: {
   imports = [
-    vpnconfinement.nixosModules.default
     ./nixarr.nix
   ];
 
-  #config.environment.systemPackages = [ submerger.packages."${pkgs.system}".default ];
+  config.environment.systemPackages = [ submerger.packages."${pkgs.system}".default ];
 }