Skip to content

Commit

Permalink
Updated submerge dependency
Browse files Browse the repository at this point in the history
  • Loading branch information
rasmus-kirk committed Sep 20, 2024
1 parent c93ecf8 commit a3fad60
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 15 deletions.
16 changes: 8 additions & 8 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 4 additions & 5 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
vpnconfinement.url = "github:Maroka-chan/VPN-Confinement";
vpnconfinement.inputs.nixpkgs.follows = "nixpkgs";

sub-merge.url = "github:rasmus-kirk/sub-merge";
sub-merge.inputs.nixpkgs.follows = "nixpkgs";
submerger.url = "github:rasmus-kirk/submerger";
submerger.inputs.nixpkgs.follows = "nixpkgs";

# Flake stuff
flake-parts.url = "github:hercules-ci/flake-parts";
Expand All @@ -31,7 +31,7 @@
outputs = {
flake-parts,
vpnconfinement,
sub-merge,
submerger,
...
} @ inputs:
flake-parts.lib.mkFlake {
Expand All @@ -48,9 +48,8 @@

flake = {
nixosModules = rec {
nixarr = import ./nixarr sub-merge vpnconfinement;
nixarr = import ./nixarr submerger vpnconfinement;
imports = [ vpnconfinement.nixosModules.default ];
#specialArgs = { inherit sub-merge; };
default = nixarr;
};
};
Expand Down
4 changes: 2 additions & 2 deletions nixarr/default.nix
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
sub-merge: vpnconfinement: { pkgs, ... }: {
submerger: vpnconfinement: { pkgs, ... }: {
imports = [
vpnconfinement.nixosModules.default
./nixarr.nix
];

config.environment.systemPackages = [ sub-merge.packages."${pkgs.system}".default ];
config.environment.systemPackages = [ submerger.packages."${pkgs.system}".default ];
}

0 comments on commit a3fad60

Please sign in to comment.