diff --git a/flake.lock b/flake.lock index 22c3237..d4a20cf 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,27 @@ { "nodes": { + "affinity-nix": { + "inputs": { + "elemental-wine-source": "elemental-wine-source", + "nixpkgs": [ + "nixpkgs" + ], + "winetricks-source": "winetricks-source" + }, + "locked": { + "lastModified": 1734240734, + "narHash": "sha256-N3Gi1jPDc0In2ou0DzBVrUjLuM1uGMYb6H+r2rEThyc=", + "owner": "mrshmllow", + "repo": "affinity-nix", + "rev": "466ea18e50a4d3aa77f7365c3ec86733d3e43732", + "type": "github" + }, + "original": { + "owner": "mrshmllow", + "repo": "affinity-nix", + "type": "github" + } + }, "audio": { "inputs": { "nix-buildproxy": "nix-buildproxy", @@ -21,6 +43,25 @@ "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" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -206,6 +247,7 @@ }, "root": { "inputs": { + "affinity-nix": "affinity-nix", "audio": "audio", "home-manager": "home-manager", "kmonad": "kmonad", @@ -216,6 +258,23 @@ "nixpkgs": "nixpkgs_2", "nixpkgs-unstable": "nixpkgs-unstable" } + }, + "winetricks-source": { + "flake": false, + "locked": { + "lastModified": 1704453875, + "narHash": "sha256-YTEgb19aoM54KK8/IjrspoChzVnWAEItDlTxpfpS52w=", + "owner": "winetricks", + "repo": "winetricks", + "rev": "bc91718a5cad45e9f33de9b351a5960d5395bed5", + "type": "github" + }, + "original": { + "owner": "winetricks", + "ref": "20240105", + "repo": "winetricks", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index c762400..c428512 100644 --- a/flake.nix +++ b/flake.nix @@ -32,9 +32,12 @@ nix-ld.url = "github:Mic92/nix-ld"; nix-ld.inputs.nixpkgs.follows = "nixpkgs"; + + affinity-nix.url = "github:mrshmllow/affinity-nix"; + affinity-nix.inputs.nixpkgs.follows = "nixpkgs"; }; - outputs = {nixpkgs, nixpkgs-unstable, home-manager, audio, nix-flatpak, kmonad, musnix, nix-ld, self, ... } @ inputs: { + outputs = {nixpkgs, nixpkgs-unstable, home-manager, audio, affinity-nix, nix-flatpak, kmonad, musnix, nix-ld, self, ... } @ inputs: { # packages = nixpkgs.legacyPackages.x86_64-linux; diff --git a/home/home.nix b/home/home.nix index 116f4ea..13ef7e4 100644 --- a/home/home.nix +++ b/home/home.nix @@ -60,8 +60,6 @@ binutils libgcc cmake - raylib - raygui libuv.dev SDL2.dev protonplus @@ -87,7 +85,6 @@ python311Packages.babel python311Packages.requests ruff - renderdoc sbcl ccl racket @@ -117,7 +114,6 @@ nodejs_18 platformio-core icloudpd - libheif libheif.out openal pkg-config @@ -163,7 +159,6 @@ bitwarden-desktop tailscale font-manager - vice gpu-viewer mesa-demos @@ -309,7 +304,7 @@ cardinal roomeqwizard guitarix - # paulxstretch + paulxstretch vital (callPackage ../packages/tal/bassline.nix {}) (callPackage ../packages/tal/j8.nix {})