From 0bc71bcd5242c5f9c49ed3bb3567255938fbc4fb Mon Sep 17 00:00:00 2001 From: Mirza Arnaut Date: Fri, 13 Dec 2024 10:45:42 +0100 Subject: [PATCH] Use facter with ucodenix! --- flake.lock | 89 +++++++++++++++++----------- hosts/isshin/configuration.nix | 2 +- modules/nixos/system/amd/default.nix | 3 +- 3 files changed, 58 insertions(+), 36 deletions(-) diff --git a/flake.lock b/flake.lock index 1f76327..ca07055 100644 --- a/flake.lock +++ b/flake.lock @@ -66,6 +66,23 @@ "type": "github" } }, + "cpu-microcodes": { + "flake": false, + "locked": { + "lastModified": 1733678768, + "narHash": "sha256-Ar2rEPOEMr69BDdQsqsLbspHMZFIWfsL/6VjbhbrboA=", + "owner": "platomav", + "repo": "CPUMicrocodes", + "rev": "cec026c72d15f7f39b30e9e848bb6c41eab7b754", + "type": "github" + }, + "original": { + "owner": "platomav", + "repo": "CPUMicrocodes", + "rev": "cec026c72d15f7f39b30e9e848bb6c41eab7b754", + "type": "github" + } + }, "crane": { "locked": { "lastModified": 1727974419, @@ -109,11 +126,11 @@ ] }, "locked": { - "lastModified": 1733168902, - "narHash": "sha256-8dupm9GfK+BowGdQd7EHK5V61nneLfr9xR6sc5vtDi0=", + "lastModified": 1734011192, + "narHash": "sha256-NghuiWXx6Q3gwLiudiNwDpYQ1CPEUK7J+f9dWREN8KA=", "owner": "nix-community", "repo": "disko", - "rev": "785c1e02c7e465375df971949b8dcbde9ec362e5", + "rev": "0f31ad735e784315a22d9899d3ba24340ce64220", "type": "github" }, "original": { @@ -308,16 +325,16 @@ "gnome-shell": { "flake": false, "locked": { - "lastModified": 1713702291, - "narHash": "sha256-zYP1ehjtcV8fo+c+JFfkAqktZ384Y+y779fzmR9lQAU=", + "lastModified": 1732369855, + "narHash": "sha256-JhUWbcYPjHO3Xs3x9/Z9RuqXbcp5yhPluGjwsdE2GMg=", "owner": "GNOME", "repo": "gnome-shell", - "rev": "0d0aadf013f78a7f7f1dc984d0d812971864b934", + "rev": "dadd58f630eeea41d645ee225a63f719390829dc", "type": "github" }, "original": { "owner": "GNOME", - "ref": "46.1", + "ref": "47.2", "repo": "gnome-shell", "type": "github" } @@ -347,11 +364,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1733656469, - "narHash": "sha256-Eycc+MhSCoFsy0KagOQt5F1fK9vF2hyn4TneZRc3FLE=", + "lastModified": 1734059364, + "narHash": "sha256-tCMz/tgXOBhshFOfd2ED9e02TeK6tuElD/6rjnKU4Z4=", "owner": "helix-editor", "repo": "helix", - "rev": "db1d84256fbae21abb3ba46943fb1abb8e211355", + "rev": "ce133a2889956c5cc383be0725cdc78eb3277c05", "type": "github" }, "original": { @@ -367,11 +384,11 @@ ] }, "locked": { - "lastModified": 1733572789, - "narHash": "sha256-zjO6m5BqxXIyjrnUziAzk4+T4VleqjstNudSqWcpsHI=", + "lastModified": 1733951536, + "narHash": "sha256-Zb5ZCa7Xj+0gy5XVXINTSr71fCfAv+IKtmIXNrykT54=", "owner": "nix-community", "repo": "home-manager", - "rev": "c7ffc9727d115e433fd884a62dc164b587ff651d", + "rev": "1318c3f3b068cdcea922fa7c1a0a1f0c96c22f5f", "type": "github" }, "original": { @@ -389,15 +406,16 @@ ] }, "locked": { - "lastModified": 1732482255, - "narHash": "sha256-GUffLwzawz5WRVfWaWCg78n/HrBJrOG7QadFY6rtV8A=", + "lastModified": 1733572789, + "narHash": "sha256-zjO6m5BqxXIyjrnUziAzk4+T4VleqjstNudSqWcpsHI=", "owner": "nix-community", "repo": "home-manager", - "rev": "a9953635d7f34e7358d5189751110f87e3ac17da", + "rev": "c7ffc9727d115e433fd884a62dc164b587ff651d", "type": "github" }, "original": { "owner": "nix-community", + "ref": "release-24.11", "repo": "home-manager", "type": "github" } @@ -483,11 +501,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1733481457, - "narHash": "sha256-IS3bxa4N1VMSh3/P6vhEAHQZecQ3oAlKCDvzCQSO5Is=", + "lastModified": 1733861262, + "narHash": "sha256-+jjPup/ByS0LEVIrBbt7FnGugJgLeG9oc+ivFASYn2U=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "e563803af3526852b6b1d77107a81908c66a9fcf", + "rev": "cf737e2eba82b603f54f71b10cb8fd09d22ce3f5", "type": "github" }, "original": { @@ -530,11 +548,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1733581040, - "narHash": "sha256-Qn3nPMSopRQJgmvHzVqPcE3I03zJyl8cSbgnnltfFDY=", + "lastModified": 1733940404, + "narHash": "sha256-Pj39hSoUA86ZePPF/UXiYHHM7hMIkios8TYG29kQT4g=", "owner": "nixos", "repo": "nixpkgs", - "rev": "22c3f2cf41a0e70184334a958e6b124fb0ce3e01", + "rev": "5d67ea6b4b63378b9c13be21e2ec9d1afc921713", "type": "github" }, "original": { @@ -546,11 +564,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1733550349, - "narHash": "sha256-NcGumB4Lr6KSDq+nIqXtNA8QwAQKDSZT7N9OTGWbTrs=", + "lastModified": 1733808091, + "narHash": "sha256-KWwINTQelKOoQgrXftxoqxmKFZb9pLVfnRvK270nkVk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e2605d0744c2417b09f8bf850dfca42fcf537d34", + "rev": "a0f3e10d94359665dba45b71b4227b0aeb851f8e", "type": "github" }, "original": { @@ -715,11 +733,11 @@ ] }, "locked": { - "lastModified": 1733128155, - "narHash": "sha256-m6/qwJAJYcidGMEdLqjKzRIjapK4nUfMq7rDCTmZajc=", + "lastModified": 1733965552, + "narHash": "sha256-GZ4YtqkfyTjJFVCub5yAFWsHknG1nS/zfk7MuHht4Fs=", "owner": "Mic92", "repo": "sops-nix", - "rev": "c6134b6fff6bda95a1ac872a2a9d5f32e3c37856", + "rev": "2d73fc6ac4eba4b9a83d3cb8275096fbb7ab4004", "type": "github" }, "original": { @@ -747,11 +765,11 @@ "tinted-tmux": "tinted-tmux" }, "locked": { - "lastModified": 1732993760, - "narHash": "sha256-t1J6wgzGjvvGNfdd0ei8HnZf9sTw+SpvCNAX0i6Qgwc=", + "lastModified": 1734025806, + "narHash": "sha256-xrpw39YNjsTtUnqdk0nG1WdjJqEGITHdnvlxJwohd9s=", "owner": "danth", "repo": "stylix", - "rev": "d13ffb381c83b6139b9d67feff7addf18f8408fe", + "rev": "3d887bd0d7fffecae67d4e0088cce9b359d1be97", "type": "github" }, "original": { @@ -872,12 +890,15 @@ } }, "ucodenix": { + "inputs": { + "cpu-microcodes": "cpu-microcodes" + }, "locked": { - "lastModified": 1733351763, - "narHash": "sha256-0VzlIIE+78t0YptH5lkkrIy8FwM1Z9Hkn75n9RTF5Hc=", + "lastModified": 1734051073, + "narHash": "sha256-nQpzpnc02/D4JRx8L4s8D33n05MiOac/QnRmQWBlKCc=", "owner": "e-tho", "repo": "ucodenix", - "rev": "56c73f68361ae713be920bd221592c381f82fa23", + "rev": "4b1333e392c9c9f986ef21bf47ebb55773224e31", "type": "github" }, "original": { diff --git a/hosts/isshin/configuration.nix b/hosts/isshin/configuration.nix index d305e66..aff939e 100644 --- a/hosts/isshin/configuration.nix +++ b/hosts/isshin/configuration.nix @@ -2,7 +2,7 @@ { services = lib.mkIf (config.services ? ucodenix) { ucodenix.enable = true; - ucodenix.cpuModelId = "00A70F41"; + # ucodenix.cpuModelId = "00A70F41"; }; hosts = { diff --git a/modules/nixos/system/amd/default.nix b/modules/nixos/system/amd/default.nix index ce53d41..46cd00f 100644 --- a/modules/nixos/system/amd/default.nix +++ b/modules/nixos/system/amd/default.nix @@ -25,7 +25,8 @@ xserver.videoDrivers = [ "amdgpu" ]; ucodenix = { enable = lib.mkDefault true; - cpuModelId = lib.mkDefault "auto"; + cpuModelId = lib.mkDefault config.facter.reportPath; + # cpuModelId = lib.mkDefault "auto"; }; };