Skip to content

Commit

Permalink
[create-pull-request] automated change (#16)
Browse files Browse the repository at this point in the history
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
  • Loading branch information
github-actions[bot] and github-actions[bot] authored Aug 2, 2024
1 parent 8840a50 commit 9b0fdad
Show file tree
Hide file tree
Showing 3 changed files with 35 additions and 36 deletions.
61 changes: 30 additions & 31 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -11,37 +11,36 @@
nixpkgs.url = "nixpkgs/nixos-unstable";
bcachefs-tools.url = "github:koverstreet/bcachefs-tools";
};
outputs = {
self,
nixpkgs,
...
} @ inputs: let
system = "x86_64-linux"; # change arch here
outputs =
{ self, nixpkgs, ... }@inputs:
let
system = "x86_64-linux"; # change arch here

specialArgs = {
inherit system;
inherit inputs;
specialArgs = {
inherit system;
inherit inputs;
};
in
{
formatter.${system} = nixpkgs.legacyPackages.${system}.alejandra;
## GRAPHICAL ISO ##
nixosConfigurations.nixos-iso = nixpkgs.lib.nixosSystem {
inherit system;
modules = [
"${nixpkgs}/nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix"
"${nixpkgs}/nixos/modules/installer/cd-dvd/channel.nix"
./graphical-configuration.nix
];
inherit specialArgs;
};
## MINIMAL ISO ##
nixosConfigurations.nixos-minimal = nixpkgs.lib.nixosSystem {
inherit system;
modules = [
"${nixpkgs}/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix"
./minimal-configuration.nix
];
inherit specialArgs;
};
};
in {
formatter.${system} = nixpkgs.legacyPackages.${system}.alejandra;
## GRAPHICAL ISO ##
nixosConfigurations.nixos-iso = nixpkgs.lib.nixosSystem {
inherit system;
modules = [
"${nixpkgs}/nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix"
"${nixpkgs}/nixos/modules/installer/cd-dvd/channel.nix"
./graphical-configuration.nix
];
inherit specialArgs;
};
## MINIMAL ISO ##
nixosConfigurations.nixos-minimal = nixpkgs.lib.nixosSystem {
inherit system;
modules = [
"${nixpkgs}/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix"
./minimal-configuration.nix
];
inherit specialArgs;
};
};
}
7 changes: 3 additions & 4 deletions graphical-configuration.nix
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@
system,
inputs,
...
}: {
}:
{
nixpkgs.hostPlatform = lib.mkDefault system;
nix.settings.experimental-features = [
"nix-command"
Expand Down Expand Up @@ -53,8 +54,6 @@
systemd.enableUnifiedCgroupHierarchy = lib.mkForce false;

nixpkgs.overlays = [
(final: prev: {
bcachefs-tools = inputs.bcachefs-tools.packages.${pkgs.system}.bcachefs-tools;
})
(final: prev: { bcachefs-tools = inputs.bcachefs-tools.packages.${pkgs.system}.bcachefs-tools; })
];
}
3 changes: 2 additions & 1 deletion minimal-configuration.nix
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@
pkgs,
system,
...
}: {
}:
{
nixpkgs.hostPlatform = lib.mkDefault system;
nix.settings.experimental-features = [
"nix-command"
Expand Down

0 comments on commit 9b0fdad

Please sign in to comment.