aciceri/nixfleet
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

Move back to linux LTS (remove ddcci workaround)

Browse source
This commit is contained in:
Andrea Ciceri 2024-11-08 10:16:54 +01:00
parent 8af20e204a
commit 2a213c6b28
Signed by: aciceri
SSH key fingerprint: SHA256:/AagBweyV4Hlfg9u092n8hbHwD5fcB6A3qhDiDA65Rg
2 changed files with 88 additions and 119 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
hosts/kirk/default.nix
View file

@ -1,12 +1,5 @@
{ { fleetModules, lib, pkgs, ... }: {
fleetModules, imports = fleetModules [
lib,
pkgs,
...
}:
{
imports =
fleetModules [
"common" "common"
"ssh" "ssh"
"ccr" "ccr"
@ -35,10 +28,7 @@
"prometheus-exporters" "prometheus-exporters"
"promtail" "promtail"
"syncthing" "syncthing"
] ] ++ [ ./disko.nix ];
++ [
./disko.nix
];
ccr = { ccr = {
enable = true; enable = true;
@ -80,17 +70,11 @@
}; };
boot.initrd.kernelModules = [ "i915" ]; boot.initrd.kernelModules = [ "i915" ];
boot.initrd.availableKernelModules = [ boot.initrd.availableKernelModules =
"nvme" [ "nvme" "xhci_pci" "usb_storage" "sd_mod" ];
"xhci_pci" boot.kernelModules = [ "kvm-intel" ];
"usb_storage"
"sd_mod"
];
boot.kernelModules = [
"kvm-intel"
];
boot.kernelPackages = pkgs.linuxKernel.packages.linux_6_10; boot.kernelPackages = pkgs.linuxPackages;
boot.loader.efi.canTouchEfiVariables = true; boot.loader.efi.canTouchEfiVariables = true;
boot.loader.systemd-boot = { boot.loader.systemd-boot = {

53
hosts/picard/default.nix
View file

@ -1,13 +1,5 @@
{ { fleetModules, lib, config, pkgs, ... }: {
fleetModules, imports = fleetModules [
lib,
config,
pkgs,
...
}:
{
imports =
fleetModules [
"common" "common"
"ssh" "ssh"
"ccr" "ccr"
@ -42,10 +34,7 @@
"guix" "guix"
"prometheus-exporters" "prometheus-exporters"
"promtail" "promtail"
] ] ++ [ ./disko.nix ];
++ [
./disko.nix
];
ccr = { ccr = {
enable = true; enable = true;
@ -99,13 +88,8 @@
boot.kernelParams = [ "ip=dhcp" ]; boot.kernelParams = [ "ip=dhcp" ];
boot.initrd.kernelModules = [ "amdgpu" ]; boot.initrd.kernelModules = [ "amdgpu" ];
boot.initrd.availableKernelModules = [ boot.initrd.availableKernelModules =
"nvme" [ "nvme" "xhci_pci" "ahci" "usbhid" "r8169" ];
"xhci_pci"
"ahci"
"usbhid"
"r8169"
];
boot.kernelModules = [ boot.kernelModules = [
"kvm-amd" "kvm-amd"
"ddcci" "ddcci"
@ -126,17 +110,17 @@
})) }))
]; ];
systemd.services.ddcci = { # systemd.services.ddcci = {
script = '' # script = ''
echo 'ddcci 0x37' > /sys/bus/i2c/devices/i2c-2/new_device # echo 'ddcci 0x37' > /sys/bus/i2c/devices/i2c-2/new_device
''; # '';
wantedBy = [ "graphical.target" ]; # wantedBy = [ "graphical.target" ];
restartIfChanged = false; # restartIfChanged = false;
serviceConfig = { # serviceConfig = {
Type = "oneshot"; # Type = "oneshot";
RemainAfterExit = true; # RemainAfterExit = true;
}; # };
}; # };
boot.loader.efi.canTouchEfiVariables = true; boot.loader.efi.canTouchEfiVariables = true;
boot.loader.systemd-boot = { boot.loader.systemd-boot = {
@ -148,13 +132,14 @@
configurationLimit = 20; configurationLimit = 20;
}; };
boot.kernelPackages = pkgs.linuxKernel.packages.linux_6_10; boot.kernelPackages = pkgs.linuxPackages;
networking.hostId = "5b02e763"; networking.hostId = "5b02e763";
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
powerManagement.cpuFreqGovernor = lib.mkDefault "schedutil"; powerManagement.cpuFreqGovernor = lib.mkDefault "schedutil";
hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; hardware.cpu.amd.updateMicrocode =
lib.mkDefault config.hardware.enableRedistributableFirmware;
hardware.enableRedistributableFirmware = lib.mkDefault true; hardware.enableRedistributableFirmware = lib.mkDefault true;
hardware.graphics = { hardware.graphics = {