fujin/nixarr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reintegrating submerger

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