Skip to content

Commit

Permalink
Merge pull request #17 from j-openmesh/feature/split-repo-over-to-Xno…
Browse files Browse the repository at this point in the history
…depkgs

Split repo over to Xnodepkgs. Integrate the Xnodepkgs repo for nixpkgs.
  • Loading branch information
jaesharp authored Jul 10, 2024
2 parents 600e9e6 + cd8dcce commit 57e8081
Show file tree
Hide file tree
Showing 10 changed files with 25 additions and 192 deletions.
48 changes: 17 additions & 31 deletions flake.lock

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

7 changes: 5 additions & 2 deletions flake.nix
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
{
description = "Xnode OS";
inputs = {
nixpkgs.url = "github:openmesh-network/xnodepkgs/dev";
nixos-generators.url = "github:nix-community/nixos-generators";
nixpkgs.url = "github:Openmesh-Network/Xnodepkgs/dev";
nixos-generators = {
url = "github:nix-community/nixos-generators";
inputs.nixpkgs.follows = "nixpkgs";
};
};
outputs = inputs:
let
Expand Down
1 change: 0 additions & 1 deletion repo/modules/module-list.nix

This file was deleted.

84 changes: 0 additions & 84 deletions repo/modules/services/openmesh/xnode/admin.nix

This file was deleted.

39 changes: 0 additions & 39 deletions repo/pkgs/openmesh/core/default.nix

This file was deleted.

32 changes: 0 additions & 32 deletions repo/pkgs/openmesh/xnode/admin/default.nix

This file was deleted.

1 change: 1 addition & 0 deletions systems/iso.nix
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ inputs.nixos-generators.nixosGenerate {
system = "x86_64-linux";
format = "iso";
modules = [
({ ... }: { nix.registry.nixpkgs.flake = inputs.nixpkgs; })
isoModule
];
}
1 change: 1 addition & 0 deletions systems/kexec.nix
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ inputs.nixos-generators.nixosGenerate {
customFormats = { "kexec-nixos" = import ./custom-formats/kexec.nix; };
format = "kexec-nixos";
modules = [
({ ... }: { nix.registry.nixpkgs.flake = inputs.nixpkgs; })
kexec
];
}
1 change: 1 addition & 0 deletions systems/netboot.nix
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ inputs.nixos-generators.nixosGenerate {
customFormats = { "netboot" = import ./custom-formats/netboot.nix; };
format = "netboot";
modules = [
({ ... }: { nix.registry.nixpkgs.flake = inputs.nixpkgs; })
netboot
];
}
3 changes: 0 additions & 3 deletions systems/xnode-common.nix
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
{ config, lib, pkgs, ... }: {
imports = [
../repo/modules/services/openmesh/xnode/admin.nix
];
config = {
nix.settings.experimental-features = [ "nix-command" "flakes" ];
nix.settings.trusted-users = [ "root" "xnode" "openmesh-xnode-admin" ];
Expand Down

0 comments on commit 57e8081

Please sign in to comment.