-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into feature/klipper-nix
- Loading branch information
Showing
63 changed files
with
752 additions
and
406 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,52 @@ | ||
| name: Build x86 | ||
| on: | ||
| push: | ||
| workflow_dispatch: | ||
|
|
||
| jobs: | ||
| build_system: | ||
| runs-on: ubuntu-latest | ||
| strategy: | ||
| matrix: | ||
| host: | ||
| - nixos-nas | ||
| - nixos-depsos | ||
| - nixos-hyperos | ||
| - wsl-tl-wsl | ||
| steps: | ||
| - name: Checkout repository | ||
| uses: actions/checkout@v3 | ||
| - name: Install Nix | ||
| uses: cachix/install-nix-action@v20 | ||
| with: | ||
| nix_path: nixpkgs=channel:nixos-23.05 | ||
| extra_nix_config: | | ||
| access-tokens = github.com=${{ secrets.GITHUB_TOKEN }} | ||
| - uses: cachix/cachix-action@v12 | ||
| with: | ||
| name: truelecter | ||
| extraPullNames: cuda-maintainers, mic92, nix-community, nrdxp | ||
| authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}" | ||
| - name: Build system configuration | ||
| run: | | ||
| nix build ".#nixosConfigurations.${{ matrix.host }}.config.system.build.toplevel" | ||
| build_shell: | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - name: Checkout repository | ||
| uses: actions/checkout@v3 | ||
| - name: Install Nix | ||
| uses: cachix/install-nix-action@v20 | ||
| with: | ||
| nix_path: nixpkgs=channel:nixos-23.05 | ||
| extra_nix_config: | | ||
| access-tokens = github.com=${{ secrets.GITHUB_TOKEN }} | ||
| - uses: cachix/cachix-action@v12 | ||
| with: | ||
| name: truelecter | ||
| extraPullNames: cuda-maintainers, mic92, nix-community, nrdxp | ||
| authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}" | ||
| - name: Build shell | ||
| run: | | ||
| nix develop --command "menu" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,16 +1,11 @@ | ||
| { | ||
| inputs, | ||
| cell, | ||
| }: let | ||
| inherit (inputs) nixpkgs std haumea nixos; | ||
| l = nixpkgs.lib // builtins; | ||
| in | ||
| haumea.lib.load { | ||
| src = ./profiles; | ||
| # loader = haumea.lib.loaders.path; | ||
| transformer = haumea.lib.transformers.liftDefault; | ||
| }: | ||
| cell.lib.importProfiles { | ||
| src = ./profiles; | ||
|
|
||
| inputs = { | ||
| inherit cell inputs; | ||
| }; | ||
| } | ||
| inputs = { | ||
| inherit cell inputs; | ||
| }; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,69 @@ | ||
| { | ||
| inputs, | ||
| cell, | ||
| }: let | ||
| inherit (inputs) haumea; | ||
|
|
||
| defaultNixpkgs = import inputs.nixpkgs {inherit (inputs.nixpkgs) system;}; | ||
| in rec { | ||
| importProfiles = { | ||
| inputs ? {}, | ||
| src, | ||
| }: | ||
| haumea.lib.load { | ||
| inherit src inputs; | ||
|
|
||
| transformer = haumea.lib.transformers.liftDefault; | ||
| }; | ||
|
|
||
| importModules = {src}: | ||
| haumea.lib.load { | ||
| inherit src; | ||
| loader = haumea.lib.loaders.path; | ||
| }; | ||
|
|
||
| combineModules = {src}: _: { | ||
| imports = builtins.attrValues ( | ||
| importModules { | ||
| inherit src; | ||
| } | ||
| ); | ||
| }; | ||
|
|
||
| # TODO: pass nixpkgs as well, implicit bee module | ||
| importSystemConfigurations = { | ||
| src, | ||
| suites, | ||
| profiles, | ||
| userProfiles, | ||
| lib, | ||
| inputs, | ||
| overlays ? {}, | ||
| }: | ||
| haumea.lib.load { | ||
| inherit src; | ||
| transformer = haumea.lib.transformers.liftDefault; | ||
| inputs = { | ||
| inherit suites profiles userProfiles lib inputs overlays; | ||
| }; | ||
| }; | ||
|
|
||
| importPackages = { | ||
| nixpkgs ? defaultNixpkgs, | ||
| sources ? null, | ||
| extraArguments ? {}, | ||
| packages, | ||
| }: let | ||
| sources' = nixpkgs.callPackage sources {}; | ||
| in | ||
| nixpkgs.lib.mapAttrs ( | ||
| _: v: nixpkgs.callPackage v (extraArguments // {sources = sources';}) | ||
| ) | ||
| ( | ||
| haumea.lib.load { | ||
| src = packages; | ||
|
|
||
| loader = haumea.lib.loaders.path; | ||
| } | ||
| ); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.