From e16e34c4bb194df749096ca23c9102faaf57bc8e Mon Sep 17 00:00:00 2001 From: Frank LoTurco Date: Thu, 23 Jul 2026 16:02:02 -0400 Subject: [PATCH] nixos: add affinity v3 --- flake.lock | 369 ++++++++++++++++++++++++++++++++++++----- flake.nix | 3 + hosts/shared/nixos.nix | 8 +- 3 files changed, 342 insertions(+), 38 deletions(-) diff --git a/flake.lock b/flake.lock index 5fb57f1..09fdce3 100644 --- a/flake.lock +++ b/flake.lock @@ -1,8 +1,36 @@ { "nodes": { + "affinity-nix": { + "inputs": { + "corefonts": "corefonts", + "crane": "crane", + "fenix": "fenix", + "flake-compat": "flake-compat", + "flake-parts": "flake-parts", + "git-hooks": "git-hooks", + "nixpkgs": "nixpkgs_2", + "nixpkgs-wine": "nixpkgs-wine", + "on-linux": "on-linux", + "plugin-loader-src": "plugin-loader-src", + "treefmt-nix": "treefmt-nix" + }, + "locked": { + "lastModified": 1784349630, + "narHash": "sha256-86nkp6r49nQABjJq4Le4xof1zEvSOz5z6H0fNSbQTHk=", + "owner": "mrshmllow", + "repo": "affinity-nix", + "rev": "db927832b986f5d9d6432e96f23fd19a88481ef9", + "type": "github" + }, + "original": { + "owner": "mrshmllow", + "repo": "affinity-nix", + "type": "github" + } + }, "appimage-manager": { "inputs": { - "nixpkgs": "nixpkgs" + "nixpkgs": "nixpkgs_4" }, "locked": { "lastModified": 1784588196, @@ -18,7 +46,73 @@ "type": "github" } }, + "corefonts": { + "flake": false, + "locked": { + "lastModified": 1431183738, + "narHash": "sha256-610Km9GCtYWxi2SH5jH/XYPXc5f58q5lB05/5XxO/qM=", + "owner": "pushcx", + "repo": "corefonts", + "rev": "8f8627b0004b5f1b952c09cf6390e4ae46475e59", + "type": "github" + }, + "original": { + "owner": "pushcx", + "repo": "corefonts", + "type": "github" + } + }, + "crane": { + "locked": { + "lastModified": 1784172867, + "narHash": "sha256-hzzeOgTP0MXMvg4djVwysTDvvUXIpsUCgsA0wPMF/Qk=", + "owner": "ipetkov", + "repo": "crane", + "rev": "8833b7dc3c7426ce1110ed6fed31b6f63d74f2dc", + "type": "github" + }, + "original": { + "owner": "ipetkov", + "repo": "crane", + "type": "github" + } + }, + "fenix": { + "inputs": { + "nixpkgs": [ + "affinity-nix", + "nixpkgs" + ], + "rust-analyzer-src": "rust-analyzer-src" + }, + "locked": { + "lastModified": 1782900513, + "narHash": "sha256-GHrsl1+ysDFgmDQtQSqWS7TiYD2Q58VlwLvnf1+crJM=", + "owner": "nix-community", + "repo": "fenix", + "rev": "16810aa8f4ad89ca480b1513774e8b6f485fe368", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "fenix", + "type": "github" + } + }, "flake-compat": { + "locked": { + "lastModified": 1751685974, + "narHash": "sha256-NKw96t+BgHIYzHUjkTK95FqYRVKB8DHpVhefWSz/kTw=", + "rev": "549f2762aebeff29a2e5ece7a7dc0f955281a1d1", + "type": "tarball", + "url": "https://git.lix.systems/api/v1/repos/lix-project/flake-compat/archive/549f2762aebeff29a2e5ece7a7dc0f955281a1d1.tar.gz?rev=549f2762aebeff29a2e5ece7a7dc0f955281a1d1" + }, + "original": { + "type": "tarball", + "url": "https://git.lix.systems/lix-project/flake-compat/archive/main.tar.gz" + } + }, + "flake-compat_2": { "flake": false, "locked": { "lastModified": 1767039857, @@ -34,7 +128,23 @@ "type": "github" } }, - "flake-compat_2": { + "flake-compat_3": { + "flake": false, + "locked": { + "lastModified": 1767039857, + "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=", + "owner": "NixOS", + "repo": "flake-compat", + "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_4": { "locked": { "lastModified": 1733328505, "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", @@ -66,6 +176,24 @@ "type": "github" } }, + "flake-parts_2": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib_2" + }, + "locked": { + "lastModified": 1782949081, + "narHash": "sha256-vp6Y/Grm98ESt6ceOkWiHWyZRDV3J1RID4w+6NWK9yA=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "17c9d6cdfc60c64f4ee8d306f9bc0b4ccb51481e", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, "flake-utils": { "inputs": { "systems": "systems" @@ -106,6 +234,25 @@ } }, "git-hooks": { + "inputs": { + "flake-compat": "flake-compat_2", + "nixpkgs": "nixpkgs" + }, + "locked": { + "lastModified": 1783008725, + "narHash": "sha256-jGiy6+sxjNWXSjp25uoJuNfyH9zBK1PEDY0lVoL4ibQ=", + "owner": "cachix", + "repo": "git-hooks.nix", + "rev": "bca82caa46d5ec0f5d422c61fb1e30bc51313cbe", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "git-hooks.nix", + "type": "github" + } + }, + "git-hooks_2": { "inputs": { "flake-compat": [ "nix-gaming", @@ -153,7 +300,7 @@ }, "i915-sriov-dkms": { "inputs": { - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs_5" }, "locked": { "lastModified": 1778038228, @@ -172,7 +319,7 @@ "lazyvim": { "inputs": { "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs_6" }, "locked": { "lastModified": 1780594829, @@ -228,10 +375,10 @@ }, "nix-gaming": { "inputs": { - "flake-compat": "flake-compat", - "flake-parts": "flake-parts", - "git-hooks": "git-hooks", - "nixpkgs": "nixpkgs_4" + "flake-compat": "flake-compat_3", + "flake-parts": "flake-parts_2", + "git-hooks": "git-hooks_2", + "nixpkgs": "nixpkgs_7" }, "locked": { "lastModified": 1784431599, @@ -249,16 +396,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1776548001, - "narHash": "sha256-ZSK0NL4a1BwVbbTBoSnWgbJy9HeZFXLYQizjb2DPF24=", + "lastModified": 1782918843, + "narHash": "sha256-ETYnV9U7Sr+A45dohzZdfCZKOss4qrTkO+wgNZNvEc0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b12141ef619e0a9c1c84dc8c684040326f27cdcc", + "rev": "e8273b29fe1390ec8d4603f2477357555291432e", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } @@ -278,6 +425,21 @@ "type": "github" } }, + "nixpkgs-lib_2": { + "locked": { + "lastModified": 1782614948, + "narHash": "sha256-ePjCwr1sNm9NYUqywL7QfK3JnlS015msC+eBu2zKlp8=", + "owner": "nix-community", + "repo": "nixpkgs.lib", + "rev": "db3f255737b94216eb71cce308e2912cf6bc2d7c", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixpkgs.lib", + "type": "github" + } + }, "nixpkgs-unstable": { "locked": { "lastModified": 1784497964, @@ -294,14 +456,30 @@ "type": "github" } }, + "nixpkgs-wine": { + "locked": { + "lastModified": 1735834308, + "narHash": "sha256-dklw3AXr3OGO4/XT1Tu3Xz9n/we8GctZZ75ZWVqAVhk=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "6df24922a1400241dae323af55f30e4318a6ca65", + "type": "github" + }, + "original": { + "owner": "nixos", + "repo": "nixpkgs", + "rev": "6df24922a1400241dae323af55f30e4318a6ca65", + "type": "github" + } + }, "nixpkgs-xr": { "inputs": { - "flake-compat": "flake-compat_2", + "flake-compat": "flake-compat_4", "flake-utils": "flake-utils_2", - "nixpkgs": "nixpkgs_6", + "nixpkgs": "nixpkgs_9", "nvfetcher": "nvfetcher", "systems": "systems_2", - "treefmt-nix": "treefmt-nix" + "treefmt-nix": "treefmt-nix_2" }, "locked": { "lastModified": 1784428803, @@ -317,7 +495,71 @@ "type": "github" } }, + "nixpkgs_10": { + "locked": { + "lastModified": 1784497964, + "narHash": "sha256-vlHUuqAcbcH2RKmHbPiuQzbv1pnzzavXnI62RD0bqCU=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "241313f4e8e508cb9b13278c2b0fa25b9ca27163", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs_2": { + "locked": { + "lastModified": 1784120854, + "narHash": "sha256-KesHgItiZPgGX740axSiQLcIQ8D24MDqNpkKYWIek8k=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "753cc8a3a87467296ddd1fa93f0cc3e81120ee46", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { + "locked": { + "lastModified": 1770107345, + "narHash": "sha256-tbS0Ebx2PiA1FRW8mt8oejR0qMXmziJmPaU1d4kYY9g=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "4533d9293756b63904b7238acb84ac8fe4c8c2c4", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_4": { + "locked": { + "lastModified": 1776548001, + "narHash": "sha256-ZSK0NL4a1BwVbbTBoSnWgbJy9HeZFXLYQizjb2DPF24=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "b12141ef619e0a9c1c84dc8c684040326f27cdcc", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_5": { "locked": { "lastModified": 1760038930, "narHash": "sha256-Oncbh0UmHjSlxO7ErQDM3KM0A5/Znfofj2BSzlHLeVw=", @@ -333,7 +575,7 @@ "type": "github" } }, - "nixpkgs_3": { + "nixpkgs_6": { "locked": { "lastModified": 1752480373, "narHash": "sha256-JHQbm+OcGp32wAsXTE/FLYGNpb+4GLi5oTvCxwSoBOA=", @@ -349,7 +591,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_7": { "locked": { "lastModified": 1784364478, "narHash": "sha256-CdItYNdYUlm7NxqMVyQKqT2IxTwvapiPuRLWOyHTrbY=", @@ -365,7 +607,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_8": { "locked": { "lastModified": 1784432872, "narHash": "sha256-n3gKTBIV4ZA5VQpUakffBe3KGu4+mhPoA34rrqS0GkA=", @@ -381,7 +623,7 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_9": { "locked": { "lastModified": 1784356753, "narHash": "sha256-12KrbMiWLcf8m7pCvAtZh1ZrgF85ZXDXvfR/fWTKy84=", @@ -397,22 +639,6 @@ "type": "github" } }, - "nixpkgs_7": { - "locked": { - "lastModified": 1784497964, - "narHash": "sha256-vlHUuqAcbcH2RKmHbPiuQzbv1pnzzavXnI62RD0bqCU=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "241313f4e8e508cb9b13278c2b0fa25b9ca27163", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nvfetcher": { "inputs": { "flake-compat": [ @@ -443,8 +669,42 @@ "type": "github" } }, + "on-linux": { + "flake": false, + "locked": { + "lastModified": 1783797218, + "narHash": "sha256-oNQ6gvcibxa7OKPSeAtd+I7BsVLrJbEr7l8DqvZu3pU=", + "owner": "seapear", + "repo": "AffinityOnLinux", + "rev": "794bb88175f9d43b23f1e023cf0f0bc534639e21", + "type": "github" + }, + "original": { + "owner": "seapear", + "repo": "AffinityOnLinux", + "type": "github" + } + }, + "plugin-loader-src": { + "flake": false, + "locked": { + "lastModified": 1776972538, + "narHash": "sha256-2EvrOYQCB2Z2YXhcPnjR67KoOCvwTVW3TfLcmU3//ak=", + "owner": "noahc3", + "repo": "AffinityPluginLoader", + "rev": "1d7956d5b791bd6a213e8b28c1e25e1f4bcc6166", + "type": "github" + }, + "original": { + "owner": "noahc3", + "repo": "AffinityPluginLoader", + "rev": "1d7956d5b791bd6a213e8b28c1e25e1f4bcc6166", + "type": "github" + } + }, "root": { "inputs": { + "affinity-nix": "affinity-nix", "appimage-manager": "appimage-manager", "home-manager": "home-manager", "i915-sriov-dkms": "i915-sriov-dkms", @@ -452,15 +712,32 @@ "nix-darwin": "nix-darwin", "nix-flatpak": "nix-flatpak", "nix-gaming": "nix-gaming", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_8", "nixpkgs-unstable": "nixpkgs-unstable", "nixpkgs-xr": "nixpkgs-xr", "scopebuddy": "scopebuddy" } }, + "rust-analyzer-src": { + "flake": false, + "locked": { + "lastModified": 1782864348, + "narHash": "sha256-NVYhLbaefeIUftPlo3kS6qr0xd8eFJRodEiaHrvFKR4=", + "owner": "rust-lang", + "repo": "rust-analyzer", + "rev": "0d381ca097a8e0375a19387874d952c0a230ac4f", + "type": "github" + }, + "original": { + "owner": "rust-lang", + "ref": "nightly", + "repo": "rust-analyzer", + "type": "github" + } + }, "scopebuddy": { "inputs": { - "nixpkgs": "nixpkgs_7" + "nixpkgs": "nixpkgs_10" }, "locked": { "lastModified": 1772751261, @@ -507,6 +784,24 @@ } }, "treefmt-nix": { + "inputs": { + "nixpkgs": "nixpkgs_3" + }, + "locked": { + "lastModified": 1780220602, + "narHash": "sha256-eynAfOmbmxJnkp7YewvCEbShNnnYJ9gLLqkzsYtBPeM=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "db947814a175b7ca6ded66e21383d938df01c227", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } + }, + "treefmt-nix_2": { "inputs": { "nixpkgs": [ "nixpkgs-xr", diff --git a/flake.nix b/flake.nix index ce5d98f..acaedf4 100644 --- a/flake.nix +++ b/flake.nix @@ -20,6 +20,8 @@ lazyvim.url = "github:pfassina/lazyvim-nix/v16.0.0"; + affinity-nix.url = "github:mrshmllow/affinity-nix"; + scopebuddy.url = "github:HikariKnight/ScopeBuddy"; nix-gaming.url = "github:fufexan/nix-gaming"; nixpkgs-xr.url = "github:nix-community/nixpkgs-xr"; @@ -33,6 +35,7 @@ home-manager, nix-darwin, nix-flatpak, + affinity-nix, i915-sriov-dkms, ... }: diff --git a/hosts/shared/nixos.nix b/hosts/shared/nixos.nix index 03fbfc3..2ddf215 100644 --- a/hosts/shared/nixos.nix +++ b/hosts/shared/nixos.nix @@ -242,7 +242,12 @@ in ]; }; - nixpkgs.config.allowUnfree = true; + nixpkgs = { + config.allowUnfree = true; + overlays = [ + inputs.affinity-nix.overlays.default + ]; + }; nix = { gc = { @@ -280,6 +285,7 @@ in devenv nerd-fonts.hack jump + affinity-v3 unstable.winetricks unstable.fastfetch