Reintegrating submerger

This commit is contained in:
rasmus-kirk
2024-10-26 10:21:49 +00:00
parent 3df58a0b1e
commit 7efa5bc380
3 changed files with 28 additions and 30 deletions
+11 -11
View File
@@ -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);
};
}