diff --git a/flake.lock b/flake.lock index e18c33a..e351b84 100644 --- a/flake.lock +++ b/flake.lock @@ -137,11 +137,11 @@ ] }, "locked": { - "lastModified": 1740485968, - "narHash": "sha256-WK+PZHbfDjLyveXAxpnrfagiFgZWaTJglewBWniTn2Y=", + "lastModified": 1741684000, + "narHash": "sha256-NQykaWIrn5zilncefIvW4jPQ76YMXVK/dMTzkSVDmdk=", "owner": "nix-community", "repo": "disko", - "rev": "19c1140419c4f1cdf88ad4c1cfb6605597628940", + "rev": "2db1d64fc084b1d15e3871dffc02c62a94ed6ed7", "type": "github" }, "original": { @@ -153,11 +153,11 @@ "firefox-gnome-theme": { "flake": false, "locked": { - "lastModified": 1739223196, - "narHash": "sha256-vAxN2f3rvl5q62gQQjZGVSvF93nAsOxntuFz+e/655w=", + "lastModified": 1741628778, + "narHash": "sha256-RsvHGNTmO2e/eVfgYK7g+eYEdwwh7SbZa+gZkT24MEA=", "owner": "rafaelmardojai", "repo": "firefox-gnome-theme", - "rev": "a89108e6272426f4eddd93ba17d0ea101c34fb21", + "rev": "5a81d390bb64afd4e81221749ec4bffcbeb5fa80", "type": "github" }, "original": { @@ -363,11 +363,11 @@ ] }, "locked": { - "lastModified": 1737465171, - "narHash": "sha256-R10v2hoJRLq8jcL4syVFag7nIGE7m13qO48wRIukWNg=", + "lastModified": 1741379162, + "narHash": "sha256-srpAbmJapkaqGRE3ytf3bj4XshspVR5964OX5LfjDWc=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "9364dc02281ce2d37a1f55b6e51f7c0f65a75f17", + "rev": "b5a62751225b2f62ff3147d0a334055ebadcd5cc", "type": "github" }, "original": { @@ -443,11 +443,11 @@ ] }, "locked": { - "lastModified": 1741540808, - "narHash": "sha256-KSOHzP9gnxaF9YdtwFOPwnFvJEikg/uAvZ6M6VA/FQc=", + "lastModified": 1741701235, + "narHash": "sha256-gBlb8R9gnjUAT5XabJeel3C2iEUiBHx3+91651y3Sqo=", "owner": "nix-community", "repo": "home-manager", - "rev": "2967de4d1146f1b6aa820eed85b823ea2ebfd0fa", + "rev": "c630dfa8abcc65984cc1e47fb25d4552c81dd37e", "type": "github" }, "original": { @@ -528,11 +528,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1741532023, - "narHash": "sha256-wPoRT99r7dMQiXWzDe9v/2OSXOmGOWad/0q9norshvs=", + "lastModified": 1741691385, + "narHash": "sha256-Zjs3cBTVm4GLjjLgdi9XS/7nEdjjciKPj2EFOLOrNcE=", "owner": "lilyinstarlight", "repo": "nixos-cosmic", - "rev": "364761eb5ba3f1514446b6a0eb8e8651c5bc4c67", + "rev": "5af413f4e97073783ed2dc11fd134ffc7771414d", "type": "github" }, "original": { @@ -601,11 +601,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1741332913, - "narHash": "sha256-ri1e8ZliWS3Jnp9yqpKApHaOo7KBN33W8ECAKA4teAQ=", + "lastModified": 1741600792, + "narHash": "sha256-yfDy6chHcM7pXpMF4wycuuV+ILSTG486Z/vLx/Bdi6Y=", "owner": "nixos", "repo": "nixpkgs", - "rev": "20755fa05115c84be00b04690630cb38f0a203ad", + "rev": "ebe2788eafd539477f83775ef93c3c7e244421d3", "type": "github" }, "original": { @@ -648,11 +648,11 @@ }, "nixpkgs-mesa-git": { "locked": { - "lastModified": 1741705751, - "narHash": "sha256-TERyCTgLllWgmuYMxbrnjjJQYkj2TT7QoTDUCT/oFOc=", + "lastModified": 1741766918, + "narHash": "sha256-Zy3o+H2S1D/PX/7MSYOuDDaCtOtUfLMAnoBqiMxrhb4=", "owner": "kropatz", "repo": "nixpkgs", - "rev": "97c017ceecbbc3a5a8e588f3f2e79182afd2dd29", + "rev": "386fd8931a36ffd2b899cfe163cee6a2aedbb742", "type": "github" }, "original": { @@ -664,11 +664,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1741332913, - "narHash": "sha256-ri1e8ZliWS3Jnp9yqpKApHaOo7KBN33W8ECAKA4teAQ=", + "lastModified": 1741600792, + "narHash": "sha256-yfDy6chHcM7pXpMF4wycuuV+ILSTG486Z/vLx/Bdi6Y=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "20755fa05115c84be00b04690630cb38f0a203ad", + "rev": "ebe2788eafd539477f83775ef93c3c7e244421d3", "type": "github" }, "original": { @@ -680,11 +680,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1741379970, - "narHash": "sha256-Wh7esNh7G24qYleLvgOSY/7HlDUzWaL/n4qzlBePpiw=", + "lastModified": 1741513245, + "narHash": "sha256-7rTAMNTY1xoBwz0h7ZMtEcd8LELk9R5TzBPoHuhNSCk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "36fd87baa9083f34f7f5027900b62ee6d09b1f2f", + "rev": "e3e32b642a31e6714ec1b712de8c91a3352ce7e1", "type": "github" }, "original": { @@ -712,11 +712,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1741379970, - "narHash": "sha256-Wh7esNh7G24qYleLvgOSY/7HlDUzWaL/n4qzlBePpiw=", + "lastModified": 1741513245, + "narHash": "sha256-7rTAMNTY1xoBwz0h7ZMtEcd8LELk9R5TzBPoHuhNSCk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "36fd87baa9083f34f7f5027900b62ee6d09b1f2f", + "rev": "e3e32b642a31e6714ec1b712de8c91a3352ce7e1", "type": "github" }, "original": { @@ -733,11 +733,11 @@ "nuschtosSearch": "nuschtosSearch" }, "locked": { - "lastModified": 1741098523, - "narHash": "sha256-gXDSXDr6tAb+JgxGMvcEjKC9YO8tVOd8hMMZHJLyQ6Q=", + "lastModified": 1741709061, + "narHash": "sha256-G1YTksB0CnVhpU1gEmvO3ugPS5CAmUpm5UtTIUIPnEI=", "owner": "nix-community", "repo": "nixvim", - "rev": "03065fd4708bfdf47dd541d655392a60daa25ded", + "rev": "3a3abf11700f76738d8ad9d15054ceaf182d2974", "type": "github" }, "original": { @@ -753,11 +753,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1741541688, - "narHash": "sha256-So/foAIONGA7amt6gQez1RZOqYpFcvjeO+8g02LqfTU=", + "lastModified": 1741725118, + "narHash": "sha256-X7TMqHh9r38zZviHUGaBucPir9Zi5oeA04jfEG74imQ=", "owner": "nix-community", "repo": "NUR", - "rev": "55fd8b947ee109c7bc8ed6713a1e2e09d3e83c56", + "rev": "122e9d68505de4d1ee2db7544bd3dbf2dd08338b", "type": "github" }, "original": { @@ -776,11 +776,11 @@ "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1740408283, - "narHash": "sha256-2xECnhgF3MU9YjmvOkrRp8wRFo2OjjewgCtlfckhL5s=", + "lastModified": 1741693509, + "narHash": "sha256-emkxnsZstiJWmGACimyAYqIKz2Qz5We5h1oBVDyQjLw=", "owner": "nix-community", "repo": "NUR", - "rev": "496a4a11162bdffb9a7b258942de138873f019f7", + "rev": "5479646b2574837f1899da78bdf9a48b75a9fb27", "type": "github" }, "original": { @@ -859,11 +859,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1741533345, - "narHash": "sha256-wStpjHkVAuwYvs3oNSLWz8A2QkicfrGlP4rw2+OiyAU=", + "lastModified": 1741706258, + "narHash": "sha256-Frn1vjiJlyzI9QcosZNWDrgKQjoCbsNAkCrLw2pUYZ4=", "owner": "danth", "repo": "stylix", - "rev": "a76068262cfc16c04f9c07a6458715548b067450", + "rev": "4a8718e5a14faeef3e57ededb4efb88b0deed329", "type": "github" }, "original": { @@ -969,11 +969,11 @@ "tinted-schemes": { "flake": false, "locked": { - "lastModified": 1740351358, - "narHash": "sha256-Hdk850xgAd3DL8KX0AbyU7tC834d3Lej1jOo3duWiOA=", + "lastModified": 1741468895, + "narHash": "sha256-YKM1RJbL68Yp2vESBqeZQBjTETXo8mCTTzLZyckCfZk=", "owner": "tinted-theming", "repo": "schemes", - "rev": "a1bc2bd89e693e7e3f5764cfe8114e2ae150e184", + "rev": "47c8c7726e98069cade5827e5fb2bfee02ce6991", "type": "github" }, "original": { @@ -985,11 +985,11 @@ "tinted-tmux": { "flake": false, "locked": { - "lastModified": 1740272597, - "narHash": "sha256-/etfUV3HzAaLW3RSJVwUaW8ULbMn3v6wbTlXSKbcoWQ=", + "lastModified": 1740877430, + "narHash": "sha256-zWcCXgdC4/owfH/eEXx26y5BLzTrefjtSLFHWVD5KxU=", "owner": "tinted-theming", "repo": "tinted-tmux", - "rev": "b6c7f46c8718cc484f2db8b485b06e2a98304cd0", + "rev": "d48ee86394cbe45b112ba23ab63e33656090edb4", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 50ed55d..c52ff34 100644 --- a/flake.nix +++ b/flake.nix @@ -76,6 +76,7 @@ unstable-packages stable-packages gimp3 + mesa-git nur.overlays.default ]; }; diff --git a/modules/hardware/amd-gpu.nix b/modules/hardware/amd-gpu.nix index 9641276..70dd3d5 100644 --- a/modules/hardware/amd-gpu.nix +++ b/modules/hardware/amd-gpu.nix @@ -6,11 +6,34 @@ in { }; config = lib.mkIf cfg.enable { + boot.kernelParams = [ "amdgpu.ppfeaturemask=0xffffffff" "split_lock_detect=off" ]; + hardware.graphics = { + enable = true; + enable32Bit = true; + package = lib.mkForce pkgs.mesa-git.mesa.drivers; + #extraPackages = with pkgs; [ amdvlk ]; + }; + boot.initrd.kernelModules = [ "amdgpu" ]; services.xserver.videoDrivers = [ "amdgpu" ]; # controller (overclock, undervolt, fan curves) - environment.systemPackages = with pkgs; [ lact ]; + environment.systemPackages = with pkgs; [ lact nvtopPackages.amd ]; systemd.packages = with pkgs; [ lact ]; systemd.services.lactd.wantedBy = [ "multi-user.target" ]; + + #system.replaceDependencies.replacements = [ + # { oldDependency = pkgs.mesa; newDependency = pkgs.mesa-git.mesa; } + #]; + hardware.firmware = with pkgs; + [ + (linux-firmware.overrideAttrs (old: { + src = builtins.fetchGit { + url = + "https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git"; + rev = + "b4cb02b2dc3330c6e5d69e84a616b1ca5faecf12"; # Uncomment this line to allow for pure builds + }; + })) + ]; }; } diff --git a/modules/hardware/ryzen.nix b/modules/hardware/ryzenmonitor.nix similarity index 100% rename from modules/hardware/ryzen.nix rename to modules/hardware/ryzenmonitor.nix diff --git a/modules/kernel.nix b/modules/kernel.nix index 91314b1..4208a22 100644 --- a/modules/kernel.nix +++ b/modules/kernel.nix @@ -1,4 +1,5 @@ {pkgs, ...}: { - boot.kernelPackages = pkgs.linuxPackages_latest; + #boot.kernelPackages = pkgs.linuxPackages_latest; + boot.kernelPackages = pkgs.linuxPackages_testing; } diff --git a/overlays.nix b/overlays.nix index 1ac1ec6..e9298da 100644 --- a/overlays.nix +++ b/overlays.nix @@ -84,4 +84,11 @@ in { config.allowUnfree = true; }; }; + + mesa-git = final: _prev: { + mesa-git = import inputs.nixpkgs-mesa-git { + system = final.system; + config.allowUnfree = true; + }; + }; } diff --git a/systems/pc/configuration.nix b/systems/pc/configuration.nix index 56c9a7c..b9b9f2e 100644 --- a/systems/pc/configuration.nix +++ b/systems/pc/configuration.nix @@ -14,7 +14,7 @@ ../../modules/fh/writing.nix ../../modules/work/vpn.nix ../../modules/misc/faster-boot-time.nix - ../../modules/hardware/ryzen.nix + #../../modules/hardware/ryzenmonitor.nix ../../modules/networkmanager.nix ]; diff --git a/systems/pc/hardware-configuration.nix b/systems/pc/hardware-configuration.nix index e891a66..1c214a4 100644 --- a/systems/pc/hardware-configuration.nix +++ b/systems/pc/hardware-configuration.nix @@ -23,7 +23,7 @@ }; fileSystems."/boot" = - { device = "/dev/disk/by-uuid/5AA5-45E0"; + { device = "/dev/disk/by-uuid/CC7C-CF82"; fsType = "vfat"; };