diff --git a/flake.lock b/flake.lock index 6beaf37..c83d3ce 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,43 @@ { "nodes": { + "chaotic": { + "inputs": { + "compare-to": "compare-to", + "flake-schemas": "flake-schemas", + "home-manager": "home-manager", + "nixpkgs": "nixpkgs", + "systems": "systems", + "yafas": "yafas" + }, + "locked": { + "lastModified": 1701182738, + "narHash": "sha256-vXSNYClkuHPx+NLQMTaFuIwv/4x9AIspkIOTm7VrOH0=", + "owner": "chaotic-cx", + "repo": "nyx", + "rev": "fce12bb67cd43513c9e8961c193de3030dc21ee7", + "type": "github" + }, + "original": { + "owner": "chaotic-cx", + "ref": "nyxpkgs-unstable", + "repo": "nyx", + "type": "github" + } + }, + "compare-to": { + "locked": { + "lastModified": 1695341185, + "narHash": "sha256-htO6DSbWyCgaDkxi7foPjXwJFPzGjVt3RRUbPSpNtZY=", + "rev": "98b8e330823a3570d328720f87a1153f8a7f2224", + "revCount": 2, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/chaotic-cx/nix-empty-flake/0.1.2%2Brev-98b8e330823a3570d328720f87a1153f8a7f2224/018aba35-d228-7fa9-b205-7616c89ef4e0/source.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://flakehub.com/f/chaotic-cx/nix-empty-flake/0.1.2.tar.gz" + } + }, "disko": { "inputs": { "nixpkgs": [ @@ -60,9 +98,23 @@ "type": "github" } }, + "flake-schemas": { + "locked": { + "lastModified": 1697467827, + "narHash": "sha256-j8SR19V1SRysyJwpOBF4TLuAvAjF5t+gMiboN4gYQDU=", + "rev": "764932025c817d4e500a8d2a4d8c565563923d29", + "revCount": 29, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/flake-schemas/0.1.2/018b3da8-4cc3-7fbb-8ff7-1588413c53e2/source.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://flakehub.com/f/DeterminateSystems/flake-schemas/0.1.1.tar.gz" + } + }, "flake-utils": { "inputs": { - "systems": "systems" + "systems": "systems_2" }, "locked": { "lastModified": 1694529238, @@ -116,6 +168,26 @@ } }, "home-manager": { + "inputs": { + "nixpkgs": [ + "chaotic", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1701071203, + "narHash": "sha256-lQywA7QU/vzTdZ1apI0PfgCWNyQobXUYghVrR5zuIeM=", + "rev": "db1878f013b52ba5e4034db7c1b63e8d04173a86", + "revCount": 3143, + "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" + }, + "original": { + "type": "tarball", + "url": "https://flakehub.com/f/nix-community/home-manager/0.1.0.tar.gz" + } + }, + "home-manager_2": { "inputs": { "nixpkgs": [ "nixpkgs" @@ -216,18 +288,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1701058557, - "narHash": "sha256-fux7HlrnoNs93MN0kET4AfiYwg/expoasndRCFeDRyk=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "070b5cf9f70bc7ef2dfd739a1f7d6c563fe64bd1", - "type": "github" + "lastModified": 1700794826, + "narHash": "sha256-RyJTnTNKhO0yqRpDISk03I/4A67/dp96YRxc86YOPgU=", + "rev": "5a09cb4b393d58f9ed0d9ca1555016a8543c2ac8", + "revCount": 552293, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.1.552293%2Brev-5a09cb4b393d58f9ed0d9ca1555016a8543c2ac8/018c0841-0b95-74e3-b3f4-632a3bec97d2/source.tar.gz" }, "original": { - "owner": "NixOS", - "ref": "nixos-23.11", - "repo": "nixpkgs", - "type": "github" + "type": "tarball", + "url": "https://flakehub.com/f/NixOS/nixpkgs/0.1.0.tar.gz" } }, "nixpkgs-stable": { @@ -262,6 +332,22 @@ "type": "github" } }, + "nixpkgs_2": { + "locked": { + "lastModified": 1701058557, + "narHash": "sha256-fux7HlrnoNs93MN0kET4AfiYwg/expoasndRCFeDRyk=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "070b5cf9f70bc7ef2dfd739a1f7d6c563fe64bd1", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-23.11", + "repo": "nixpkgs", + "type": "github" + } + }, "nur": { "locked": { "lastModified": 1701118487, @@ -330,20 +416,36 @@ }, "root": { "inputs": { + "chaotic": "chaotic", "disko": "disko", "emacs-overlay": "emacs-overlay", - "home-manager": "home-manager", + "home-manager": "home-manager_2", "nix-index-database": "nix-index-database", "nix-ld": "nix-ld", "nix-wallpaper": "nix-wallpaper", "nixos-unstable": "nixos-unstable", - "nixpkgs": "nixpkgs", + "nixpkgs": "nixpkgs_2", "nixpkgs-unstable": "nixpkgs-unstable", "nur": "nur", "plasma-manager": "plasma-manager" } }, "systems": { + "locked": { + "lastModified": 1689347949, + "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "owner": "nix-systems", + "repo": "default-linux", + "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default-linux", + "type": "github" + } + }, + "systems_2": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -357,6 +459,30 @@ "repo": "default", "type": "github" } + }, + "yafas": { + "inputs": { + "flake-schemas": [ + "chaotic", + "flake-schemas" + ], + "systems": [ + "chaotic", + "systems" + ] + }, + "locked": { + "lastModified": 1695926485, + "narHash": "sha256-wNFFnItckgSs8XeYhhv8vlJs2WF09fSQaWgw4xkDqHQ=", + "rev": "7772afd6686458ca0ddbc599a52cf5d337367653", + "revCount": 4, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/UbiqueLambda/yafas/0.1.4%2Brev-7772afd6686458ca0ddbc599a52cf5d337367653/018add18-ebb4-72c6-93fe-d1d8da361703/source.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://flakehub.com/f/UbiqueLambda/yafas/0.1.0.tar.gz" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index b25fc5a..6ac78bb 100644 --- a/flake.nix +++ b/flake.nix @@ -13,6 +13,9 @@ nixpkgs = { url = "github:NixOS/nixpkgs/nixos-23.11"; }; + chaotic = { + url = "github:chaotic-cx/nyx/nyxpkgs-unstable"; + }; home-manager = { url = "github:nix-community/home-manager/release-23.11"; inputs.nixpkgs.follows = "nixpkgs"; @@ -59,6 +62,7 @@ , nur , nix-index-database , disko + , chaotic , ... } @ inputs: let @@ -99,6 +103,7 @@ nix-index-database.nixosModules.nix-index nur.nixosModules.nur inputs.nix-ld.nixosModules.nix-ld + chaotic.nixosModules.default ]; args = { inherit self; diff --git a/os-mods/desktop/default.nix b/os-mods/desktop/default.nix index 64e9190..4407ded 100644 --- a/os-mods/desktop/default.nix +++ b/os-mods/desktop/default.nix @@ -96,4 +96,8 @@ remotePlay.openFirewall = true; dedicatedServer.openFirewall = true; }; + + chaotic.steam.extraCompatPackages = with pkgs; [ + proton-ge-custom + ]; } diff --git a/systems/nixos-pulse/default.nix b/systems/nixos-pulse/default.nix index 8aa232c..4fbfe31 100644 --- a/systems/nixos-pulse/default.nix +++ b/systems/nixos-pulse/default.nix @@ -19,8 +19,11 @@ ]; system.stateVersion = "23.05"; + nix.extraOptions = '' + system-features = benchmark big-parallel kvm nixos-test gccarch-x86-64-v3 + ''; boot = { - kernelPackages = pkgs.linuxPackages_latest; + kernelPackages = pkgs.pkgsx86_64_v3.linuxPackages_cachyos; kernelPatches = [ # { # name = "lexar"; @@ -30,12 +33,12 @@ kernelParams = [ "pcie_aspm=force" "pcie_aspm.policy=powersupersave" - "amd_pstate.shared_mem=1" - "amd_pstate=passive" - "initcall_blacklist=acpi_cpufreq_init" - "initcall_blacklist=hsmp_plt_init" + # "amd_pstate.shared_mem=1" + # "amd_pstate=passive" + # "initcall_blacklist=acpi_cpufreq_init" + # "initcall_blacklist=hsmp_plt_init" # "gpiolib_acpi.ignore_interrupt=AMDI0030:00@9" - "rtc_cmos.use_acpi_alarm=1" + "rtc_cmos.use_acpi_alarm=1" # reduce S0 sleep wakeups ]; loader = { systemd-boot = { @@ -164,7 +167,6 @@ services.dbus.packages = [ pkgs.unstable-os.tuxedo-rs ]; - hardware = { enableRedistributableFirmware = true; i2c.enable = true;