From cfb5abdb8f07f19ade88587fbd8a1de6141e38dd Mon Sep 17 00:00:00 2001 From: Daniel Bulant Date: Sat, 6 Jun 2026 17:36:20 +0200 Subject: [PATCH] deadlock mod manager --- flake.lock | 84 ++++++++++++++++++++++++++++++++++++++-- flake.nix | 12 ++---- servers/ui-mode/home.nix | 19 +++++++++ 3 files changed, 104 insertions(+), 11 deletions(-) diff --git a/flake.lock b/flake.lock index 4f6f1e2..ceaf78d 100644 --- a/flake.lock +++ b/flake.lock @@ -250,6 +250,29 @@ "url": "https://install.determinate.systems/determinate-nixd/tag/v3.21.0/x86_64-linux" } }, + "dmm": { + "inputs": { + "flake-utils": "flake-utils_4", + "nixpkgs": [ + "nixpkgs" + ], + "rust-overlay": "rust-overlay" + }, + "locked": { + "lastModified": 1779928484, + "narHash": "sha256-tSOSjapAlAd63Xkc+MNFVKn1k4+AtW3w3GhicRTV9Pg=", + "owner": "deadlock-mod-manager", + "repo": "deadlock-mod-manager", + "rev": "077a096bffa5ba29cbb3a3e62a9a7b0b0215119c", + "type": "github" + }, + "original": { + "owner": "deadlock-mod-manager", + "ref": "v1.0.0", + "repo": "deadlock-mod-manager", + "type": "github" + } + }, "dms": { "inputs": { "nixpkgs": [ @@ -510,6 +533,24 @@ "type": "github" } }, + "flake-utils_4": { + "inputs": { + "systems": "systems_2" + }, + "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" + } + }, "git-hooks": { "inputs": { "flake-compat": "flake-compat_2", @@ -803,7 +844,7 @@ "hyprwire": "hyprwire", "nixpkgs": "nixpkgs_10", "pre-commit-hooks": "pre-commit-hooks", - "systems": "systems_3", + "systems": "systems_4", "xdph": "xdph" }, "locked": { @@ -1724,6 +1765,7 @@ "copyparty": "copyparty", "danksearch": "danksearch", "determinate": "determinate", + "dmm": "dmm", "dms": "dms", "dolphin-overlay": "dolphin-overlay", "helium": "helium", @@ -1746,7 +1788,7 @@ "inputs": { "crane": "crane_2", "nixpkgs": "nixpkgs_14", - "rust-overlay": "rust-overlay" + "rust-overlay": "rust-overlay_2" }, "locked": { "lastModified": 1780061474, @@ -1780,6 +1822,27 @@ } }, "rust-overlay": { + "inputs": { + "nixpkgs": [ + "dmm", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1771384185, + "narHash": "sha256-KvmjUeA7uODwzbcQoN/B8DCZIbhT/Q/uErF1BBMcYnw=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "23dd7fa91602a68bd04847ac41bc10af1e6e2fd2", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, + "rust-overlay_2": { "inputs": { "nixpkgs": [ "rusic", @@ -1847,6 +1910,21 @@ } }, "systems_3": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_4": { "locked": { "lastModified": 1689347949, "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", @@ -1881,7 +1959,7 @@ }, "utils": { "inputs": { - "systems": "systems_2" + "systems": "systems_3" }, "locked": { "lastModified": 1731533236, diff --git a/flake.nix b/flake.nix index 32987b3..f59fe04 100644 --- a/flake.nix +++ b/flake.nix @@ -4,6 +4,10 @@ url = "github:getpaseo/paseo"; inputs.nixpkgs.follows = "nixpkgs"; }; + dmm = { + url = "github:deadlock-mod-manager/deadlock-mod-manager/v1.0.0"; + inputs.nixpkgs.follows = "nixpkgs"; + }; hypr-kdeconnect-fix.url = "github:danbulant/hypr-kdeconnect-fix"; codexbar = { url = "github:0xferrous/CodexBar-flake"; @@ -70,16 +74,8 @@ nixpkgs, determinate, colmena, - helium, - zen-browser, - dolphin-overlay, - hyprland-plugins, home-manager, - nixpkgs-unstable, - nix-gaming, nix-index-database, - dms, - nix-monitor, hypr-kdeconnect-fix, paseo, ... diff --git a/servers/ui-mode/home.nix b/servers/ui-mode/home.nix index 4ae05a4..5d9efb2 100644 --- a/servers/ui-mode/home.nix +++ b/servers/ui-mode/home.nix @@ -15,6 +15,7 @@ rusic, codexbar, config, + dmm, # paseo, ... }: @@ -48,6 +49,23 @@ let ''; }); + deadlockModManager = dmm.packages.${pkgs.system}.nightly.overrideAttrs (oldAttrs: { + postPatch = (oldAttrs.postPatch or "") + '' + substituteInPlace apps/desktop/src-tauri/Cargo.toml \ + --replace 'tauri-wry = ["tauri/wry"]' 'tauri-wry = ["tauri/wry"] +cef = []' + + substituteInPlace apps/desktop/src-tauri/src/mod_manager/steam_manager.rs \ + --replace ' let steam_dir = steamlocate::SteamDir::from_dir(&path).map_err(|_| {' ' if !path.join("steamapps").join("libraryfolders.vdf").exists() { + return Err(Error::InvalidInput( + "Invalid Steam path: not a valid Steam installation directory".to_string(), + )); + } + + let steam_dir = steamlocate::SteamDir::from_dir(&path).map_err(|_| {' + ''; + }); + # system = stdenv.hostPlatform.system; in { @@ -63,6 +81,7 @@ in stateVersion = "25.11"; packages = with pkgs; [ + deadlockModManager firefox unrar wine