mart-w/nixos-x13s
1
0
Fork 0
mirror of https://codeberg.org/mart-w/nixos-x13s.git synced 2024-12-26 21:43:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

- adding an iso package to the flake

Browse source 
- floating dtbName up into the flake so it can be referenced
  by the module and the iso
- linting with nixfmt-rfc-style
This commit is contained in:
Daniel Barter 2024-05-12 13:28:24 -07:00 committed by Adam Stephens
parent 8e01e9917f
commit dec99e46ed
No known key found for this signature in database
3 changed files with 65 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -1 +1,2 @@
.secret.envrc .secret.envrc
result

80
flake.nix
View file

@ -6,6 +6,9 @@
outputs = outputs =
inputs@{ flake-parts, self, ... }: inputs@{ flake-parts, self, ... }:
let
dtbName = "sc8280xp-lenovo-thinkpad-x13s.dtb";
in
flake-parts.lib.mkFlake { inherit inputs; } { flake-parts.lib.mkFlake { inherit inputs; } {
imports = [ ./packages/part.nix ]; imports = [ ./packages/part.nix ];
@ -18,30 +21,71 @@
{ pkgs, ... }: { pkgs, ... }:
{ {
devShells.default = pkgs.mkShellNoCC { packages = [ pkgs.npins ]; }; devShells.default = pkgs.mkShellNoCC { packages = [ pkgs.npins ]; };
packages = {
iso = self.nixosConfigurations.iso.config.system.build.isoImage;
};
}; };
flake.nixosModules.default = import ./module.nix; flake.nixosModules.default = import ./module.nix { inherit dtbName; };
flake.nixosConfigurations.example = inputs.nixpkgs.lib.nixosSystem { flake.nixosConfigurations = {
system = "aarch64-linux"; example = inputs.nixpkgs.lib.nixosSystem {
modules = [ system = "aarch64-linux";
self.nixosModules.default modules = [
{ self.nixosModules.default
nixos-x13s.enable = true; {
nixos-x13s.kernel = "jhovold"; # jhovold is default, but mainline supported nixos-x13s.enable = true;
nixos-x13s.kernel = "jhovold"; # jhovold is default, but mainline supported
# install multiple kernels! note this increases eval time for each specialization # install multiple kernels! note this increases eval time for each specialization
# specialisation = { # specialisation = {
# mainline.configuration.nixos-x13s.kernel = "mainline"; # mainline.configuration.nixos-x13s.kernel = "mainline";
# }; # };
# allow unfree firmware # allow unfree firmware
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;
# define your fileSystems # define your fileSystems
fileSystems."/".device = "/dev/notreal"; fileSystems."/".device = "/dev/notreal";
} }
]; ];
};
iso = inputs.nixpkgs.lib.nixosSystem {
system = "aarch64-linux";
modules = [
self.nixosModules.default
{
nixos-x13s = {
enable = true;
kernel = "mainline";
};
}
(
{ modulesPath, config, ... }:
let
dtb = "${config.boot.kernelPackages.kernel}/dtbs/qcom/${dtbName}";
in
{
imports = [ "${toString modulesPath}/installer/cd-dvd/iso-image.nix" ];
nixpkgs.config.allowUnfree = true;
isoImage = {
makeEfiBootable = true;
makeUsbBootable = true;
contents = [
{
source = dtb;
target = "/" + dtbName;
}
];
};
}
)
];
};
}; };
}; };
} }

7
module.nix
View file

@ -1,3 +1,4 @@
{ dtbName }:
{ {
config, config,
lib, lib,
@ -9,16 +10,12 @@ let
x13sPackages = import ./packages/default.nix { inherit lib pkgs; }; x13sPackages = import ./packages/default.nix { inherit lib pkgs; };
dtbName = "sc8280xp-lenovo-thinkpad-x13s.dtb";
linuxPackages_x13s = linuxPackages_x13s =
if cfg.kernel == "mainline" then if cfg.kernel == "mainline" then
pkgs.linuxPackages_latest pkgs.linuxPackages_latest
else else
pkgs.linuxPackagesFor ( pkgs.linuxPackagesFor (
if cfg.kernel == "jhovold" then if cfg.kernel == "jhovold" then x13sPackages.linux_jhovold else throw "Unsupported kernel"
x13sPackages.linux_jhovold
else
throw "Unsupported kernel"
); );
dtb = "${linuxPackages_x13s.kernel}/dtbs/qcom/${dtbName}"; dtb = "${linuxPackages_x13s.kernel}/dtbs/qcom/${dtbName}";
dtbEfiPath = "dtbs/${cfg.kernel}/${config.boot.kernelPackages.kernel.version}/${dtbName}"; dtbEfiPath = "dtbs/${cfg.kernel}/${config.boot.kernelPackages.kernel.version}/${dtbName}";