Skip to content

Refactor module composition#1134

Merged
fricklerhandwerk merged 3 commits into
ngi-nix:mainfrom
eljamm:modules
Jun 12, 2025
Merged

Refactor module composition#1134
fricklerhandwerk merged 3 commits into
ngi-nix:mainfrom
eljamm:modules

Conversation

@eljamm
Copy link
Copy Markdown
Contributor

@eljamm eljamm commented Jun 11, 2025

Changes

  • Refactor module composition:
    • expose nixos-modules to the flake's nixosModules
    • Import demo-shell in ngipkgs module
      • This makes it possible to use demo-shell inside the NixOS tests, which we're gonna need for experimenting with Spike: Test all project demos #1028
      • Note: we should look into separating this from production code, but this is a good step forward
  • Small refactors

Needed for: #1118 #1123

Worked on this with @themadbit

@eljamm

This comment was marked as outdated.

@eljamm

This comment was marked as resolved.

Comment thread projects/Openfire/module.nix Outdated
Comment thread overview/demo/default.nix Outdated
Comment thread overview/demo/default.nix
Comment thread overview/demo/vm.nix Outdated
Comment thread overview/demo/vm.nix Outdated
@eljamm eljamm force-pushed the modules branch 2 times, most recently from c28401b to b122fe9 Compare June 12, 2025 04:40
eljamm added 3 commits June 12, 2025 06:47
and remove `sops-nix` from global import as it's already imported and
works inside the individual tests that need it.
Which makes it possible to use demo-shell inside the NixOS tests and
systems. In the future, we should look into separating this properly
from production code.
@fricklerhandwerk fricklerhandwerk merged commit c1fc875 into ngi-nix:main Jun 12, 2025
14 checks passed
@github-project-automation github-project-automation Bot moved this to Done in Nix@NGI Jun 12, 2025
@eljamm eljamm deleted the modules branch June 12, 2025 08:34
@eljamm eljamm mentioned this pull request Jun 20, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.

2 participants