erwin/nixos-config
1
0
Fork 0
Code Issues 1 Pull requests Projects 1 Releases Wiki Activity Actions

Remove kernel option from base module

Browse source
This commit is contained in:
Erwin Boskma 2023-05-25 08:01:53 +02:00
parent 34f04ca705
commit b73a53c427
Signed by: erwin
SSH key fingerprint: SHA256:3F6Cm6I3erRqlBwEghZWAQl6eS5WrGTX1Vs/Evec1lQ
4 changed files with 12 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
machines/mimir/configuration.nix
View file

@ -36,7 +36,6 @@
base = { base = {
plymouth.enable = true; plymouth.enable = true;
work = true; work = true;
kernel = pkgs.linuxKernel.packages.linux_6_2;
}; };
desktop = { desktop = {
@ -66,12 +65,15 @@
}; };
# Use the systemd-boot EFI boot loader. # Use the systemd-boot EFI boot loader.
boot.loader = { boot = {
systemd-boot = { kernelPackages = pkgs.linuxPackages_6_2;
enable = true; loader = {
configurationLimit = 15; systemd-boot = {
enable = true;
configurationLimit = 15;
};
efi.canTouchEfiVariables = true;
}; };
efi.canTouchEfiVariables = true;
}; };
time.timeZone = "Europe/Amsterdam"; time.timeZone = "Europe/Amsterdam";

5
machines/regin/configuration.nix
View file

@ -7,6 +7,7 @@
../../users/root ../../users/root
../../users/erwin ../../users/erwin
./home.nix
]; ];
eboskma = { eboskma = {
@ -14,14 +15,13 @@
enable = true; enable = true;
server = true; server = true;
}; };
base.kernel = pkgs.linuxPackages_rpi4;
klipper.enable = true; klipper.enable = true;
networking.enable = true; networking.enable = true;
nix-common.enable = true; nix-common.enable = true;
systemd.enable = true; systemd.enable = true;
}; };
users.users.erwin.initialHashedPassword = "$6$Tm4P3XjXJ/QrNaYW$7VqMt.AdQEtHXKjTWCJ3NVq1BiD.mx57skA3ZZrO7LgYnTM/jJLcD0CjWuED57IeGnKdBqYB1tFI5.J.UIVhR."; # nixpkgs.crossSystem.system = "aarch64-linux";
hardware = { hardware = {
enableAllFirmware = true; # This also sets hardware.enableRedistributableFirmware enableAllFirmware = true; # This also sets hardware.enableRedistributableFirmware
@ -33,6 +33,7 @@
boot = { boot = {
bootspec.enable = true; bootspec.enable = true;
kernelPackages = pkgs.linuxPackages_rpi4;
}; };
zramSwap.enable = true; zramSwap.enable = true;

3
machines/thor/configuration.nix
View file

@ -16,7 +16,6 @@
enable = true; enable = true;
}; };
base = { base = {
kernel = pkgs.linuxKernel.packages.linux_rpi4;
plymouth.enable = true; plymouth.enable = true;
}; };
desktop = { desktop = {
@ -41,12 +40,12 @@
enableAllFirmware = true; enableAllFirmware = true;
raspberry-pi."4".fkms-3d = { raspberry-pi."4".fkms-3d = {
enable = true; enable = true;
cma = 256;
}; };
}; };
boot = { boot = {
bootspec.enable = true; bootspec.enable = true;
kernelPackages = pkgs.linuxPackages_rpi4;
}; };
zramSwap.enable = true; zramSwap.enable = true;

8
modules/base/default.nix
View file

@ -33,12 +33,6 @@ with lib; let
in in
{ {
options.eboskma.base = { options.eboskma.base = {
kernel = mkOption {
description = "which kernel to run";
type = types.unspecified;
default = pkgs.linuxPackages;
};
plymouth = { plymouth = {
enable = mkEnableOption "plymouth splash screen"; enable = mkEnableOption "plymouth splash screen";
}; };
@ -59,8 +53,6 @@ in
}; };
config = { config = {
boot.kernelPackages = cfg.kernel;
boot.plymouth = mkIf cfg.plymouth.enable { boot.plymouth = mkIf cfg.plymouth.enable {
enable = true; enable = true;
themePackages = [ plymouth-nixos-blur ]; themePackages = [ plymouth-nixos-blur ];