mjallen/nix-config
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

upd and cache

Browse Source
This commit is contained in:
mjallen18
2025-12-26 11:45:05 -06:00
parent f7cb1cb217
commit c9f75a053c
22 changed files with 523 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
flake.lock generated
View File

@@ -186,11 +186,11 @@
"nixpkgs": "nixpkgs_3"
},
"locked": {
"lastModified": 1766038392,
"narHash": "sha256-ht/GuKaw5NT3M12xM+mkUtkSBVtzjJ8IHIy6R/ncv9g=",
"lastModified": 1766524813,
"narHash": "sha256-N/sxS27+t9nGvGWqwwAceSMW/Y5ddcypS/aiTnZ7ScA=",
"owner": "LnL7",
"repo": "nix-darwin",
"rev": "5fb45ece6129bd7ad8f7310df0ae9c00bae7c562",
"rev": "c2b36207f2c396c79dbed9d40536db221bd4e363",
"type": "github"
},
"original": {
@@ -550,11 +550,11 @@
]
},
"locked": {
"lastModified": 1766387499,
"narHash": "sha256-AjK3/UKDzeXFeYNLVBaJ3+HLE9he1g5UrlNd4/BM3eA=",
"lastModified": 1766682973,
"narHash": "sha256-GKO35onS711ThCxwWcfuvbIBKXwriahGqs+WZuJ3v9E=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "527ad07e6625302b648ed3b28c34b62a79bd103e",
"rev": "91cdb0e2d574c64fae80d221f4bf09d5592e9ec2",
"type": "github"
},
"original": {
@@ -583,11 +583,11 @@
"homebrew-cask": {
"flake": false,
"locked": {
"lastModified": 1766499104,
"narHash": "sha256-19KRh3iz7tCY25MftVmpSkxp6QEyepDEZbheJXTcpb4=",
"lastModified": 1766723306,
"narHash": "sha256-L0Y6MWn30uU1q2/aeijOg6j2rPnLTlEJg2Dw0e3R84A=",
"owner": "homebrew",
"repo": "homebrew-cask",
"rev": "208eb291691c0234f1eb172e95ab490884fd50bd",
"rev": "fdd2bf75092e7ddfeac67415e9fc4cedd41855d9",
"type": "github"
},
"original": {
@@ -599,11 +599,11 @@
"homebrew-core": {
"flake": false,
"locked": {
"lastModified": 1766500727,
"narHash": "sha256-FDQKVUgUjPvnkBJaM23K9xf3FHwksGXn/LKeBGODz/M=",
"lastModified": 1766724309,
"narHash": "sha256-LfqQoAdpIuOJQRrI9n9NCjp6zKdQh9yIU4sHaQWycD0=",
"owner": "homebrew",
"repo": "homebrew-core",
"rev": "ad383f0fefa7cff399414d18522a894179183e9c",
"rev": "ad0f4af25123c68dd03dac10f179d3d68ef288ee",
"type": "github"
},
"original": {
@@ -633,11 +633,11 @@
"nixpkgs": "nixpkgs_4"
},
"locked": {
"lastModified": 1766225187,
"narHash": "sha256-6hcaU8qtmixsaEUbjPiOFd5aJPZxAIBokl5d7dkab3k=",
"lastModified": 1766561058,
"narHash": "sha256-VFqsBWqFFBTBqKFw0fGw2a2mJjPP9HPW8nXEW2A5zJM=",
"owner": "Jovian-Experiments",
"repo": "Jovian-NixOS",
"rev": "bb53a85db9210204a98f771f10f1f5b4e06ccb2d",
"rev": "9d0abe57d633a6e08d72865a761891a8c81e740f",
"type": "github"
},
"original": {
@@ -821,11 +821,11 @@
"nixpkgs": "nixpkgs_8"
},
"locked": {
"lastModified": 1766369649,
"narHash": "sha256-8Z/4upd/AS7pU72QS3GesaWeTgM4VcrSf85bh9fxum8=",
"lastModified": 1766714990,
"narHash": "sha256-vrS4gICB41cq+/nTsp6uGVJ8RiaRGr7ywoeAA9E16cw=",
"owner": "nix-community",
"repo": "nix-vscode-extensions",
"rev": "94058abef65a5f2916f4d9da67d9966039366514",
"rev": "90d526878f7b905448c331b143f37065ed509381",
"type": "github"
},
"original": {
@@ -947,11 +947,11 @@
},
"nixos-hardware": {
"locked": {
"lastModified": 1764440730,
"narHash": "sha256-ZlJTNLUKQRANlLDomuRWLBCH5792x+6XUJ4YdFRjtO4=",
"lastModified": 1766568855,
"narHash": "sha256-UXVtN77D7pzKmzOotFTStgZBqpOcf8cO95FcupWp4Zo=",
"owner": "NixOS",
"repo": "nixos-hardware",
"rev": "9154f4569b6cdfd3c595851a6ba51bfaa472d9f3",
"rev": "c5db9569ac9cc70929c268ac461f4003e3e5ca80",
"type": "github"
},
"original": {
@@ -997,11 +997,11 @@
]
},
"locked": {
"lastModified": 1765832983,
"narHash": "sha256-9kZOSTJ6ITCoHs9gz4I06IJ2vb2S4gQd3WR4aTnWovI=",
"lastModified": 1766537363,
"narHash": "sha256-vK+eb5JfZqIrfRGv/TR5UBfnCh72s0MNlMGXPKh4fv0=",
"owner": "mjallen18",
"repo": "nixos-raspberrypi",
"rev": "8b00ff4f0b156eabd86f946fa7964efda04e2713",
"rev": "27c87670f0002a40b2435031133600fce1812839",
"type": "github"
},
"original": {
@@ -1059,11 +1059,11 @@
},
"nixpkgs-stable_2": {
"locked": {
"lastModified": 1766201043,
"narHash": "sha256-eplAP+rorKKd0gNjV3rA6+0WMzb1X1i16F5m5pASnjA=",
"lastModified": 1766622938,
"narHash": "sha256-Eovt/DOCYjFFBZuYbbG9j5jhklzxdNbUGVYYxh3lG3s=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "b3aad468604d3e488d627c0b43984eb60e75e782",
"rev": "5900a0a8850cbba98e16d5a7a6ed389402dfcf4f",
"type": "github"
},
"original": {
@@ -1091,11 +1091,11 @@
},
"nixpkgs_11": {
"locked": {
"lastModified": 1766427476,
"narHash": "sha256-KHgJHYGYuHUtJPBjczN0kFrWHmdfUXPa0Km6Yq/ELEE=",
"lastModified": 1766687550,
"narHash": "sha256-FGuhrdRvxp3DZfRZfA+1mKZIpgTU9Xboq1jVphKm9Go=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "6dd5b55337d892a8a441aaad31bf1a4165b453bc",
"rev": "a3a2ddee4adfb361bdfe2e915c7e85c2e71cfc5f",
"type": "github"
},
"original": {
@@ -1530,11 +1530,11 @@
"tinted-zed": "tinted-zed"
},
"locked": {
"lastModified": 1766440186,
"narHash": "sha256-7B/dntEDan+pMB8B/sG6599f3mQaySAJL+c9NhdMP7k=",
"lastModified": 1766603026,
"narHash": "sha256-J2DDdRqSU4w9NNgkMfmMeaLIof5PXtS9RG7y6ckDvQE=",
"owner": "nix-community",
"repo": "stylix",
"rev": "844294a58ef0badb3067c4f2fe063030537eb624",
"rev": "551df12ee3ebac52c5712058bd97fd9faa4c3430",
"type": "github"
},
"original": {

3
modules/home/home/default.nix
View File

@@ -127,11 +127,12 @@ in
};
services = {
nextcloud-client.enable = lib.mkDefault hasDestopEnvironment;
nextcloud-client.enable = false;#lib.mkDefault hasDestopEnvironment;
pass-secret-service = lib.mkDefault enabled;
kdeconnect = {
enable = lib.mkDefault hasDestopEnvironment;
indicator = lib.mkDefault hasDestopEnvironment;
package = pkgs.gnomeExtensions.gsconnect;
};
};
}

184
modules/nixos/hardware/raspberry-pi/config.nix Normal file
View File

@@ -0,0 +1,184 @@
# This file is a modified version of config.txt generator
# Licensed under the terms of MIT License
# https://raw.githubusercontent.com/nix-community/raspberry-pi-nix/refs/heads/master/rpi/config.nix
# with modifications
# https://raw.githubusercontent.com/nvmd/raspberry-pi-nix/refs/heads/master/rpi/config.nix
{ lib, config, pkgs, namespace, ... }:
let
cfg = config.${namespace}.hardware.raspberry-pi;
render-raspberrypi-config = let
render-kvs = kvs: let
render-kv = k: v:
if isNull v.value then k
else "${k}=${toString v.value}";
in lib.attrsets.mapAttrsToList render-kv
(lib.filterAttrs (k: v: v.enable) kvs);
render-dt-param = x: "dtparam=" + x;
render-dt-params = params:
lib.strings.concatMapStringsSep "\n" render-dt-param (render-kvs params);
render-dt-overlay = { overlay, params }:
lib.concatStringsSep "\n" (lib.filter (x: x != "") [
("dtoverlay=" + overlay)
(render-dt-params params)
"dtoverlay="
]);
render-options = opts:
lib.strings.concatStringsSep "\n" (render-kvs opts);
render-base-dt-params = render-dt-params;
render-dt-overlays = overlays:
lib.strings.concatMapStringsSep "\n" render-dt-overlay
(lib.attrsets.mapAttrsToList
(overlay: params: {
inherit overlay;
inherit (params) params;
})
(lib.filterAttrs (k: v: v.enable) overlays));
render-config-section = conditionalFilter:
{ options, base-dt-params, dt-overlays }:
let all-config = lib.concatStringsSep "\n" (lib.filter (x: x != "") [
(render-options options)
(render-base-dt-params base-dt-params)
(render-dt-overlays dt-overlays)
]);
in ''
[${conditionalFilter}]
${all-config}
'';
in conf: lib.strings.concatStringsSep "\n"
((lib.attrsets.mapAttrsToList render-config-section conf)
++ [ cfg.extra-config ]);
in {
options.${namespace}.hardware.raspberry-pi = {
config = let
rpi-config-param = {
options = {
enable = lib.mkEnableOption "attr";
value = lib.mkOption {
type = with lib.types; oneOf [ int str bool ];
};
};
};
dt-param = {
options = {
enable = lib.mkEnableOption "attr";
value = lib.mkOption {
type = with lib.types; nullOr (oneOf [ int str bool ]);
default = null;
};
};
};
dt-overlay = {
options = {
enable = lib.mkEnableOption "overlay";
params = lib.mkOption {
type = with lib.types; attrsOf (submodule dt-param);
default = {};
};
};
};
raspberry-pi-config-options = {
options = {
options = lib.mkOption {
type = with lib.types; attrsOf (submodule rpi-config-param);
default = { };
description = ''
Common hardware configuration options, translates to
`<option>=<value>` in the `config.txt`.
<https://www.raspberrypi.com/documentation/computers/config_txt.html#common-hardware-configuration-options>
'';
example = {
arm_boost = { # arm_boost=1
enable = true;
value = true;
};
};
};
base-dt-params = lib.mkOption {
type = with lib.types; attrsOf (submodule dt-param);
default = { };
description = ''
Parameters to pass to the base DTB, translates to
`dtparam=<param>=<value>` in the `config.txt`.
<https://www.raspberrypi.com/documentation/computers/configuration.html#part3.2>
'';
example = {
i2c = { # dtparam=i2c=on
enable = true;
value = "on";
};
ant2 = { # dtparam=ant2
enable = true;
};
};
};
dt-overlays = lib.mkOption {
type = with lib.types; attrsOf (submodule dt-overlay);
default = { };
description = ''
DTB overlays to enable and configure with parameters, translates to
```
dtoverlay=<overlay>
dtparam=<param>=<value>
dtoverlay=
```, which is an equivalent to a more popular format of
`dtoverlay=<overlay>,<param>=<value>`.
<https://www.raspberrypi.com/documentation/computers/configuration.html#part3.1>
'';
example = {
vc4-kms-v3d = { # dtoverlay=vc4-kms-v3d,cma-256
enable = true;
params = {
cma-256 = {
enable = true;
# value = "";
};
};
};
disable-bt = { # dtoverlay=disable-bt
enable = true;
};
};
};
};
};
in lib.mkOption {
type = with lib.types; attrsOf (submodule raspberry-pi-config-options);
description = ''
Configures `config.txt` file for Raspberry Pi devices.
The file is located on a firmware partition, usually mounted at
`/boot/firmware`.
<https://www.raspberrypi.com/documentation/computers/config_txt.html>
'';
};
extra-config = lib.mkOption {
type = lib.types.lines;
default = "";
description = ''
Extra options that will be appended to `/boot/firmware/config.txt` file.
For possible values, see: https://www.raspberrypi.com/documentation/computers/config_txt.html
'';
};
config-generated = lib.mkOption {
type = lib.types.str;
description = ''
The config file text generated by hardware.raspberry-pi.config
'';
readOnly = true;
};
};
config = {
hardware.raspberry-pi.config-generated = render-raspberrypi-config cfg.config;
};
}

119
modules/nixos/hardware/raspberry-pi/default.nix
View File

@@ -22,6 +22,11 @@ in
};
config = lib.mkIf cfg.enable {
boot.initrd.availableKernelModules = lib.mkIf (cfg.variant == "5") [
"nvme"
];
# Common Raspberry Pi packages
environment.systemPackages = with pkgs; [
i2c-tools
@@ -36,20 +41,26 @@ in
];
# Common Bluetooth configuration
systemd.services.btattach = {
before = [ "bluetooth.service" ];
after = [ "dev-ttyAMA0.device" ];
wantedBy = [ "multi-user.target" ];
serviceConfig = {
ExecStart = "${lib.getExe' pkgs.bluez "btattach"} -B /dev/ttyAMA0 -P bcm -S 3000000";
systemd = {
services.btattach = {
before = [ "bluetooth.service" ];
after = [ "dev-ttyAMA0.device" ];
wantedBy = [ "multi-user.target" ];
serviceConfig = {
ExecStart = "${lib.getExe' pkgs.bluez "btattach"} -B /dev/ttyAMA0 -P bcm -S 3000000";
};
};
tmpfiles.packages = [
pkgs.${namespace}.udev-rules
];
};
# Common hardware settings
hardware.i2c.enable = lib.mkDefault true;
# Pi specific settings
hardware.graphics.enable32Bit = lib.mkForce false;
hardware = {
i2c.enable = lib.mkDefault true;
graphics.enable32Bit = lib.mkForce false;
};
# Pi specific system tags
system.nixos.tags = (
@@ -67,6 +78,92 @@ in
programs.kdeconnect.enable = lib.mkDefault false;
# Root user shell configuration
users.users.root.shell = pkgs.zsh;
users = {
users.root.shell = pkgs.zsh;
extraGroups = {
gpio = {};
i2c = {};
input = {};
plugdev = {};
spi = {};
video = {};
};
};
services = {
udev.packages = [
pkgs.${namespace}.udev-rules
];
xserver.extraConfig = let
identifier = "rp1";
driver = "rp1-vec|rp1-dsi|rp1-dpi";
in ''
Section "OutputClass"
Identifier "${identifier}"
MatchDriver "${driver}"
Driver "modesetting"
Option "PrimaryGPU" "true"
EndSection
'';
};
nixpkgs.overlays = [
# (_self: super: {
# ffmpeg = super.${namespace}.ffmpeg-rpi;
# })
# (_self: super: {
# libraspberrypi = super.${namespace}.libraspberrypi;
# })
# (_self: super: {
# raspberrypi-utils = super.${namespace}.raspberrypi-utils;
# })
] ++ (if cfg.variant == "5" then [
(final: prev: {
ubootRaspberryPi5 = prev.uboot.ubootRaspberryPi4_64Bit.override {
defconfig = "rpi_5_defconfig";
};
})
# (final: prev:
# let
# mkPi5 = drv:
# prev.lib.overrideDerivation
# (drv // {
# # Make sure we build the BCM2712 defconfig regardless of internal mapping
# argsOverride = (drv.argsOverride or {}) // {
# defconfig = "bcm2712_defconfig";
# };
# # Limit platforms to aarch64 for Pi 5
# extraMeta = (drv.extraMeta or {}) // {
# platforms = with prev.lib.platforms; prev.lib.intersectLists aarch64 linux;
# hydraPlatforms = [ "aarch64-linux" ];
# };
# })
# (old: {
# postFixup = (old.postFixup or "") + ''
# dtbDir=${if old.stdenv.hostPlatform.isAarch64 then "$out/dtbs/broadcom" else "$out/dtbs"}
# copyDTB() { cp -v "$dtbDir/$1" "$dtbDir/$2"; }
# # Pi 5 alias (only if your boot chain expects bcm283x-style names)
# if [ -e "$dtbDir/bcm2712-rpi-5-b.dtb" ]; then
# copyDTB bcm2712-rpi-5-b.dtb bcm2839-rpi-5-b.dtb
# fi
# '';
# });
# in {
# # Assuming your package is exposed as pkgs.linux-rpi; adapt the name if different
# linux-rpi5 = mkPi5 (prev.linux_rpi4.override { rpiVersion = 5; });
# })
(final: prev: {
# https://github.com/nvmd/nixos-raspberrypi/issues/64
# credit for the initial version of this snippet goes to @micahcc
jemalloc = prev.jemalloc.overrideAttrs (old: {
# --with-lg-page=(log2 page_size)
# RPi5 (bcm2712): since our page size is 16384 (2**14), we need 14
configureFlags = let
pageSizeFlag = "--with-lg-page";
in (prev.lib.filter (flag: prev.lib.hasPrefix pageSizeFlag flag == false) old.configureFlags)
++ [ "${pageSizeFlag}=14" ];
});
})
] else [ ]);
};
}

34
modules/nixos/nix/default.nix
View File

@@ -16,10 +16,9 @@
"cachyos-server-lto-znver4"
"cachyos-rc-lto"
"cachyos-rc-lto-znver4"
# "chromium"
"dolphin-emu"
"electron"
# "ffmpeg"
"ffmpeg_8"
"ffmpeg_7"
"ffmpeg_6"
"ffmpeg-full"
@@ -28,6 +27,7 @@
"gst-plugins-bad"
"gst-plugins-rs"
"gtk4"
"hipblaslt"
"jemalloc"
"jupiter-fan-control"
"libcamera-rpi"
@@ -36,8 +36,9 @@
"linux"
"linuxPackages_cachyos"
"linuxPackages_cachyos-lto"
"linuxPackages_rpi4"
"linuxPackages_rpi5"
"linuxPackages_cachyos-lto-znver4"
"linuxPackages_cachyos-lto-server"
"linuxPackages_cachyos-lto-server-znver4"
"mesa"
"mesa-radeonsi-jupiter"
"mgba"
@@ -63,18 +64,20 @@
};
nixpkgs.overlays = [
(_self: super: {
"linux_rpi-bcm2711" = super."linux_rpi-bcm2711".override { stdenv = super.ccacheStdenv; };
})
(_self: super: {
"mesa" = super."mesa".override { buildPackages.stdenv = super.ccacheStdenv; };
})
(_self: super: {
"webkitgtk_4_1" = super.stable."webkitgtk_4_1".override { clangStdenv = super.ccacheStdenv; };
})
(_self: super: {
"webkitgtk_6_0" = super."webkitgtk_6_0".override { clangStdenv = super.ccacheStdenv; };
electron = super.stable.electron-bin;
electron_36 = super.stable.electron_36-bin;
electron_37 = super.stable.electron_37-bin;
})
# (_self: super: {
# "webkitgtk_4_1" = super.stable."webkitgtk_4_1".override { clangStdenv = super.ccacheStdenv; };
# })
# (_self: super: {
# "webkitgtk_6_0" = super."webkitgtk_6_0".override { clangStdenv = super.ccacheStdenv; };
# })
(_self: super: {
"jellyfin-ffmpeg" = super."jellyfin-ffmpeg".override {
ffmpeg_7-full = super.ffmpeg_7-full.override { stdenv = super.ccacheStdenv; };
@@ -105,8 +108,13 @@
qt3d = super.kdePackages.qt3d.override {
qtbase = super.kdePackages.qtbase.override { stdenv = super.ccacheStdenv; };
};
# qtbase = super.kdePackages.qtbase.override { stdenv = super.ccacheStdenv; };
qtwebengine = super.kdePackages.qtwebengine.override { stdenv = super.ccacheStdenv; };
# qtbase = super.stable.kdePackages.qtbase;#.override { stdenv = super.ccacheStdenv; };
qtwebengine = super.stable.kdePackages.qtwebengine; #.override { stdenv = super.ccacheStdenv; };
};
})
(_self: super: {
rocmPackages = super.rocmPackages // {
hipblaslt = super.rocmPackages.hipblaslt.override { stdenv = super.ccacheStdenv; };
};
})
# (_self: super: {

1
modules/nixos/services/dispatcharr/default.nix
View File

@@ -30,6 +30,7 @@ let
environment = {
DISPATCHARR_LOG_LEVEL = "DEBUG";
DISPATCHARR_ENV = "aio";
DJANGO_SECRET_KEY = "123456";
PUID = cfg.puid;
PGID = cfg.pgid;
TZ = cfg.timeZone;

10
overlays/redis/default.nix
View File

@@ -1,14 +1,4 @@
{ ... }:
final: _prev: {
redis = final.valkey;
uv = final.stable.uv;
onnxruntime = final.stable.onnxruntime;
firefox = final.stable.firefox;
orca-slicer = final.stable.orca-slicer;
kde-connect = final.stable.kde-connect;
kdeconnect-kde = final.stable.kdeconnect-kde;
webkit-gtk = final.stable.webkit-gtk;
qtwebengine = final.stable.qtwebengine;
electron = final.stable.electron;
heroic = final.stable.heroic;
}

4
packages/homeassistant/ha-bedjet/default.nix
View File

@@ -7,13 +7,13 @@
buildHomeAssistantComponent rec {
owner = "natekspencer";
domain = "bedjet";
version = "1.2.2";
version = "1.2.3";
src = fetchFromGitHub {
owner = owner;
repo = "ha-bedjet";
rev = version;
hash = "sha256-nJ2S1Wz/M/8my+5iDEMzfBZd9hKnrSBxUqnPfy6Tr7A=";
hash = "sha256-Zuidx6YrjqDzgtOTW380Rfzi1zHqJ07IrgBYztfM2II=";
};
propagatedBuildInputs = with python3Packages; [

4
packages/homeassistant/ha-mail-and-packages/default.nix
View File

@@ -7,13 +7,13 @@
buildHomeAssistantComponent rec {
owner = "moralmunky";
domain = "mail_and_packages";
version = "0.4.3-b21";
version = "0.4.3";
src = fetchFromGitHub {
owner = owner;
repo = "Home-Assistant-Mail-And-Packages";
rev = version;
hash = "sha256-0lhDsjqsNU2d5cSjxzLIDU9986dvpQ6bNxgUNzmo6pU=";
hash = "sha256-7PVoWiN+o2QW9KVO4ht4ToFopULwzPCHCcUUGpUgNy8=";
};
propagatedBuildInputs = with python3Packages; [

4
packages/homeassistant/ha-openhasp/default.nix
View File

@@ -8,13 +8,13 @@
buildHomeAssistantComponent rec {
owner = "HASwitchPlate";
domain = "openhasp";
version = "0.7.7";
version = "0.7.8";
src = fetchFromGitHub {
owner = owner;
repo = "openHASP-custom-component";
rev = version;
hash = "sha256-sHrCsyxThUgUAadQBaC9wBVKzMojCJYjA5CUryN5+9g=";
hash = "sha256-5h1EqwpnsmWexqB3J/X4OcN9bfBYUxGxLF1Hrmoi5LY=";
};
propagatedBuildInputs = with pkgs.python3Packages; [

12
packages/linux-cachyos/config-nix/cachyos-rc-lto.x86_64-linux.nix
View File

@@ -485,6 +485,7 @@
"CONFIG_PM_STD_PARTITION" = "";
"CONFIG_PM_SLEEP" = "y";
"CONFIG_PM_SLEEP_SMP" = "y";
"CONFIG_PM_QOS_CPU_SYSTEM_WAKEUP" = "y";
"CONFIG_PM" = "y";
"CONFIG_PM_DEBUG" = "y";
"CONFIG_PM_SLEEP_DEBUG" = "y";
@@ -906,6 +907,7 @@
"CONFIG_BLK_MQ_STACKING" = "y";
"CONFIG_MQ_IOSCHED_DEADLINE" = "y";
"CONFIG_MQ_IOSCHED_KYBER" = "y";
"CONFIG_MQ_IOSCHED_ADIOS" = "y";
"CONFIG_IOSCHED_BFQ" = "y";
"CONFIG_BFQ_GROUP_IOSCHED" = "y";
"CONFIG_PREEMPT_NOTIFIERS" = "y";
@@ -1000,8 +1002,8 @@
"CONFIG_MM_ID" = "y";
"CONFIG_TRANSPARENT_HUGEPAGE" = "y";
"CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS" = "y";
"CONFIG_TRANSPARENT_HUGEPAGE_SHMEM_HUGE_NEVER" = "y";
"CONFIG_TRANSPARENT_HUGEPAGE_TMPFS_HUGE_NEVER" = "y";
"CONFIG_TRANSPARENT_HUGEPAGE_SHMEM_HUGE_ADVISE" = "y";
"CONFIG_TRANSPARENT_HUGEPAGE_TMPFS_HUGE_ADVISE" = "y";
"CONFIG_THP_SWAP" = "y";
"CONFIG_READ_ONLY_THP_FOR_FS" = "y";
"CONFIG_PAGE_MAPCOUNT" = "y";
@@ -3096,14 +3098,13 @@
"CONFIG_PSE_PD692X0" = "m";
"CONFIG_PSE_SI3474" = "m";
"CONFIG_PSE_TPS23881" = "m";
"CONFIG_CAN_DEV" = "m";
"CONFIG_CAN_DEV" = "y";
"CONFIG_CAN_VCAN" = "m";
"CONFIG_CAN_VXCAN" = "m";
"CONFIG_CAN_NETLINK" = "y";
"CONFIG_CAN_CALC_BITTIMING" = "y";
"CONFIG_CAN_RX_OFFLOAD" = "y";
"CONFIG_CAN_CAN327" = "m";
"CONFIG_CAN_DUMMY" = "m";
"CONFIG_CAN_JANZ_ICAN3" = "m";
"CONFIG_CAN_KVASER_PCIEFD" = "m";
"CONFIG_CAN_SLCAN" = "m";
@@ -5421,6 +5422,7 @@
"CONFIG_DVB_PLATFORM_DRIVERS" = "y";
"CONFIG_V4L_MEM2MEM_DRIVERS" = "y";
"CONFIG_VIDEO_MEM2MEM_DEINTERLACE" = "m";
"CONFIG_AMD_ISP4" = "m";
"CONFIG_VIDEO_CADENCE_CSI2RX" = "m";
"CONFIG_VIDEO_CADENCE_CSI2TX" = "m";
"CONFIG_VIDEO_CAFE_CCIC" = "m";
@@ -6745,7 +6747,6 @@
"CONFIG_HID_APPLETB_BL" = "m";
"CONFIG_HID_APPLETB_KBD" = "m";
"CONFIG_HID_ASUS" = "m";
"CONFIG_HID_ASUS_ALLY" = "m";
"CONFIG_HID_AUREAL" = "m";
"CONFIG_HID_BELKIN" = "m";
"CONFIG_HID_BETOP_FF" = "m";
@@ -9652,7 +9653,6 @@
"CONFIG_DYNAMIC_FTRACE_WITH_DIRECT_CALLS" = "y";
"CONFIG_DYNAMIC_FTRACE_WITH_ARGS" = "y";
"CONFIG_DYNAMIC_FTRACE_WITH_JMP" = "y";
"CONFIG_FUNCTION_SELF_TRACING" = "y";
"CONFIG_FPROBE" = "y";
"CONFIG_FUNCTION_PROFILER" = "y";
"CONFIG_STACK_TRACER" = "y";

12
packages/linux-cachyos/config-nix/cachyos-rc.x86_64-linux.nix
View File

@@ -486,6 +486,7 @@
"CONFIG_PM_STD_PARTITION" = "";
"CONFIG_PM_SLEEP" = "y";
"CONFIG_PM_SLEEP_SMP" = "y";
"CONFIG_PM_QOS_CPU_SYSTEM_WAKEUP" = "y";
"CONFIG_PM" = "y";
"CONFIG_PM_DEBUG" = "y";
"CONFIG_PM_SLEEP_DEBUG" = "y";
@@ -905,6 +906,7 @@
"CONFIG_BLK_MQ_STACKING" = "y";
"CONFIG_MQ_IOSCHED_DEADLINE" = "y";
"CONFIG_MQ_IOSCHED_KYBER" = "y";
"CONFIG_MQ_IOSCHED_ADIOS" = "y";
"CONFIG_IOSCHED_BFQ" = "y";
"CONFIG_BFQ_GROUP_IOSCHED" = "y";
"CONFIG_PREEMPT_NOTIFIERS" = "y";
@@ -999,8 +1001,8 @@
"CONFIG_MM_ID" = "y";
"CONFIG_TRANSPARENT_HUGEPAGE" = "y";
"CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS" = "y";
"CONFIG_TRANSPARENT_HUGEPAGE_SHMEM_HUGE_NEVER" = "y";
"CONFIG_TRANSPARENT_HUGEPAGE_TMPFS_HUGE_NEVER" = "y";
"CONFIG_TRANSPARENT_HUGEPAGE_SHMEM_HUGE_ADVISE" = "y";
"CONFIG_TRANSPARENT_HUGEPAGE_TMPFS_HUGE_ADVISE" = "y";
"CONFIG_THP_SWAP" = "y";
"CONFIG_READ_ONLY_THP_FOR_FS" = "y";
"CONFIG_PAGE_MAPCOUNT" = "y";
@@ -3095,14 +3097,13 @@
"CONFIG_PSE_PD692X0" = "m";
"CONFIG_PSE_SI3474" = "m";
"CONFIG_PSE_TPS23881" = "m";
"CONFIG_CAN_DEV" = "m";
"CONFIG_CAN_DEV" = "y";
"CONFIG_CAN_VCAN" = "m";
"CONFIG_CAN_VXCAN" = "m";
"CONFIG_CAN_NETLINK" = "y";
"CONFIG_CAN_CALC_BITTIMING" = "y";
"CONFIG_CAN_RX_OFFLOAD" = "y";
"CONFIG_CAN_CAN327" = "m";
"CONFIG_CAN_DUMMY" = "m";
"CONFIG_CAN_JANZ_ICAN3" = "m";
"CONFIG_CAN_KVASER_PCIEFD" = "m";
"CONFIG_CAN_SLCAN" = "m";
@@ -5421,6 +5422,7 @@
"CONFIG_DVB_PLATFORM_DRIVERS" = "y";
"CONFIG_V4L_MEM2MEM_DRIVERS" = "y";
"CONFIG_VIDEO_MEM2MEM_DEINTERLACE" = "m";
"CONFIG_AMD_ISP4" = "m";
"CONFIG_VIDEO_CADENCE_CSI2RX" = "m";
"CONFIG_VIDEO_CADENCE_CSI2TX" = "m";
"CONFIG_VIDEO_CAFE_CCIC" = "m";
@@ -6745,7 +6747,6 @@
"CONFIG_HID_APPLETB_BL" = "m";
"CONFIG_HID_APPLETB_KBD" = "m";
"CONFIG_HID_ASUS" = "m";
"CONFIG_HID_ASUS_ALLY" = "m";
"CONFIG_HID_AUREAL" = "m";
"CONFIG_HID_BELKIN" = "m";
"CONFIG_HID_BETOP_FF" = "m";
@@ -9648,7 +9649,6 @@
"CONFIG_DYNAMIC_FTRACE_WITH_DIRECT_CALLS" = "y";
"CONFIG_DYNAMIC_FTRACE_WITH_ARGS" = "y";
"CONFIG_DYNAMIC_FTRACE_WITH_JMP" = "y";
"CONFIG_FUNCTION_SELF_TRACING" = "y";
"CONFIG_FPROBE" = "y";
"CONFIG_FUNCTION_PROFILER" = "y";
"CONFIG_STACK_TRACER" = "y";

8
packages/linux-cachyos/versions-hardened.json
View File

@@ -5,12 +5,12 @@
"hash": "sha256-EWgC3DrRZGFjzG/+m926JKgGm1aRNewFI815kGTy7bk="
},
"config": {
"rev": "9d369789361623b8a3b842a71adccb19b24ba16f",
"hash": "sha256-eh914fO4gYD8aCuUrMlPBRsxwwa2+qc9HCuAhrG6G9c="
"rev": "b68aded713a580df028543faea77c4ca5ec1226b",
"hash": "sha256-W/8JwebN9BF9vpMV9yZpaSFGGazQWyhGEpmNI1XEugM="
},
"patches": {
"rev": "e266fbc7f36273ebbc62a9bffda02e3882eb8f6c",
"hash": "sha256-LezfhAfTdfhvjiHSWe258SMUIs+cP8SHT8BiPou0A4w="
"rev": "34c9301f5e6fa2817163e4134b0e71c7a7372634",
"hash": "sha256-G3eG5SmTiHz5VkMssfFTfLCGfvijTPDDkLiU9VI97TM="
},
"zfs": {
"rev": "fe5ed524c72e0b2e2cd4c47ee5bc987290e89666",

8
packages/linux-cachyos/versions-lts.json
View File

@@ -5,12 +5,12 @@
"hash": "sha256-lQLF/+S4lDg8l6v8z3RDCoRzLwTuR2ucDYdjWynffbM="
},
"config": {
"rev": "9d369789361623b8a3b842a71adccb19b24ba16f",
"hash": "sha256-eh914fO4gYD8aCuUrMlPBRsxwwa2+qc9HCuAhrG6G9c="
"rev": "b68aded713a580df028543faea77c4ca5ec1226b",
"hash": "sha256-W/8JwebN9BF9vpMV9yZpaSFGGazQWyhGEpmNI1XEugM="
},
"patches": {
"rev": "e266fbc7f36273ebbc62a9bffda02e3882eb8f6c",
"hash": "sha256-LezfhAfTdfhvjiHSWe258SMUIs+cP8SHT8BiPou0A4w="
"rev": "34c9301f5e6fa2817163e4134b0e71c7a7372634",
"hash": "sha256-G3eG5SmTiHz5VkMssfFTfLCGfvijTPDDkLiU9VI97TM="
},
"zfs": {
"rev": "fe5ed524c72e0b2e2cd4c47ee5bc987290e89666",

12
packages/linux-cachyos/versions-rc.json
View File

@@ -1,16 +1,16 @@
{
"suffix": "-cachyos",
"linux": {
"version": "6.19-rc1",
"hash": "sha256-itUMYlX2BWUMmqeACu8ZaDMR/S2eBhDSIx1UZl9hh9E="
"version": "6.19-rc2",
"hash": "sha256-lQJVNXjrBA2XeUtEHj5bMHrMVPH2FnkfY59vf1kQG5g="
},
"config": {
"rev": "9d369789361623b8a3b842a71adccb19b24ba16f",
"hash": "sha256-eh914fO4gYD8aCuUrMlPBRsxwwa2+qc9HCuAhrG6G9c="
"rev": "b68aded713a580df028543faea77c4ca5ec1226b",
"hash": "sha256-W/8JwebN9BF9vpMV9yZpaSFGGazQWyhGEpmNI1XEugM="
},
"patches": {
"rev": "e266fbc7f36273ebbc62a9bffda02e3882eb8f6c",
"hash": "sha256-LezfhAfTdfhvjiHSWe258SMUIs+cP8SHT8BiPou0A4w="
"rev": "34c9301f5e6fa2817163e4134b0e71c7a7372634",
"hash": "sha256-G3eG5SmTiHz5VkMssfFTfLCGfvijTPDDkLiU9VI97TM="
},
"zfs": {
"rev": "7de9800e5ce45d03c797be57a3e959fc914b2adb",

8
packages/linux-cachyos/versions.json
View File

@@ -8,13 +8,13 @@
},
"_config": "latest commit from https://github.com/CachyOS/linux-cachyos/commits/master/linux-cachyos",
"config": {
"rev": "9d369789361623b8a3b842a71adccb19b24ba16f",
"hash": "sha256-eh914fO4gYD8aCuUrMlPBRsxwwa2+qc9HCuAhrG6G9c="
"rev": "b68aded713a580df028543faea77c4ca5ec1226b",
"hash": "sha256-W/8JwebN9BF9vpMV9yZpaSFGGazQWyhGEpmNI1XEugM="
},
"_patches": "latest commit from https://github.com/CachyOS/kernel-patches/commits/master/x.y",
"patches": {
"rev": "e266fbc7f36273ebbc62a9bffda02e3882eb8f6c",
"hash": "sha256-LezfhAfTdfhvjiHSWe258SMUIs+cP8SHT8BiPou0A4w="
"rev": "34c9301f5e6fa2817163e4134b0e71c7a7372634",
"hash": "sha256-G3eG5SmTiHz5VkMssfFTfLCGfvijTPDDkLiU9VI97TM="
},
"_zfs": "search for `git+https://github.com/cachyos/zfs.git` in config's PKGBUILD",
"zfs": {

4
packages/python/python-roborock/default.nix
View File

@@ -8,7 +8,7 @@
python3Packages.buildPythonPackage rec {
pname = "python-roborock";
version = "3.19.0";
version = "3.21.1";
pyproject = true;
disabled = python3Packages.pythonOlder "3.11";
@@ -17,7 +17,7 @@ python3Packages.buildPythonPackage rec {
owner = "humbertogontijo";
repo = "python-roborock";
tag = "v${version}";
hash = "sha256-nCewSP0ZgQvjZ4Ie4/kTzxxmJ5Zsm5i3EuW4ZiDBPMg=";
hash = "sha256-8z8qK77F8SWxV+/GGW+B30LJdfRdja1nnFwXX0bvRao=";
};
pythonRelaxDeps = [ "pycryptodome" ];

113
packages/raspberrypi/linux-rpi/default.nix Normal file
View File

@@ -0,0 +1,113 @@
{
stdenv,
lib,
fetchFromGitHub,
buildLinux,
rpiVersion ? 5,
...
}@args:
let
# NOTE: raspberrypifw & raspberryPiWirelessFirmware should be updated with this
modDirVersion = "6.12.47";
tag = "stable_20250916";
hash = "sha256-HG8Oc04V2t54l0SOn4gKmNJWQUrZfjWusgKcWvx74H0==";
in
lib.overrideDerivation
(buildLinux (
args
// {
version = "${modDirVersion}-${tag}";
inherit modDirVersion;
pname = "linux-rpi";
src = fetchFromGitHub {
owner = "raspberrypi";
repo = "linux";
inherit tag hash;
};
defconfig =
{
"1" = "bcmrpi_defconfig";
"2" = "bcm2709_defconfig";
"3" = if stdenv.hostPlatform.isAarch64 then "bcm2711_defconfig" else "bcm2709_defconfig";
"4" = "bcm2711_defconfig";
"5" = "bcm2712_defconfig";
}
.${toString rpiVersion};
features = {
efiBootStub = false;
}
// (args.features or { });
isLTS = true;
extraMeta =
if (rpiVersion < 3) then
{
platforms = with lib.platforms; lib.intersectLists arm linux;
hydraPlatforms = [ ];
}
else if (rpiVersion == 5) then
{
platforms = with lib.platforms; lib.intersectLists aarch64 linux;
hydraPlatforms = [ "aarch64-linux" ];
}
else
{
platforms = with lib.platforms; lib.intersectLists (arm ++ aarch64) linux;
hydraPlatforms = [ "aarch64-linux" ];
};
ignoreConfigErrors = true;
}
// (args.argsOverride or { })
))
(oldAttrs: {
postConfigure = ''
# The v7 defconfig has this set to '-v7' which screws up our modDirVersion.
sed -i $buildRoot/.config -e 's/^CONFIG_LOCALVERSION=.*/CONFIG_LOCALVERSION=""/'
sed -i $buildRoot/include/config/auto.conf -e 's/^CONFIG_LOCALVERSION=.*/CONFIG_LOCALVERSION=""/'
'';
# Make copies of the DTBs named after the upstream names so that U-Boot finds them.
# This is ugly as heck, but I don't know a better solution so far.
postFixup = ''
dtbDir=${if stdenv.hostPlatform.isAarch64 then "$out/dtbs/broadcom" else "$out/dtbs"}
rm $dtbDir/bcm283*.dtb
copyDTB() {
cp -v "$dtbDir/$1" "$dtbDir/$2"
}
''
+ lib.optionalString (lib.elem stdenv.hostPlatform.system [ "armv6l-linux" ]) ''
copyDTB bcm2708-rpi-zero-w.dtb bcm2835-rpi-zero.dtb
copyDTB bcm2708-rpi-zero-w.dtb bcm2835-rpi-zero-w.dtb
copyDTB bcm2708-rpi-b.dtb bcm2835-rpi-a.dtb
copyDTB bcm2708-rpi-b.dtb bcm2835-rpi-b.dtb
copyDTB bcm2708-rpi-b.dtb bcm2835-rpi-b-rev2.dtb
copyDTB bcm2708-rpi-b-plus.dtb bcm2835-rpi-a-plus.dtb
copyDTB bcm2708-rpi-b-plus.dtb bcm2835-rpi-b-plus.dtb
copyDTB bcm2708-rpi-b-plus.dtb bcm2835-rpi-zero.dtb
copyDTB bcm2708-rpi-cm.dtb bcm2835-rpi-cm.dtb
''
+ lib.optionalString (lib.elem stdenv.hostPlatform.system [ "armv7l-linux" ]) ''
copyDTB bcm2709-rpi-2-b.dtb bcm2836-rpi-2-b.dtb
''
+
lib.optionalString
(lib.elem stdenv.hostPlatform.system [
"armv7l-linux"
"aarch64-linux"
])
''
copyDTB bcm2710-rpi-zero-2.dtb bcm2837-rpi-zero-2.dtb
copyDTB bcm2710-rpi-zero-2-w.dtb bcm2837-rpi-zero-2-w.dtb
copyDTB bcm2710-rpi-3-b.dtb bcm2837-rpi-3-b.dtb
copyDTB bcm2710-rpi-3-b-plus.dtb bcm2837-rpi-3-a-plus.dtb
copyDTB bcm2710-rpi-3-b-plus.dtb bcm2837-rpi-3-b-plus.dtb
copyDTB bcm2710-rpi-cm3.dtb bcm2837-rpi-cm3.dtb
copyDTB bcm2711-rpi-4-b.dtb bcm2838-rpi-4-b.dtb
copyDTB bcm2712-rpi-5-b.dtb bcm2839-rpi-5-b.dtb
'';
})

4
packages/raspberrypi/raspberrypi-utils/default.nix
View File

@@ -15,8 +15,8 @@ stdenv.mkDerivation (_finalAttrs: {
src = fetchFromGitHub {
owner = "raspberrypi";
repo = "utils";
rev = "6e0779b1c552976e0da2374c0325a8c9c77b6010";
hash = "sha256-gzcQdchmYZ8NSGDnozUK3JgEQAO5b7GCOzQeRL0nDM8";
rev = "063d092c528c09b9dad5d7ed187ebf110a53303b";
hash = "sha256-vi89lzfuLS9xKHDnlpm7Aw1UCOGCcMfd0cQq0rA9yOQ=";
};
buildInputs = [

8
systems/aarch64-linux/pi5/boot.nix
View File

@@ -1,14 +1,14 @@
{ pkgs, lib, ... }:
{ pkgs, lib, namespace, ... }:
let
kernelBundle = pkgs.linuxAndFirmware.latest;
# kernelBundle = pkgs.linuxAndFirmware.latest;
in
{
boot = {
loader.raspberry-pi = {
bootloader = "kernel";
firmwarePackage = kernelBundle.raspberrypifw;
firmwarePackage = pkgs.raspberrypifw;
};
kernelPackages = kernelBundle.linuxPackages_rpi5;
kernelPackages = pkgs.${namespace}.linux-rpi;
supportedFilesystems = lib.mkForce [ ];
};

2
systems/x86_64-linux/jallen-nas/apps.nix
View File

@@ -75,7 +75,7 @@ in
port = 9191;
};
ersatztv = {
enable = false;
enable = true;
port = 8409;
};
free-games-claimer = {

29
systems/x86_64-linux/matt-nixos/default.nix
View File

@@ -77,17 +77,20 @@
# capabilities = "cap_net_admin+p";
# };
specialisation = {
"cosmic".configuration = {
${namespace} = {
desktop = {
cosmic.enable = lib.mkForce true;
hyprland = {
enable = lib.mkForce false;
};
gnome.enable = lib.mkForce false;
};
};
};
};
# specialisation = {
# "cosmic" = {
# enable = false;
# configuration = {
# ${namespace} = {
# desktop = {
# cosmic.enable = lib.mkForce true;
# hyprland = {
# enable = lib.mkForce false;
# };
# gnome.enable = lib.mkForce false;
# };
# };
# };
# };
# };
}