steveej/nixos-x13s
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor: remove multi-kernel support, clarify maintnenance

Browse source
This commit is contained in:
steveej 2024-10-14 15:02:22 +02:00
parent f691c12548
commit 06c0bc1b3f
3 changed files with 6 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

53
README.md
View file

@ -1,40 +1,20 @@
# nixos x13s
> [!CAUTION]
> This project is unmaintained.
> This project is partially maintained.
> It receives kernel updates, until mainline will provide a fully functional experience.
This repository aims to provide easy, shared, support for Lenovo X13s on Linux.
The support for this machine is constantly improving in mainline kernel and upstream packages. Eventually the goal is that this repository is no longer necessary.
## Binary cache
A binary cache is provided through Cachix so you can avoid re-building the kernel.
https://app.cachix.org/cache/nixos-x13s
Ensure you are not overriding the nixpkgs input when consuming this flake, or you may not be able to take advantages of this cache.
NixOS configuration example:
```nix
nix.settings = {
substituters = [
"https://nixos-x13s.cachix.org"
];
trusted-public-keys = [
"nixos-x13s.cachix.org-1:SzroHbidolBD3Sf6UusXp12YZ+a5ynWv0RtYF0btFos="
];
};
```
## Add with a flake
```nix
{
inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
nixos-x13s.url = "git+https://codeberg.org/adamcstephens/nixos-x13s";
nixos-x13s.url = "git+https://codeberg.org/steveej/nixos-x13s";
};
outputs =
@ -46,13 +26,7 @@ NixOS configuration example:
inputs.nixos-x13s.nixosModules.default
{
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
specialisation = {
# note that activation of each specialization is required to copy the dtb to the EFI, and thus boot
mainline.configuration.nixos-x13s.kernel = "mainline";
};
nixos-x13s.kernel = "jhovold"; # jhovold is default
# allow unfree firmware
nixpkgs.config.allowUnfree = true;
@ -66,25 +40,6 @@ NixOS configuration example:
}
```
## Add using not a flake
Clone the repository:
```
git clone https://codeberg.org/adamcstephens/nixos-x13s /etc/nixos/nixos-x13s
```
Then reference the module in your `configuration.nix` and use the module as documented in the flake example above:
```nix
imports =
[
./nixos-x13s/module.nix
];
nixos-x13s.enable = true;
...
```
## UEFI Update ISO
This repository provides a package which can output the USB UEFI Update ISO. This will be updated as Lenovo releases new versions.

2
flake.nix
View file

@ -59,7 +59,7 @@
{ config, pkgs, ... }:
{
nixos-x13s.enable = true;
nixos-x13s.kernel = "jhovold"; # jhovold is default, but mainline supported
nixos-x13s.kernel = "jhovold"; # jhovold is default
# allow unfree firmware
nixpkgs.config.allowUnfree = true;

6
module.nix
View file

@ -10,9 +10,6 @@ let
cfg = config.nixos-x13s;
linuxPackages_x13s =
if cfg.kernel == "mainline" then
pkgs.linuxPackages_latest
else
pkgs.linuxPackagesFor (
if cfg.kernel == "jhovold" then x13sPackages.linux_jhovold else throw "Unsupported kernel"
);
@ -46,9 +43,8 @@ in
kernel = lib.mkOption {
type = lib.types.enum [
"jhovold"
"mainline"
];
description = "Which patched kernel to use. jhovold is the latest RC or release with some x13s specific patches, and mainline is nixos latest";
description = "Which patched kernel to use. jhovold is the latest RC or release with some x13s specific patches.";
default = "jhovold";
};
};