Fixed: Kernel Packages
This commit is contained in:
36
flake.lock
generated
36
flake.lock
generated
@@ -19,11 +19,11 @@
|
||||
"nixpkgs-lib": "nixpkgs-lib"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1768135262,
|
||||
"narHash": "sha256-PVvu7OqHBGWN16zSi6tEmPwwHQ4rLPU9Plvs8/1TUBY=",
|
||||
"lastModified": 1769996383,
|
||||
"narHash": "sha256-AnYjnFWgS49RlqX7LrC4uA+sCCDBj0Ry/WOJ5XWAsa0=",
|
||||
"owner": "hercules-ci",
|
||||
"repo": "flake-parts",
|
||||
"rev": "80daad04eddbbf5a4d883996a73f3f542fa437ac",
|
||||
"rev": "57928607ea566b5db3ad13af0e57e921e6b12381",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -60,11 +60,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1770654520,
|
||||
"narHash": "sha256-mg5WZMIPGsFu9MxSrUcuJUPMbfMsF77el5yb/7rc10k=",
|
||||
"lastModified": 1770818644,
|
||||
"narHash": "sha256-DYS4jIRpRoKOzJjnR/QqEd/MlT4OZZpt8CrBLv+cjsE=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "6c4fdbe1ad198fac36c320fd45c5957324a80b8e",
|
||||
"rev": "0acbd1180697de56724821184ad2c3e6e7202cd7",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -81,11 +81,11 @@
|
||||
"nixpkgs": "nixpkgs"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1770711111,
|
||||
"narHash": "sha256-fwqwewKc+TGDz593PzfA3YCzZRYdmYDWk6pRTaRNPWg=",
|
||||
"lastModified": 1770761134,
|
||||
"narHash": "sha256-65Xg7Rfx9Cj/D+OUF7KZUcYSQPbToBDZpqUfFUAKuwc=",
|
||||
"owner": "kaylorben",
|
||||
"repo": "nixcord",
|
||||
"rev": "b3f36f48d83a78653b86b4fe997ff1fccae38c6d",
|
||||
"rev": "f77d6e05efd34581cbc30e7f426496285711bcde",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -96,11 +96,11 @@
|
||||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1769089682,
|
||||
"narHash": "sha256-9yA/LIuAVQq0lXelrZPjLuLVuZdm03p8tfmHhnDIkms=",
|
||||
"lastModified": 1770617025,
|
||||
"narHash": "sha256-1jZvgZoAagZZB6NwGRv2T2ezPy+X6EFDsJm+YSlsvEs=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "078d69f03934859a181e81ba987c2bb033eebfc5",
|
||||
"rev": "2db38e08fdadcc0ce3232f7279bab59a15b94482",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -112,11 +112,11 @@
|
||||
},
|
||||
"nixpkgs-lib": {
|
||||
"locked": {
|
||||
"lastModified": 1765674936,
|
||||
"narHash": "sha256-k00uTP4JNfmejrCLJOwdObYC9jHRrr/5M/a/8L2EIdo=",
|
||||
"lastModified": 1769909678,
|
||||
"narHash": "sha256-cBEymOf4/o3FD5AZnzC3J9hLbiZ+QDT/KDuyHXVJOpM=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nixpkgs.lib",
|
||||
"rev": "2075416fcb47225d9b68ac469a5c4801a9c4dd85",
|
||||
"rev": "72716169fe93074c333e8d0173151350670b824c",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -127,11 +127,11 @@
|
||||
},
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
"lastModified": 1770537093,
|
||||
"narHash": "sha256-pF1quXG5wsgtyuPOHcLfYg/ft/QMr8NnX0i6tW2187s=",
|
||||
"lastModified": 1770781623,
|
||||
"narHash": "sha256-RYEMTlGCVc67pxVxjOlGd8w6fpF7Bur7gKL88FB0WTs=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "fef9403a3e4d31b0a23f0bacebbec52c248fbb51",
|
||||
"rev": "c05d2232d2feaa4c7a07f1168606917402868195",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
{ primaryUser, inputs, ... }: {
|
||||
{ primaryUser, inputs, ... }:
|
||||
{
|
||||
imports = [
|
||||
./packages.nix
|
||||
./git.nix
|
||||
@@ -6,7 +7,7 @@
|
||||
|
||||
inputs.nixvim.homeModules.nixvim
|
||||
./neovim
|
||||
./python.nix
|
||||
# ./python.nix
|
||||
|
||||
];
|
||||
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
{ ... }: {
|
||||
{ ... }:
|
||||
{
|
||||
imports = [
|
||||
./treesitter.nix
|
||||
./lint.nix
|
||||
@@ -12,7 +13,7 @@
|
||||
./alpha.nix
|
||||
./avante.nix
|
||||
./openscad.nix
|
||||
./molten.nix
|
||||
# ./molten.nix
|
||||
./which-key.nix
|
||||
];
|
||||
|
||||
|
||||
@@ -85,7 +85,7 @@
|
||||
lua-language-server
|
||||
nil
|
||||
rust-analyzer
|
||||
python311Packages.python-lsp-server
|
||||
# python311Packages.python-lsp-server
|
||||
];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,4 +1,11 @@
|
||||
{ config, pkgs, inputs, self, primaryUser, ... }:
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
inputs,
|
||||
self,
|
||||
primaryUser,
|
||||
...
|
||||
}:
|
||||
|
||||
{
|
||||
imports = [
|
||||
@@ -8,12 +15,23 @@
|
||||
];
|
||||
|
||||
nixpkgs.config.allowUnfree = true;
|
||||
|
||||
networking = {
|
||||
hostName = "rpi-4";
|
||||
networkmanager.enable = true;
|
||||
|
||||
# Override python-lsp-server to skip tests (flaky tests cause timeout)
|
||||
nixpkgs.config.packageOverrides = pkgs: {
|
||||
python3 = pkgs.python3.override {
|
||||
packageOverrides = self: super: {
|
||||
python-lsp-server = super.python-lsp-server.overridePythonAttrs (old: {
|
||||
doCheck = false;
|
||||
});
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
networking = {
|
||||
hostName = "rpi-4";
|
||||
networkmanager.enable = true;
|
||||
};
|
||||
|
||||
# SSH configuration
|
||||
services.openssh = {
|
||||
enable = true;
|
||||
@@ -26,7 +44,10 @@
|
||||
isNormalUser = true;
|
||||
home = "/home/${primaryUser}";
|
||||
description = "Phil";
|
||||
extraGroups = [ "wheel" "networkmanager" ];
|
||||
extraGroups = [
|
||||
"wheel"
|
||||
"networkmanager"
|
||||
];
|
||||
shell = pkgs.fish;
|
||||
};
|
||||
|
||||
@@ -37,9 +58,13 @@
|
||||
# Nix settings
|
||||
nix = {
|
||||
settings = {
|
||||
experimental-features = [ "nix-command" "flakes" ];
|
||||
experimental-features = [
|
||||
"nix-command"
|
||||
"flakes"
|
||||
];
|
||||
auto-optimise-store = true;
|
||||
builders-use-substitutes = true;
|
||||
trusted-substituters = [ "ssh://phil@192.168.2.40" ];
|
||||
};
|
||||
gc = {
|
||||
automatic = true;
|
||||
@@ -47,17 +72,22 @@
|
||||
options = "--delete-older-than 30d";
|
||||
};
|
||||
buildMachines = [
|
||||
{
|
||||
hostName = "192.168.2.40";
|
||||
system = "aarch64-linux";
|
||||
sshUser = "phil";
|
||||
maxJobs = 4;
|
||||
speedFactor = 2;
|
||||
supportedFeatures = ["nixos-test" "benchmark" "big-parallel" "kvm"];
|
||||
mandatoryFeatures = [ ];
|
||||
}
|
||||
{
|
||||
hostName = "192.168.2.40";
|
||||
system = "aarch64-linux";
|
||||
sshUser = "phil";
|
||||
maxJobs = 4;
|
||||
speedFactor = 2;
|
||||
supportedFeatures = [
|
||||
"nixos-test"
|
||||
"benchmark"
|
||||
"big-parallel"
|
||||
"kvm"
|
||||
];
|
||||
mandatoryFeatures = [ ];
|
||||
}
|
||||
];
|
||||
};
|
||||
|
||||
system.stateVersion = "24.11";
|
||||
system.stateVersion = "25.11";
|
||||
}
|
||||
|
||||
@@ -1,4 +1,10 @@
|
||||
{ config, lib, pkgs, modulesPath, ... }:
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
modulesPath,
|
||||
...
|
||||
}:
|
||||
|
||||
{
|
||||
imports = [
|
||||
@@ -7,10 +13,16 @@
|
||||
|
||||
# Bootloader
|
||||
boot = {
|
||||
kernelPackages = pkgs.linuxPackages_rpi4;
|
||||
initrd.availableKernelModules = [ "xhci_pci" "usbhid" "usb_storage" ];
|
||||
loader.generic-extlinux-compatible.enable = true;
|
||||
kernelParams = [ "console=ttyS0,115200n8" ];
|
||||
#kernelPackages = pkgs.linuxPackages_rpi4;
|
||||
kernelPackages = pkgs.linuxPackages_latest;
|
||||
initrd.availableKernelModules = [
|
||||
"xhci_pci"
|
||||
"usbhid"
|
||||
"usb_storage"
|
||||
];
|
||||
loader.generic-extlinux-compatible.enable = true;
|
||||
kernelParams = [ "console=ttyS0,115200n8" ];
|
||||
supportedFilesystems = lib.mkForce [ "ext4" ];
|
||||
};
|
||||
|
||||
# File systems
|
||||
@@ -21,10 +33,12 @@
|
||||
};
|
||||
|
||||
# Swap
|
||||
swapDevices = [{
|
||||
device = "/swapfile";
|
||||
size = 4096;
|
||||
}];
|
||||
swapDevices = [
|
||||
{
|
||||
device = "/swapfile";
|
||||
size = 4096;
|
||||
}
|
||||
];
|
||||
|
||||
# RPi 4 specific hardware
|
||||
hardware.enableRedistributableFirmware = true;
|
||||
|
||||
Reference in New Issue
Block a user