diff --git a/flake.lock b/flake.lock index eeb81cc..1eccf3d 100644 --- a/flake.lock +++ b/flake.lock @@ -101,18 +101,38 @@ } }, "dzgui": { + "inputs": { + "dzgui": "dzgui_2", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1674412112, + "narHash": "sha256-8Dk2kSONepRfL4hWsBVShsOIwXyS4yh/frjIDrJx4C4=", + "owner": "lelgenio", + "repo": "dzgui-nix", + "rev": "041210735c3c06b428c78ea09ddf2cbb8b41f708", + "type": "github" + }, + "original": { + "owner": "lelgenio", + "repo": "dzgui-nix", + "type": "github" + } + }, + "dzgui_2": { "flake": false, "locked": { - "lastModified": 1674502539, - "narHash": "sha256-B7HwDq2o7GCsDcp3enbV3Xa3OQsd4gbUU9D7x7CRwX8=", + "lastModified": 1674502482, + "narHash": "sha256-X3Sze8Quexy2vp3A78+1buvsAwAGQR71aLAXNCHdka0=", "owner": "aclist", "repo": "dztui", - "rev": "82c6dbdfef223653f81136276f51ffa5222e8403", + "rev": "e76070818c434f43ee4dd4305069c29235a390f4", "type": "github" }, "original": { "owner": "aclist", - "ref": "dzgui", "repo": "dztui", "type": "github" } diff --git a/flake.nix b/flake.nix index 07b3974..52df737 100644 --- a/flake.nix +++ b/flake.nix @@ -49,8 +49,8 @@ devenv.url = "github:cachix/devenv/v0.5"; devenv.inputs.nixpkgs.follows = "nixpkgs-unstable"; - dzgui.url = "github:aclist/dztui/dzgui"; - dzgui.flake = false; + dzgui.url = "github:lelgenio/dzgui-nix"; + dzgui.inputs.nixpkgs.follows = "nixpkgs"; # my stuff dhist = { diff --git a/overlays/default.nix b/overlays/default.nix index 9465846..9d626ad 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -41,6 +41,7 @@ new-packages = (final: prev: packages // { dhist = inputs.dhist.packages.${system}.dhist; demoji = inputs.demoji.packages.${system}.demoji; + dzgui = inputs.dzgui.packages.${system}.dzgui; devenv = inputs.devenv.packages.${system}.devenv; mpvpaper = inputs.wegank.packages.${prev.system}.mpvpaper; diff --git a/pkgs/default.nix b/pkgs/default.nix index 534ae2a..f20d726 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -2,7 +2,6 @@ # You can build them using 'nix build .#example' or (legacy) 'nix-build -A example' { pkgs, inputs }: { - dzgui = pkgs.callPackage ./dzgui.nix { }; plymouth-theme-red = pkgs.callPackage ./plymouth-theme-red.nix { inherit inputs; }; cargo-checkmate = pkgs.callPackage ./cargo-checkmate.nix { }; } diff --git a/pkgs/dzgui.nix b/pkgs/dzgui.nix deleted file mode 100644 index 67d8b26..0000000 --- a/pkgs/dzgui.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ pkgs, lib, stdenv, fetchFromGitHub, makeWrapper }: -stdenv.mkDerivation rec { - pname = "dzgui"; - version = "0.1"; - - src = fetchFromGitHub { - owner = "aclist"; - repo = "dztui"; - rev = "10c29c0542a07fb81b5922f96b416e3a2e8079cc"; - sha256 = "sha256-VmW0ohXK+9CAr4yGaA/NSW7+E1vUvZthom8MculmOEs="; - }; - - nativeBuildInputs = [ makeWrapper ]; - - runtimeDeps = with pkgs; [ - curl - jq - python3 - steam - wmctrl - gnome.zenity - ]; - - patchPhase = '' - sed -i \ - -e 's|/usr/bin/zenity|${pkgs.gnome.zenity}/bin/zenity|' \ - -e 's|2>/dev/null||' \ - dzgui.sh - ''; - - installPhase = '' - install -Dm777 -T dzgui.sh $out/bin/.dzgui-unwrapped_ - makeWrapper $out/bin/.dzgui-unwrapped_ $out/bin/dzgui \ - --prefix PATH ':' ${lib.makeBinPath runtimeDeps} - ''; - - meta = with lib; { - homepage = "https://github.com/pronovic/banner"; - description = "DayZ TUI/GUI server browser"; - license = licenses.gpl3; - - longDescription = '' - DZGUI allows you to connect to both official and modded/community DayZ - servers on Linux and provides a graphical interface for doing so. - ''; - - platforms = platforms.all; - }; -} diff --git a/user/home.nix b/user/home.nix index a6829f9..176111e 100644 --- a/user/home.nix +++ b/user/home.nix @@ -75,10 +75,10 @@ ## games # lutris-unwrapped - steam # It's enabled in the system config + # steam # It's enabled in the system config gamescope protontricks - (dzgui.overrideAttrs (_: { src = inputs.dzgui; })) + dzgui ## chat thunderbird