diff --git a/flake.lock b/flake.lock index d675963..4678179 100644 --- a/flake.lock +++ b/flake.lock @@ -10,11 +10,11 @@ "yafas": "yafas" }, "locked": { - "lastModified": 1701281948, - "narHash": "sha256-l18n5B1DG6o63Sugtcdwapp91q2lhUzMjjR4SfuFYBc=", + "lastModified": 1701618222, + "narHash": "sha256-rUr1tV5KpVgYGKbyWov1xc+9rsAY2ejKKYTHzGVCEkk=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "1bca2465c2d9b5c3daa530e0f97761fb60803480", + "rev": "f092b2089e2bb3d8fffc320dcbc75a99cdc4f6e3", "type": "github" }, "original": { @@ -69,11 +69,11 @@ ] }, "locked": { - "lastModified": 1701334333, - "narHash": "sha256-rsJ11xznoc2JSmM57bstxyas8xq8ZaEqNhQuQWyoQ/A=", + "lastModified": 1701593495, + "narHash": "sha256-cZviahu0z3t3jTbvx1Mhjhd45aiDvKRKbNE7OI6yIbg=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "913e44a13636fd111139ee683a6741ccb4c28672", + "rev": "b9765a4102f23b014d17d71aa0283d8e047477f6", "type": "github" }, "original": { @@ -175,12 +175,12 @@ ] }, "locked": { - "lastModified": 1701071203, - "narHash": "sha256-lQywA7QU/vzTdZ1apI0PfgCWNyQobXUYghVrR5zuIeM=", - "rev": "db1878f013b52ba5e4034db7c1b63e8d04173a86", - "revCount": 3143, + "lastModified": 1701609479, + "narHash": "sha256-mcEnMz7XB3K57ZX16VXoEkswljSNGXdMuUu5+g8a8R8=", + "rev": "e504e8d01f950776c3a3160ba38c5957a1b89e66", + "revCount": 3152, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/nix-community/home-manager/0.1.3143%2Brev-db1878f013b52ba5e4034db7c1b63e8d04173a86/018c0fc0-4040-75d8-9a92-046db53b783d/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/nix-community/home-manager/0.1.3152%2Brev-e504e8d01f950776c3a3160ba38c5957a1b89e66/018c300f-f44e-7449-9e8d-6080a6ca42e2/source.tar.gz" }, "original": { "type": "tarball", @@ -215,11 +215,11 @@ ] }, "locked": { - "lastModified": 1700968077, - "narHash": "sha256-Lax+2g7G3Fe+ckMrHLYTl+97unbmNDmN1qS9MLBkxr4=", + "lastModified": 1701572887, + "narHash": "sha256-oCPwQZT0Inis4zcYhtFHUp7Rym1zglKPLDcRird35q8=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "bd3aec0ecb0fdde863a7ed2c6caa220c47e22c07", + "rev": "41afa8d1c061beda68502bcc67f2788f3a77042b", "type": "github" }, "original": { @@ -272,11 +272,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1701068326, - "narHash": "sha256-vmMceA+q6hG1yrjb+MP8T0YFDQIrW3bl45e7z24IEts=", + "lastModified": 1701253981, + "narHash": "sha256-ztaDIyZ7HrTAfEEUt9AtTDNoCYxUdSd6NrRHaYOIxtk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8cfef6986adfb599ba379ae53c9f5631ecd2fd9c", + "rev": "e92039b55bcd58469325ded85d4f58dd5a4eaf58", "type": "github" }, "original": { @@ -288,12 +288,12 @@ }, "nixpkgs": { "locked": { - "lastModified": 1701068326, - "narHash": "sha256-vmMceA+q6hG1yrjb+MP8T0YFDQIrW3bl45e7z24IEts=", - "rev": "8cfef6986adfb599ba379ae53c9f5631ecd2fd9c", - "revCount": 553283, + "lastModified": 1701253981, + "narHash": "sha256-ztaDIyZ7HrTAfEEUt9AtTDNoCYxUdSd6NrRHaYOIxtk=", + "rev": "e92039b55bcd58469325ded85d4f58dd5a4eaf58", + "revCount": 554114, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.1.553283%2Brev-8cfef6986adfb599ba379ae53c9f5631ecd2fd9c/018c18d1-b364-7bfd-aced-a123b87538af/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.1.554114%2Brev-e92039b55bcd58469325ded85d4f58dd5a4eaf58/018c246f-3485-7920-b58c-92909d475b54/source.tar.gz" }, "original": { "type": "tarball", @@ -318,11 +318,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1701237617, - "narHash": "sha256-Ryd8xpNDY9MJnBFDYhB37XSFIxCPVVVXAbInNPa95vs=", + "lastModified": 1701432845, + "narHash": "sha256-06sd2rQ+DPMSueh+hW4MiXbpMSdhQHJOi/sw0vuwqvs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "85306ef2470ba705c97ce72741d56e42d0264015", + "rev": "77da99a144cd341408308e0a37622f5edcc6c5ba", "type": "github" }, "original": { @@ -334,11 +334,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1701156937, - "narHash": "sha256-jpMJOFvOTejx211D8z/gz0ErRtQPy6RXxgD2ZB86mso=", + "lastModified": 1701389149, + "narHash": "sha256-rU1suTIEd5DGCaAXKW6yHoCfR1mnYjOXQFOaH7M23js=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7c4c20509c4363195841faa6c911777a134acdf3", + "rev": "5de0b32be6e85dc1a9404c75131316e4ffbc634c", "type": "github" }, "original": { @@ -350,11 +350,11 @@ }, "nur": { "locked": { - "lastModified": 1701333924, - "narHash": "sha256-w953OKiXjECq44lI+vA1YR0XW/Np/B4OrIIm/d/GntU=", + "lastModified": 1701623572, + "narHash": "sha256-NBxGAGL+NqUON+2g9SjPJzcBIgov0gCM8WT8mZM83Xg=", "owner": "nix-community", "repo": "NUR", - "rev": "f0d92d2737c97b37804ca485d10148ee9abccf69", + "rev": "805f936f3ce5589d53c2a2c5eeab4019a233e10d", "type": "github" }, "original": { diff --git a/systems/nixos-desk/default.nix b/systems/nixos-desk/default.nix index 7e1ba66..ee8ad49 100644 --- a/systems/nixos-desk/default.nix +++ b/systems/nixos-desk/default.nix @@ -20,8 +20,12 @@ ]; system.stateVersion = "23.05"; + nix.settings.system-features = [ + "gccarch-x86-64-v3" + "gccarch-znver3" + ]; boot = { - kernelPackages = pkgs.linuxPackages_zen; + kernelPackages = pkgs.pkgsx86_64_v3.linuxPackages_cachyos; loader = { systemd-boot = { enable = true; diff --git a/systems/nixos-pulse/default.nix b/systems/nixos-pulse/default.nix index 4fbfe31..a03b3e2 100644 --- a/systems/nixos-pulse/default.nix +++ b/systems/nixos-pulse/default.nix @@ -19,17 +19,13 @@ ]; system.stateVersion = "23.05"; - nix.extraOptions = '' - system-features = benchmark big-parallel kvm nixos-test gccarch-x86-64-v3 - ''; + nix.settings.system-features = [ + "gccarch-x86-64-v3" + "gccarch-znver2" + ]; boot = { kernelPackages = pkgs.pkgsx86_64_v3.linuxPackages_cachyos; - kernelPatches = [ - # { - # name = "lexar"; - # patch = ./lexar.patch; - # } - ]; + kernelPatches = [ ]; kernelParams = [ "pcie_aspm=force" "pcie_aspm.policy=powersupersave" diff --git a/systems/nixos-pulse/lexar.patch b/systems/nixos-pulse/lexar.patch deleted file mode 100644 index 196bc44..0000000 --- a/systems/nixos-pulse/lexar.patch +++ /dev/null @@ -1,31 +0,0 @@ -@@ -, +, @@ ----------- ----------- ---- - drivers/nvme/host/core.c | 14 ++++++++++---- - 1 file changed, 10 insertions(+), 4 deletions(-) ---- a/drivers/nvme/host/core.c -+++ a/drivers/nvme/host/core.c -@@ -2255,11 +2255,17 @@ int nvme_enable_ctrl(struct nvme_ctrl *ctrl) - return ret; - } - -- if (ctrl->cap & NVME_CAP_CRMS_CRIMS) { -- ctrl->ctrl_config |= NVME_CC_CRIME; -- timeout = NVME_CRTO_CRIMT(crto); -+ if (crto == 0) { -+ timeout = NVME_CAP_TIMEOUT(ctrl->cap); -+ dev_warn(ctrl->device, "Ignoring bogus CRTO (0), falling back to NVME_CAP_TIMEOUT (%u)\n", -+ timeout); - } else { -- timeout = NVME_CRTO_CRWMT(crto); -+ if (ctrl->cap & NVME_CAP_CRMS_CRIMS) { -+ ctrl->ctrl_config |= NVME_CC_CRIME; -+ timeout = NVME_CRTO_CRIMT(crto); -+ } else { -+ timeout = NVME_CRTO_CRWMT(crto); -+ } - } - } else { - timeout = NVME_CAP_TIMEOUT(ctrl->cap); ---