From c0b9b51f5632969cdeb7011c92531d698f66b3f9 Mon Sep 17 00:00:00 2001 From: Asaki Yuki Date: Wed, 15 Apr 2026 13:26:06 +0700 Subject: [PATCH] add winegdk and install cage-xtmapper --- flake.lock | 88 +++++++++++++++++++++++++++- flake.nix | 1 + host/desktop/programs.nix | 1 + modules/features/home/packages.nix | 1 + modules/features/system/packages.nix | 5 +- options/home/programs.nix | 4 ++ options/system/programs.nix | 1 + packages/default.nix | 1 - packages/winegdk.nix | 14 ----- 9 files changed, 98 insertions(+), 18 deletions(-) delete mode 100644 packages/winegdk.nix diff --git a/flake.lock b/flake.lock index b48638d..b81af82 100644 --- a/flake.lock +++ b/flake.lock @@ -107,6 +107,24 @@ "type": "github" } }, + "flake-utils_3": { + "inputs": { + "systems": "systems_4" + }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -449,6 +467,22 @@ "type": "github" } }, + "nixpkgs_7": { + "locked": { + "lastModified": 1762361079, + "narHash": "sha256-lz718rr1BDpZBYk7+G8cE6wee3PiBUpn8aomG/vLLiY=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "ffcdcf99d65c61956d882df249a9be53e5902ea5", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixvim": { "inputs": { "flake-parts": "flake-parts_2", @@ -508,7 +542,8 @@ "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs_6", "nixvim": "nixvim", - "unstablepkgs": "unstablepkgs" + "unstablepkgs": "unstablepkgs", + "winegdk": "winegdk" } }, "systems": { @@ -556,6 +591,21 @@ "type": "github" } }, + "systems_4": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "unstablepkgs": { "locked": { "lastModified": 1775710090, @@ -572,6 +622,42 @@ "type": "github" } }, + "winegdk": { + "inputs": { + "flake-utils": "flake-utils_3", + "nixpkgs": "nixpkgs_7", + "winegdk": "winegdk_2" + }, + "locked": { + "lastModified": 1762497139, + "narHash": "sha256-9QE4BJNtz0UgB5mWf+EgGZW9hrVdJyta/KlQJwh8IsQ=", + "owner": "fmbearmf", + "repo": "winegdk-nix", + "rev": "91356fdc0d1c004b8f57b79ddb5e771845dfe2c1", + "type": "github" + }, + "original": { + "owner": "fmbearmf", + "repo": "winegdk-nix", + "type": "github" + } + }, + "winegdk_2": { + "flake": false, + "locked": { + "lastModified": 1762457615, + "narHash": "sha256-Ja32uLvxCi1weDop+HCrSAagkMaNbSjoW1C720/D3cw=", + "owner": "Weather-OS", + "repo": "WineGDK", + "rev": "a82854dfa4b54ab935bc3ca69d4bd885c4a63186", + "type": "github" + }, + "original": { + "owner": "Weather-OS", + "repo": "WineGDK", + "type": "github" + } + }, "xwayland-satellite-stable": { "flake": false, "locked": { diff --git a/flake.nix b/flake.nix index cff00bd..5192817 100644 --- a/flake.nix +++ b/flake.nix @@ -10,6 +10,7 @@ niri.url = "github:sodiboo/niri-flake"; nixcord.url = "github:FlameFlag/nixcord"; dolphin-overlay.url = "github:rumboon/dolphin-overlay"; + winegdk.url = "github:fmbearmf/winegdk-nix"; honkai-railway-grub-theme.url = "github:voidlhf/StarRailGrubThemes/4a84e576bb544afbdfc76dbe40ffc50a5c2b16de"; diff --git a/host/desktop/programs.nix b/host/desktop/programs.nix index a3a137a..d42b1d4 100644 --- a/host/desktop/programs.nix +++ b/host/desktop/programs.nix @@ -40,5 +40,6 @@ firefox.enable = true; chromium.enable = true; gcc.enable = true; + davinci-resolve.enable = true; }; } diff --git a/modules/features/home/packages.nix b/modules/features/home/packages.nix index 22a02f0..0d1f9b8 100644 --- a/modules/features/home/packages.nix +++ b/modules/features/home/packages.nix @@ -17,6 +17,7 @@ (lib.mkIf config.programs.lmstudio.enable config.programs.lmstudio.package) (lib.mkIf config.programs.blender.enable config.programs.blender.package) (lib.mkIf config.programs.xprop.enable config.programs.xprop.package) + (lib.mkIf config.programs.davinci-resolve.enable config.programs.davinci-resolve.package) (lib.mkIf config.programs.pavucontrol.enable config.programs.pavucontrol.package) (lib.mkIf config.programs.nwg-look.enable config.programs.nwg-look.package) diff --git a/modules/features/system/packages.nix b/modules/features/system/packages.nix index 6e2325e..ff00fc8 100644 --- a/modules/features/system/packages.nix +++ b/modules/features/system/packages.nix @@ -2,7 +2,7 @@ pkgs, lib, config, - libs, + custom, ... }: { environment.systemPackages = with pkgs; @@ -19,7 +19,8 @@ zip unzip - (libs.root "/packages/winegdk.nix") + (pkgs.callPackage (custom.cage-xtmapper {}) {}) + (lib.mkIf config.programs.ffmpeg.enable config.programs.ffmpeg.package) (lib.mkIf config.programs.nodejs.enable config.programs.nodejs.package) (lib.mkIf config.programs.bun.enable config.programs.bun.package) diff --git a/options/home/programs.nix b/options/home/programs.nix index 9921bd2..f726552 100644 --- a/options/home/programs.nix +++ b/options/home/programs.nix @@ -93,6 +93,10 @@ ]; }; }; + davinci-resolve = { + enable = lib.mkEnableOption "davinci-resolve"; + package = lib.mkPackageOption pkgs "davinci-resolve" {}; + }; hytale = { enable = lib.mkEnableOption "hytale-launcher"; package = lib.mkOption { diff --git a/options/system/programs.nix b/options/system/programs.nix index 6e10dff..a3e2280 100644 --- a/options/system/programs.nix +++ b/options/system/programs.nix @@ -1,4 +1,5 @@ { + inputs, lib, pkgs, ... diff --git a/packages/default.nix b/packages/default.nix index ff68c0a..fb7a1ff 100644 --- a/packages/default.nix +++ b/packages/default.nix @@ -9,5 +9,4 @@ cursors = name; size = size; }); - winegdk = import ./winegdk.nix; } diff --git a/packages/winegdk.nix b/packages/winegdk.nix deleted file mode 100644 index 1b6e579..0000000 --- a/packages/winegdk.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ - stdenv, - fetchFromGitHub, -}: -stdenv.mkDerivation { - pname = "winegdk"; - version = "1.0.0"; - src = fetchFromGitHub { - owner = "Weather-OS"; - repo = "winegdk"; - rev = "5cffa07a43a61a2fd1695d714b85b5b44852d55b"; - sha256 = "000000000000000000000000000000000000000000000000000"; - }; -}