Compare commits

...

9 Commits

5 changed files with 59 additions and 77 deletions

78
flake.lock generated
View File

@@ -9,11 +9,11 @@
"rust-overlay": "rust-overlay"
},
"locked": {
"lastModified": 1772290697,
"narHash": "sha256-MyLNx13P+pv1RszO1rMd3144NEeU/oU4iL+xOTpRoaU=",
"lastModified": 1774186997,
"narHash": "sha256-hyNVlhAqmwcBPl7XRkxbGcMt1BfCOdvuEfBDUf0k8Oo=",
"owner": "ezKEa",
"repo": "aagl-gtk-on-nix",
"rev": "dcb53a4cb4cb09ef7f08328428ba559be5b9f01b",
"rev": "546e95f7ec74892a31f883a10b1723c35f2c2edd",
"type": "github"
},
"original": {
@@ -46,11 +46,11 @@
"cachyos-kernel": {
"flake": false,
"locked": {
"lastModified": 1773425695,
"narHash": "sha256-O5Fr6f+iS+IVKdB59yqkCaWfkr1SSHD5BLDDlZO7RwU=",
"lastModified": 1776608760,
"narHash": "sha256-ehDv8bF7k/2Kf4b8CCoSm51U/MOoFuLsRXqe5wZ57sE=",
"owner": "CachyOS",
"repo": "linux-cachyos",
"rev": "3b9ae1ae5d4ee95e1509d350b65c0777dde97628",
"rev": "7e06e29005853bbaaa3b1c1067f915d6e0db728a",
"type": "github"
},
"original": {
@@ -62,11 +62,11 @@
"cachyos-kernel-patches": {
"flake": false,
"locked": {
"lastModified": 1773430072,
"narHash": "sha256-0X47YCF1CUnLiQ1M6Lh4hc3ax9aV5DX/wCmMfuMyM1o=",
"lastModified": 1776680283,
"narHash": "sha256-wSHtct0KwbhFh9xYYp1ABaBsHE/K/1+oyrqHbIdiWFE=",
"owner": "CachyOS",
"repo": "kernel-patches",
"rev": "ac70453c25200f0a30ad38b3caa63020869f0f8a",
"rev": "21c93f820124a8e7046f1e358739e1a14f6b700b",
"type": "github"
},
"original": {
@@ -196,11 +196,11 @@
"nixpkgs-lib": "nixpkgs-lib"
},
"locked": {
"lastModified": 1772408722,
"narHash": "sha256-rHuJtdcOjK7rAHpHphUb1iCvgkU3GpfvicLMwwnfMT0=",
"lastModified": 1775087534,
"narHash": "sha256-91qqW8lhL7TLwgQWijoGBbiD4t7/q75KTi8NxjVmSmA=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "f20dc5d9b8027381c474144ecabc9034d6a839a3",
"rev": "3107b77cd68437b9a76194f0f7f9c55f2329ca5b",
"type": "github"
},
"original": {
@@ -313,11 +313,11 @@
]
},
"locked": {
"lastModified": 1773681856,
"narHash": "sha256-+bRqxoFCJFO9ZTFhcCkzNXbDT3b8AEk88fyjB7Is6eo=",
"lastModified": 1776777932,
"narHash": "sha256-0R3Yow/NzSeVGUke5tL7CCkqmss4Vmi6BbV6idHzq/8=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "57d5560ee92a424fb71fde800acd6ed2c725dfce",
"rev": "5d5640599a0050b994330328b9fd45709c909720",
"type": "github"
},
"original": {
@@ -334,11 +334,11 @@
]
},
"locked": {
"lastModified": 1773422513,
"narHash": "sha256-MPjR48roW7CUMU6lu0+qQGqj92Kuh3paIulMWFZy+NQ=",
"lastModified": 1776184304,
"narHash": "sha256-No6QGBmIv5ChiwKCcbkxjdEQ/RO2ZS1gD7SFy6EZ7rc=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "ef12a9a2b0f77c8fa3dda1e7e494fca668909056",
"rev": "3c7524c68348ef79ce48308e0978611a050089b2",
"type": "github"
},
"original": {
@@ -382,11 +382,11 @@
"nixpkgs": "nixpkgs_2"
},
"locked": {
"lastModified": 1773597464,
"narHash": "sha256-3SVrc1AMkY1UE36MD4qvmTkY/ZToK2F55Afut5Qm5F8=",
"lastModified": 1776710308,
"narHash": "sha256-rrdCcEXukj2CDjsiOVPYb9LpTKzB89sIicBqoOBK3Xs=",
"owner": "xddxdd",
"repo": "nix-cachyos-kernel",
"rev": "30468236d5cdd9cb5dea6e757159e04816439146",
"rev": "8c8219b1f4822932baea710948da7963f50e9739",
"type": "github"
},
"original": {
@@ -404,11 +404,11 @@
]
},
"locked": {
"lastModified": 1773603777,
"narHash": "sha256-oXSEbMR/IuHYk9nvrbRhaYBxVK5s63DH2UGOZT2ok48=",
"lastModified": 1776692876,
"narHash": "sha256-7Q05rUgwbkJnjxIJyi8bHUG+XnyZqLxFJz7c8RncpeU=",
"owner": "nix-community",
"repo": "NixOS-WSL",
"rev": "0efe7af73d6e4a8d447a22936c5526d73822b0a7",
"rev": "51b302c28dbf904a5c341be005eebe0779cf4f16",
"type": "github"
},
"original": {
@@ -436,11 +436,11 @@
},
"nixpkgs-lib": {
"locked": {
"lastModified": 1772328832,
"narHash": "sha256-e+/T/pmEkLP6BHhYjx6GmwP5ivonQQn0bJdH9YrRB+Q=",
"lastModified": 1774748309,
"narHash": "sha256-+U7gF3qxzwD5TZuANzZPeJTZRHS29OFQgkQ2kiTJBIQ=",
"owner": "nix-community",
"repo": "nixpkgs.lib",
"rev": "c185c7a5e5dd8f9add5b2f8ebeff00888b070742",
"rev": "333c4e0545a6da976206c74db8773a1645b5870a",
"type": "github"
},
"original": {
@@ -451,11 +451,11 @@
},
"nixpkgs_2": {
"locked": {
"lastModified": 1773563071,
"narHash": "sha256-p4f6smYpck1hw6gYsT2omq01gnlZ1E7HTpssDQ0fP+g=",
"lastModified": 1776635459,
"narHash": "sha256-3UVWm751p/8VAY1Mq+DgSTCv9HpMmdB2byhnRrVKflk=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "1c6f50e5b62030a50799682b6babc9dcc5a271ae",
"rev": "8d8538e67e516362d9d09ee5d3ce73dce944612b",
"type": "github"
},
"original": {
@@ -467,11 +467,11 @@
},
"nixpkgs_3": {
"locked": {
"lastModified": 1775036866,
"narHash": "sha256-ZojAnPuCdy657PbTq5V0Y+AHKhZAIwSIT2cb8UgAz/U=",
"lastModified": 1776548001,
"narHash": "sha256-ZSK0NL4a1BwVbbTBoSnWgbJy9HeZFXLYQizjb2DPF24=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "6201e203d09599479a3b3450ed24fa81537ebc4e",
"rev": "b12141ef619e0a9c1c84dc8c684040326f27cdcc",
"type": "github"
},
"original": {
@@ -591,11 +591,11 @@
]
},
"locked": {
"lastModified": 1773698643,
"narHash": "sha256-VCiDjE8kNs8uCAK73Ezk1r3fFuc4JepvW07YFqaN968=",
"lastModified": 1776771786,
"narHash": "sha256-DRFGPfFV6hbrfO9a1PH1FkCi7qR5FgjSqsQGGvk1rdI=",
"owner": "mic92",
"repo": "sops-nix",
"rev": "8237de83e8200d16fe0c4467b02a1c608ff28044",
"rev": "bef289e2248991f7afeb95965c82fbcd8ff72598",
"type": "github"
},
"original": {
@@ -658,11 +658,11 @@
]
},
"locked": {
"lastModified": 1773695806,
"narHash": "sha256-HYmp4Ym/dlkRIPap7GFznNUNuDTTW0iIcOtHmhRzl3w=",
"lastModified": 1776790993,
"narHash": "sha256-TxDU/PFKoOYm+ncWXyI2vurKQPqu54gMlCRzx5sGnZc=",
"owner": "0xc000022070",
"repo": "zen-browser-flake",
"rev": "ced61240cc38dee9e659a7ced0cd9a839c6085d3",
"rev": "3f4f36b17ceeda27fc4953e8bc29637333508c05",
"type": "github"
},
"original": {

View File

@@ -1,28 +0,0 @@
{ ... }:
final: prev:
let
python313ForCeph =
let
base = final.python313;
in
base
// {
override = args:
base.override (args // {
packageOverrides = self: super:
(if args ? packageOverrides then args.packageOverrides self super else { })
// {
# Ceph still references cython_0 in nixpkgs; map it to modern cython on py3.13.
cython_0 = super.cython;
};
});
};
in {
# Work around nixos-unstable eval failure:
# sphinx-9.1.0 not supported for interpreter python3.11
# (seen through libvirtd -> qemu_full -> ceph Python dependency chain).
ceph = prev.ceph.override {
python311 = python313ForCeph;
};
}

View File

@@ -33,8 +33,6 @@ final: prev: {
) old.mesonFlags) ++ [
"-Dsysconfdir=${placeholder "out"}/etc"
] ++ (if prev.stdenv.hostPlatform.is64bit then [ "-Dintel-rt=enabled" ] else [ "-Dintel-rt=disabled" ]);
})).override {
stdenv = prev.gcc14Stdenv;
};
}));
}

View File

@@ -139,7 +139,7 @@
ntfs3g
htop
rivalcfg
blender
reaper
discord
betterdiscordctl
@@ -171,9 +171,7 @@
virtualisation.libvirtd = {
enable = true;
qemu = {
package = pkgs.qemu_full.override {
cephSupport = false;
};
package = pkgs.qemu;
runAsRoot = true;
swtpm.enable = true;
vhostUserPackages = [ pkgs.virtiofsd ];

View File

@@ -17,9 +17,23 @@
boot.extraModprobeConfig = ''
options vfio-pci ids=10de:1b81,10de:10f0
'';
boot.initrd.preDeviceCommands = ''
boot.initrd.systemd = {
enable = true;
services.initrd-vfio-pci-nvidia = {
description = "vfio-pci predevice init";
wantedBy = [ "initrd.target" ];
# Match 'preDeviceCommands' by running early
before = [ "sysroot.mount" ];
unitConfig.DefaultDependencies = "no";
serviceConfig.Type = "oneshot";
# Place your original shell commands here
script = ''
modprobe vfio-pci
'';
};
};
# # EARLY and deterministic binding
# boot.initrd.preDeviceCommands = ''
# echo 0000:05:00.0 > /sys/bus/pci/drivers/vfio-pci/bind