diff --git a/flake.lock b/flake.lock index cfab231..baa4acb 100644 --- a/flake.lock +++ b/flake.lock @@ -67,6 +67,51 @@ "type": "github" } }, + "chaotic": { + "inputs": { + "fenix": "fenix", + "flake-schemas": "flake-schemas", + "home-manager": "home-manager", + "jovian": "jovian", + "nixpkgs": "nixpkgs" + }, + "locked": { + "lastModified": 1748304776, + "narHash": "sha256-Eb+kBcm7ECpJ1HKjMgvZPo9TpGG0CpzfGRUc0FCZKP0=", + "owner": "chaotic-cx", + "repo": "nyx", + "rev": "5278f55d2c2c568db38ed03370606b5e009e34df", + "type": "github" + }, + "original": { + "owner": "chaotic-cx", + "repo": "nyx", + "rev": "5278f55d2c2c568db38ed03370606b5e009e34df", + "type": "github" + } + }, + "fenix": { + "inputs": { + "nixpkgs": [ + "chaotic", + "nixpkgs" + ], + "rust-analyzer-src": "rust-analyzer-src" + }, + "locked": { + "lastModified": 1747392669, + "narHash": "sha256-zky3+lndxKRu98PAwVK8kXPdg+Q1NVAhaI7YGrboKYA=", + "owner": "nix-community", + "repo": "fenix", + "rev": "c3c27e603b0d9b5aac8a16236586696338856fbb", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "fenix", + "type": "github" + } + }, "firefox-gnome-theme": { "flake": false, "locked": { @@ -137,6 +182,20 @@ "type": "github" } }, + "flake-schemas": { + "locked": { + "lastModified": 1721999734, + "narHash": "sha256-G5CxYeJVm4lcEtaO87LKzOsVnWeTcHGKbKxNamNWgOw=", + "rev": "0a5c42297d870156d9c57d8f99e476b738dcd982", + "revCount": 75, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/flake-schemas/0.1.5/0190ef2f-61e0-794b-ba14-e82f225e55e6/source.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://flakehub.com/f/DeterminateSystems/flake-schemas/%3D0.1.5.tar.gz" + } + }, "flake-utils": { "inputs": { "systems": "systems_3" @@ -274,11 +333,11 @@ }, "hardware": { "locked": { - "lastModified": 1747684167, - "narHash": "sha256-l6jbonaboCBlB8lCjBkrqgh2zEnvt6F3f4dOU/8CLd4=", + "lastModified": 1747900541, + "narHash": "sha256-dn64Pg9xLETjblwZs9Euu/SsjW80pd6lr5qSiyLY1pg=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "e8f38b2c19c0647e39021c3d47172ff5469af8a9", + "rev": "11f2d9ea49c3e964315215d6baa73a8d42672f06", "type": "github" }, "original": { @@ -290,15 +349,16 @@ "home-manager": { "inputs": { "nixpkgs": [ - "nixpkgs-unstable" + "chaotic", + "nixpkgs" ] }, "locked": { - "lastModified": 1747565775, - "narHash": "sha256-B6jmKHUEX1jxxcdoYHl7RVaeohtAVup8o3nuVkzkloA=", + "lastModified": 1748182899, + "narHash": "sha256-r6MHSalDFydlUmjorVTSsyhLjIt8VWNtGc5+mffXvFQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "97118a310eb8e13bc1b9b12d67267e55b7bee6c8", + "rev": "901f8fef7f349cf8a8e97b3230b22fd592df9160", "type": "github" }, "original": { @@ -308,6 +368,26 @@ } }, "home-manager_2": { + "inputs": { + "nixpkgs": [ + "nixpkgs-unstable" + ] + }, + "locked": { + "lastModified": 1748391243, + "narHash": "sha256-7sCuihzsTRZemtbTXaFUoGJUfuQErhKEcL9v7HKIo1k=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "f5b12be834874f7661db4ced969a621ab2d57971", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, + "home-manager_3": { "inputs": { "nixpkgs": [ "stylix", @@ -315,11 +395,11 @@ ] }, "locked": { - "lastModified": 1747279714, - "narHash": "sha256-UdxlE8yyrKiGq3bgGyJ78AdFwh+fuRAruKtyFY5Zq5I=", + "lastModified": 1747763032, + "narHash": "sha256-9j3oCbemeH7bTVXJ3pDWxOptbxDx2SdK1jY2AHpjQiw=", "owner": "nix-community", "repo": "home-manager", - "rev": "954615c510c9faa3ee7fb6607ff72e55905e69f2", + "rev": "29dda415f5b2178278283856c6f9f7b48a2a4353", "type": "github" }, "original": { @@ -350,6 +430,28 @@ "type": "github" } }, + "jovian": { + "inputs": { + "nix-github-actions": "nix-github-actions", + "nixpkgs": [ + "chaotic", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1747990026, + "narHash": "sha256-sG5VbID+x5+xUC+jjgHibnzg8IllVcH+K2TLmYHLPME=", + "owner": "Jovian-Experiments", + "repo": "Jovian-NixOS", + "rev": "e2f4ced874406541a7957f7e2b8f05a0d59a0f00", + "type": "github" + }, + "original": { + "owner": "Jovian-Experiments", + "repo": "Jovian-NixOS", + "type": "github" + } + }, "nix-gaming": { "inputs": { "flake-parts": "flake-parts", @@ -358,11 +460,11 @@ ] }, "locked": { - "lastModified": 1747620037, - "narHash": "sha256-M5yyl1Cp5rolwGBuCEKXG6qJj9lao16lshqPF83z0qs=", + "lastModified": 1748397391, + "narHash": "sha256-g2quQIkkDOHFMipUOBs7+D3xr490slZp9qiamOkPzO4=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "5d7985a2d5c877f6a276a2b024fff6bb2995ff24", + "rev": "39bae253dc201cfe03ee53bd90ed813f89afa9cd", "type": "github" }, "original": { @@ -371,13 +473,36 @@ "type": "github" } }, + "nix-github-actions": { + "inputs": { + "nixpkgs": [ + "chaotic", + "jovian", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1729697500, + "narHash": "sha256-VFTWrbzDlZyFHHb1AlKRiD/qqCJIripXKiCSFS8fAOY=", + "owner": "zhaofengli", + "repo": "nix-github-actions", + "rev": "e418aeb728b6aa5ca8c5c71974e7159c2df1d8cf", + "type": "github" + }, + "original": { + "owner": "zhaofengli", + "ref": "matrix-name", + "repo": "nix-github-actions", + "type": "github" + } + }, "nixpkgs": { "locked": { - "lastModified": 1747542820, - "narHash": "sha256-GaOZntlJ6gPPbbkTLjbd8BMWaDYafhuuYRNrxCGnPJw=", + "lastModified": 1748190013, + "narHash": "sha256-R5HJFflOfsP5FBtk+zE8FpL8uqE7n62jqOsADvVshhE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "292fa7d4f6519c074f0a50394dbbe69859bb6043", + "rev": "62b852f6c6742134ade1abdd2a21685fd617a291", "type": "github" }, "original": { @@ -402,29 +527,13 @@ "type": "github" } }, - "nixpkgs-ovmf": { - "locked": { - "lastModified": 1708984720, - "narHash": "sha256-gJctErLbXx4QZBBbGp78PxtOOzsDaQ+yw1ylNQBuSUY=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "13aff9b34cc32e59d35c62ac9356e4a41198a538", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs-stable": { "locked": { - "lastModified": 1747485343, - "narHash": "sha256-YbsZyuRE1tobO9sv0PUwg81QryYo3L1F3R3rF9bcG38=", + "lastModified": 1748037224, + "narHash": "sha256-92vihpZr6dwEMV6g98M5kHZIttrWahb9iRPBm1atcPk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9b5ac7ad45298d58640540d0323ca217f32a6762", + "rev": "f09dede81861f3a83f7f06641ead34f02f37597f", "type": "github" }, "original": { @@ -436,11 +545,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1747542820, - "narHash": "sha256-GaOZntlJ6gPPbbkTLjbd8BMWaDYafhuuYRNrxCGnPJw=", + "lastModified": 1748370509, + "narHash": "sha256-QlL8slIgc16W5UaI3w7xHQEP+Qmv/6vSNTpoZrrSlbk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "292fa7d4f6519c074f0a50394dbbe69859bb6043", + "rev": "4faa5f5321320e49a78ae7848582f684d64783e9", "type": "github" }, "original": { @@ -451,6 +560,22 @@ } }, "nixpkgs_2": { + "locked": { + "lastModified": 1748370509, + "narHash": "sha256-QlL8slIgc16W5UaI3w7xHQEP+Qmv/6vSNTpoZrrSlbk=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "4faa5f5321320e49a78ae7848582f684d64783e9", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { "locked": { "lastModified": 1710272261, "narHash": "sha256-g0bDwXFmTE7uGDOs9HcJsfLFhH7fOsASbAuOzDC+fhQ=", @@ -466,13 +591,13 @@ "type": "github" } }, - "nixpkgs_3": { + "nixpkgs_4": { "locked": { - "lastModified": 1747327360, - "narHash": "sha256-LSmTbiq/nqZR9B2t4MRnWG7cb0KVNU70dB7RT4+wYK4=", + "lastModified": 1747542820, + "narHash": "sha256-GaOZntlJ6gPPbbkTLjbd8BMWaDYafhuuYRNrxCGnPJw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e06158e58f3adee28b139e9c2bcfcc41f8625b46", + "rev": "292fa7d4f6519c074f0a50394dbbe69859bb6043", "type": "github" }, "original": { @@ -486,16 +611,15 @@ "inputs": { "nixpkgs": [ "nixpkgs-stable" - ], - "nixpkgs-ovmf": "nixpkgs-ovmf" + ] }, "locked": { - "lastModified": 1712439808, - "narHash": "sha256-QoONoZPBpNTw5cia05QSvDlaxXo3moKAJQOw7c5hMXA=", - "rev": "9f1cdca730d92461075709e867c1e9ad93d58a8d", - "revCount": 284, + "lastModified": 1748140003, + "narHash": "sha256-DNBZmuk1YRM2PmwbHzVdXumRjCUzQkMarg4iI/37rOQ=", + "rev": "5dfe108fd859b122f9a96981cb6bc12297653d6c", + "revCount": 407, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/AshleyYakeley/NixVirt/0.5.0/018eb55e-7beb-75c5-919f-5b5b26136e06/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/AshleyYakeley/NixVirt/0.6.0/0197059a-e45f-7446-86b5-411ccc894ab0/source.tar.gz" }, "original": { "type": "tarball", @@ -530,10 +654,11 @@ }, "root": { "inputs": { + "chaotic": "chaotic", "hardware": "hardware", - "home-manager": "home-manager", + "home-manager": "home-manager_2", "nix-gaming": "nix-gaming", - "nixpkgs": "nixpkgs", + "nixpkgs": "nixpkgs_2", "nixpkgs-stable": "nixpkgs-stable", "nixpkgs-unstable": "nixpkgs-unstable", "nixvirt": "nixvirt", @@ -548,15 +673,15 @@ "rose-pine-hyprcursor": { "inputs": { "hyprlang": "hyprlang", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs_3", "utils": "utils" }, "locked": { - "lastModified": 1740132177, - "narHash": "sha256-gNc20APKMefFdH5RONBuHhOps14aiMdgIT0I6RaSN64=", + "lastModified": 1748096947, + "narHash": "sha256-ouuA8LVBXzrbYwPW2vNjh7fC9H2UBud/1tUiIM5vPvM=", "owner": "ndom91", "repo": "rose-pine-hyprcursor", - "rev": "568067f35a85932192bd43ddf64fc05eff850f9f", + "rev": "4b02963d0baf0bee18725cf7c5762b3b3c1392f1", "type": "github" }, "original": { @@ -565,6 +690,23 @@ "type": "github" } }, + "rust-analyzer-src": { + "flake": false, + "locked": { + "lastModified": 1747323949, + "narHash": "sha256-G4NwzhODScKnXqt2mEQtDFOnI0wU3L1WxsiHX3cID/0=", + "owner": "rust-lang", + "repo": "rust-analyzer", + "rev": "f8e784353bde7cbf9a9046285c1caf41ac484ebe", + "type": "github" + }, + "original": { + "owner": "rust-lang", + "ref": "nightly", + "repo": "rust-analyzer", + "type": "github" + } + }, "snapraid-aio": { "inputs": { "flake-utils": "flake-utils", @@ -615,8 +757,8 @@ "flake-parts": "flake-parts_2", "git-hooks": "git-hooks", "gnome-shell": "gnome-shell", - "home-manager": "home-manager_2", - "nixpkgs": "nixpkgs_3", + "home-manager": "home-manager_3", + "nixpkgs": "nixpkgs_4", "nur": "nur", "systems": "systems_4", "tinted-foot": "tinted-foot", @@ -626,11 +768,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1747675820, - "narHash": "sha256-Z8o3Tu/FN4GOtZl4WNY0Gcp/Uzuz06ILkRy0oPVteM0=", + "lastModified": 1748450356, + "narHash": "sha256-r4ftEbA22jCoLnaB0w58wo5Pp8jgSGwwAEfGgvZGFcs=", "owner": "danth", "repo": "stylix", - "rev": "f8833c5e0c64287cd51a27e6061a88f4225b6b70", + "rev": "257939576384a9057a8259e76689090643f5a127", "type": "github" }, "original": { @@ -899,11 +1041,11 @@ ] }, "locked": { - "lastModified": 1747282003, - "narHash": "sha256-UlCfXNncIYwUvPxHngoH6pY4fiZlU8Z2Ve/gUEn6h+o=", + "lastModified": 1748059546, + "narHash": "sha256-e0jy8RU8ofOdeS5gF9Hir+M5Wn0q7D8MkpeQXsOJdu4=", "owner": "youwen5", "repo": "zen-browser-flake", - "rev": "952ca99903f19a7096a3709f2938d9c7840a5f91", + "rev": "716a5af28d686d67146d01b14112c919b6133a84", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 51218bc..f67a5b2 100644 --- a/flake.nix +++ b/flake.nix @@ -5,6 +5,7 @@ nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-24.11"; nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; + chaotic.url = "github:chaotic-cx/nyx/5278f55d2c2c568db38ed03370606b5e009e34df"; # Bleeding edge packages from Chaotic-AUR ## NixOS ## diff --git a/hosts/global/common/gaming.nix b/hosts/global/common/gaming.nix index 9f7c9be..7c182fb 100644 --- a/hosts/global/common/gaming.nix +++ b/hosts/global/common/gaming.nix @@ -5,8 +5,6 @@ ... }: { - hardware.xone.enable = true; # xbox controller - hardware.opengl = { enable = true; driSupport32Bit = true; diff --git a/hosts/nixos/rune/default.nix b/hosts/nixos/rune/default.nix index 119b59f..fda5b58 100644 --- a/hosts/nixos/rune/default.nix +++ b/hosts/nixos/rune/default.nix @@ -19,6 +19,7 @@ in { imports = lib.flatten [ ## Rune Only ## + inputs.chaotic.nixosModules.default # ./config ## Hardware ## @@ -68,6 +69,8 @@ in environment.sessionVariables = { AMD_VULKAN_ICD = "RADV"; + RADV_PERFTEST = "aco"; + PROTON_USE_D9VK = 1; }; # https://wiki.nixos.org/wiki/FAQ/When_do_I_update_stateVersion diff --git a/hosts/nixos/rune/hardware.nix b/hosts/nixos/rune/hardware.nix index 401175b..98bac08 100644 --- a/hosts/nixos/rune/hardware.nix +++ b/hosts/nixos/rune/hardware.nix @@ -4,6 +4,7 @@ { pkgs, + inputs, config, lib, modulesPath, @@ -30,8 +31,8 @@ timeout = 3; }; - # Use the zen kernel for better performance - kernelPackages = pkgs.linuxPackages_zen; + # Use the cachyos kernel for better performance + kernelPackages = pkgs.linuxPackages_cachyos; initrd = { systemd.enable = true; @@ -89,3 +90,10 @@ hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableAllFirmware; } + +# STUFF ABOUT CHAOTIC NIX CACHE +# nix eval 'github:chaotic-cx/nyx/nyxpkgs-unstable#linuxPackages_cachyos.kernel.outPath' +# nix eval 'chaotic#linuxPackages_cachyos.kernel.outPath' +# nix eval '/pool/git/Nix/dot.nix#nixosConfigurations.rune.config.boot.kernelPackages.kernel.outPath' +# curl -L 'https://chaotic-nyx.cachix.org/{{HASH}}.narinfo' +# sudo nixos-rebuild switch --flake ./git/Nix/dot.nix/. --option 'extra-substituters' 'https://chaotic-nyx.cachix.org/' --option extra-trusted-public-keys "chaotic-nyx.cachix.org-1:HfnXSw4pj95iI/n17rIDy40agHj12WfF+Gqk6SonIT8="