diff --git a/flake.lock b/flake.lock index c598963..b61320a 100644 --- a/flake.lock +++ b/flake.lock @@ -4,27 +4,29 @@ "inputs": { "corefonts": "corefonts", "crane": "crane", + "elemental-wine-source": "elemental-wine-source", + "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", - "windows-rs": "windows-rs", - "wintypes_shim": "wintypes_shim" + "plugin-loader-v030-src": "plugin-loader-v030-src", + "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1791516752, - "narHash": "sha256-hb1mfDpFUWCTWfGx7rDoFH8B+zItlPbW6jinXRpJnFw=", - "owner": "mrshmllow", - "repo": "affinity-nix", - "rev": "47d5b16c3e2e2412c0d5df9963c02d0e8c5e97d6", + "lastModified": 1791817262, + "narHash": "sha256-emQQYtsQu2xpHKwDnyCu3ZiNRhJeQ/QqHeFV5wAixlg=", + "owner": "Meo98", + "repo": "affinity-nix-fork", + "rev": "266d3ebf76da365f6431bddc493338d1978bb340", "type": "github" }, "original": { - "owner": "mrshmllow", - "repo": "affinity-nix", + "owner": "Meo98", + "repo": "affinity-nix-fork", "type": "github" } }, @@ -122,11 +124,11 @@ }, "crane": { "locked": { - "lastModified": 1790899423, - "narHash": "sha256-THGtz65UGJU+sonZidRboyCMk+9DclpMF7pwL4uDV4M=", + "lastModified": 1778106249, + "narHash": "sha256-cM/AuKy5tMhwOOQIbha8ZRRMHVfNf7cv2aljIw+qoCg=", "owner": "ipetkov", "repo": "crane", - "rev": "47b6b27ed9a3a9181415e4367d0c30ab2a0e0250", + "rev": "6d015ea29630b7ad2402841386da2cb617a470a7", "type": "github" }, "original": { @@ -135,6 +137,47 @@ "type": "github" } }, + "elemental-wine-source": { + "flake": false, + "locked": { + "host": "gitlab.winehq.org", + "lastModified": 1722747031, + "narHash": "sha256-XVhz9p2kgFBoJ376vg8OaFXxcMEjAe9AK1hk0I1rb1Q=", + "owner": "ElementalWarrior", + "repo": "wine", + "rev": "a7c9b19e1a26cf49c63a7c19189a3e2bbe2c6ac2", + "type": "gitlab" + }, + "original": { + "host": "gitlab.winehq.org", + "owner": "ElementalWarrior", + "ref": "affinity-photo3-wine9.13-part3", + "repo": "wine", + "type": "gitlab" + } + }, + "fenix": { + "inputs": { + "nixpkgs": [ + "affinity-nix", + "nixpkgs" + ], + "rust-analyzer-src": "rust-analyzer-src" + }, + "locked": { + "lastModified": 1777969788, + "narHash": "sha256-8sr3w0KyQ0K7TEd8pYwYrxiDk0GZ4A7iIcl1lsxlzVM=", + "owner": "nix-community", + "repo": "fenix", + "rev": "3abc2d5559f4dc30c710ab152abcb4cb60b561ba", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "fenix", + "type": "github" + } + }, "flake-compat": { "locked": { "lastModified": 1751685974, @@ -215,11 +258,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1790898470, - "narHash": "sha256-zTwuwezD0w3hpga6a6P8emidzAZFyWqlNeRBlpWOOl8=", + "lastModified": 1777988971, + "narHash": "sha256-qIoWPDs+0/8JecyYgE3gpKQxW/4bLW/gp45vow9ioCQ=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "024633cd702b10285db5cb19b40ad48d2399ba60", + "rev": "0678d8986be1661af6bb555f3489f2fdfc31f6ff", "type": "github" }, "original": { @@ -346,14 +389,15 @@ "git-hooks": { "inputs": { "flake-compat": "flake-compat_2", + "gitignore": "gitignore", "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1790500375, - "narHash": "sha256-XN3sDtn8TU9hAc9xqZ+SqRB/HHm2wjxM6aSWYLJU+oo=", + "lastModified": 1776796298, + "narHash": "sha256-PcRvlWayisPSjd0UcRQbhG8Oqw78AcPE6x872cPRHN8=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "a0e4241b51206fbcbf52fd322eb5f0cd80f153c4", + "rev": "3cfd774b0a530725a077e17354fbdb87ea1c4aad", "type": "github" }, "original": { @@ -387,6 +431,28 @@ "type": "github" } }, + "gitignore": { + "inputs": { + "nixpkgs": [ + "affinity-nix", + "git-hooks", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1709087332, + "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", + "owner": "hercules-ci", + "repo": "gitignore.nix", + "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "gitignore.nix", + "type": "github" + } + }, "gloomberb": { "inputs": { "bun2nix": "bun2nix", @@ -562,11 +628,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1787631388, - "narHash": "sha256-vMiXptXarfSdJb1Gkc+FYVOAibuBRj7qxGa8z68q1Uw=", + "lastModified": 1770073757, + "narHash": "sha256-Vy+G+F+3E/Tl+GMNgiHl9Pah2DgShmIUBJXmbiQPHbI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ac6b2166e7a9375683b8e98f860f273222337b16", + "rev": "47472570b1e607482890801aeaf29bfb749884f6", "type": "github" }, "original": { @@ -626,11 +692,11 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1790477367, - "narHash": "sha256-oujbxmVKDhci2E4EM3KyAbRUgp5/IsCoiA/LfEF7OOk=", + "lastModified": 1777168982, + "narHash": "sha256-GOkGPcboWE9BmGCRMLX3worL4EMnsnG8MyKmXNeYuhQ=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "f7cd230690d9fc982d06129f9189b101fddcfa3b", + "rev": "f5901329dade4a6ea039af1433fb087bd9c1fe14", "type": "github" }, "original": { @@ -685,6 +751,22 @@ "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_5", @@ -806,11 +888,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1791048980, - "narHash": "sha256-KgItSKML8Xvte0B7/uGnBDsYzSnnKHcOaiUbgWBXLXw=", + "lastModified": 1777954456, + "narHash": "sha256-hGdgeU2Nk87RAuZyYjyDjFL6LK7dAZN5RE9+hrDTkDU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a7868a727837f3c09cee2ce0ca671c76b1589fed", + "rev": "549bd84d6279f9852cae6225e372cc67fb91a4c1", "type": "github" }, "original": { @@ -962,11 +1044,11 @@ "on-linux": { "flake": false, "locked": { - "lastModified": 1787435510, - "narHash": "sha256-ENn1Xh+JR+6ITt3oe4DC0EiTT2b6PErPQTFPkYQRJBA=", + "lastModified": 1772699425, + "narHash": "sha256-xhqkN2I5r+Ty2k8HEsLg5e8Eaazb0Qyioqjs87BQOnY=", "owner": "seapear", "repo": "AffinityOnLinux", - "rev": "4dd5635eab8502bd4653e2e478478af04ff84449", + "rev": "a0c4421946709c24c3f371fcbf15a45b814f188c", "type": "github" }, "original": { @@ -1012,6 +1094,23 @@ "type": "github" } }, + "plugin-loader-v030-src": { + "flake": false, + "locked": { + "lastModified": 1775508798, + "narHash": "sha256-cD2G3M83wCEXVMMl9YoHMLxPIvbXeESgQTkXiM+lzns=", + "owner": "noahc3", + "repo": "AffinityPluginLoader", + "rev": "bd93bbf9f84735d8ba6538596620bbe8d8b90efd", + "type": "github" + }, + "original": { + "owner": "noahc3", + "ref": "v0.3.0", + "repo": "AffinityPluginLoader", + "type": "github" + } + }, "root": { "inputs": { "affinity-nix": "affinity-nix", @@ -1035,6 +1134,23 @@ "xivlauncher-rb": "xivlauncher-rb" } }, + "rust-analyzer-src": { + "flake": false, + "locked": { + "lastModified": 1777924689, + "narHash": "sha256-9Z0puLyCSYvtYhP1IZMxC05DSgwA+5rE99jsv1KErc4=", + "owner": "rust-lang", + "repo": "rust-analyzer", + "rev": "91c7c2c4ca6a0520cfbf97e369e4fb7bf0b63b7a", + "type": "github" + }, + "original": { + "owner": "rust-lang", + "ref": "nightly", + "repo": "rust-analyzer", + "type": "github" + } + }, "scopebuddy": { "inputs": { "nixpkgs": "nixpkgs_14" @@ -1118,11 +1234,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1791110613, - "narHash": "sha256-O5XhWb2cQqo+OG0fpDhK/RfsPUetdw24aop/22e74tE=", + "lastModified": 1775636079, + "narHash": "sha256-pc20NRoMdiar8oPQceQT47UUZMBTiMdUuWrYu2obUP0=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "930ae5bbd97d4fc4c33c588bfd417c882d353e71", + "rev": "790751ff7fd3801feeaf96d7dc416a8d581265ba", "type": "github" }, "original": { @@ -1174,39 +1290,6 @@ "type": "github" } }, - "windows-rs": { - "flake": false, - "locked": { - "lastModified": 1771531570, - "narHash": "sha256-UmhpbCd3+0We7JiXFXgcS8jWMnZI2NRqPOs+UOsjrUc=", - "owner": "microsoft", - "repo": "windows-rs", - "rev": "628f84c51645217c7a06a20774ea1275dc7270ca", - "type": "github" - }, - "original": { - "owner": "microsoft", - "repo": "windows-rs", - "rev": "628f84c51645217c7a06a20774ea1275dc7270ca", - "type": "github" - } - }, - "wintypes_shim": { - "flake": false, - "locked": { - "lastModified": 1750396180, - "narHash": "sha256-E3go8SmUkAWrxQnr852WQB0huzdkO7CWiuB8Q2QyMZ4=", - "owner": "ElementalWarrior", - "repo": "wine-wintypes.dll-for-affinity", - "rev": "f8a2d42ba3abc5dcdc584daa6728a2fa019be72e", - "type": "github" - }, - "original": { - "owner": "ElementalWarrior", - "repo": "wine-wintypes.dll-for-affinity", - "type": "github" - } - }, "xivlauncher-core-src": { "flake": false, "locked": { diff --git a/flake.nix b/flake.nix index 0ab02ec..0514ae5 100644 --- a/flake.nix +++ b/flake.nix @@ -11,7 +11,7 @@ nixpkgs-xr.url = "github:nix-community/nixpkgs-xr"; nix-cachyos-kernel.url = "github:xddxdd/nix-cachyos-kernel"; lazyvim.url = "github:pfassina/lazyvim-nix/v16.0.0"; - affinity-nix.url = "github:mrshmllow/affinity-nix"; + affinity-nix.url = "github:Meo98/affinity-nix-fork"; nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=v0.7.0"; appimage-manager.url = "github:kem-a/AppManager"; pi.url = "github:earendil-works/pi/stable"; diff --git a/hosts/shared/nixos-pc.nix b/hosts/shared/nixos-pc.nix index d80d4cb..dac28f3 100644 --- a/hosts/shared/nixos-pc.nix +++ b/hosts/shared/nixos-pc.nix @@ -361,6 +361,11 @@ in nixpkgs = { config.allowUnfree = true; overlays = [ + (final: prev: { + msitools = prev.msitools.overrideAttrs (old: { + doCheck = false; + }); + }) inputs.affinity-nix.overlays.default inputs.nix-cachyos-kernel.overlays.default ]; @@ -412,6 +417,7 @@ in hunspell hunspellDicts.en_US hyphenDicts.en_US + affinity-v3 unstable.libreoffice-qt unstable.qimgv