From 495862c29455f026b7dbae605155780d68b8a8fe Mon Sep 17 00:00:00 2001 From: soraefir Date: Fri, 21 Feb 2025 21:47:39 +0100 Subject: [PATCH] Removed umu input --- flake.lock | 89 +++++++++++------------------- flake.nix | 5 -- modules/home/gui/games/default.nix | 2 +- 3 files changed, 33 insertions(+), 63 deletions(-) diff --git a/flake.lock b/flake.lock index 6ef00e3..c5eae4f 100644 --- a/flake.lock +++ b/flake.lock @@ -20,11 +20,11 @@ ] }, "locked": { - "lastModified": 1739103745, - "narHash": "sha256-c53dcRaw0F4Os9WD05HwIRs9kTDZw4Mxe1XK4edEALo=", + "lastModified": 1739298463, + "narHash": "sha256-oAFv9jKwwA7d7384d2LeywDSgwhvb3ZnrwbfoWPhXsI=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "a3dda0d10ce9aa1d1dfb7a6c139ea8c2872c74bd", + "rev": "f239e5aadd6d23c48e085c2de3397e2058e54d16", "type": "github" }, "original": { @@ -78,11 +78,11 @@ ] }, "locked": { - "lastModified": 1739548217, - "narHash": "sha256-rlv64erpr36xdmMDPgf9rhRXBYZ0BZb5nrw2ZPSk1sQ=", + "lastModified": 1739933872, + "narHash": "sha256-UhuvTR4OrWR+WBaRCZm4YMkvjJhZ1KZo/jRjE41m+Ek=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "678b22642abde2ee77ae2218ab41d802f010e5b0", + "rev": "6ab392f626a19f1122d1955c401286e1b7cf6b53", "type": "github" }, "original": { @@ -174,11 +174,11 @@ }, "hardware": { "locked": { - "lastModified": 1738816619, - "narHash": "sha256-5yRlg48XmpcX5b5HesdGMOte+YuCy9rzQkJz+imcu6I=", + "lastModified": 1740089251, + "narHash": "sha256-Y78mDBWoO8CLLTjQfPfII+KXFb6lAmF9GrLbyVBsIMM=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "2eccff41bab80839b1d25b303b53d339fbb07087", + "rev": "18e9f9753e9ae261bcc7d3abe15745686991fd30", "type": "github" }, "original": { @@ -210,11 +210,11 @@ ] }, "locked": { - "lastModified": 1739570999, - "narHash": "sha256-eCc0/Q4bPpe4/AS+uzIrHLJcR6BxPQ69q2kD0/Qe6rU=", + "lastModified": 1739757849, + "narHash": "sha256-Gs076ot1YuAAsYVcyidLKUMIc4ooOaRGO0PqTY7sBzA=", "owner": "nix-community", "repo": "home-manager", - "rev": "254d47082e23dbf72fdeca1da6fe1da420f478d8", + "rev": "9d3d080aec2a35e05a15cedd281c2384767c2cfe", "type": "github" }, "original": { @@ -300,11 +300,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1739579367, - "narHash": "sha256-dA4rz/AbzWGTv6iZ59WImBlhPGoY0/cRmRJHrN/a36w=", + "lastModified": 1740169613, + "narHash": "sha256-3bTa0nEDQTsfi+aDiGHikthn6dMuVOTCtsS0cvDV6Uw=", "ref": "refs/heads/main", - "rev": "2f967037aa00c4aecce62222e5e21c1790148eb0", - "revCount": 5817, + "rev": "f4b148df1e2d8edc96bd878a4cfde32ca6515ac8", + "revCount": 5836, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -449,11 +449,11 @@ ] }, "locked": { - "lastModified": 1739048933, - "narHash": "sha256-ck6MaoYvISBQKqZR+HcxXnx0wOhyCauxfVMaV5zhJxQ=", + "lastModified": 1739891528, + "narHash": "sha256-h8HOCZ/rw2Buzku+GKF77VXxrGjCSOQkLhptiEKMYg0=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "e4e018a2ca6f5a9c33511973454199e1c7c85499", + "rev": "61a5382f4b1ab578064d470b1b3d3f0df396b8ba", "type": "github" }, "original": { @@ -508,11 +508,11 @@ }, "nixUnstable": { "locked": { - "lastModified": 1739451785, - "narHash": "sha256-3ebRdThRic9bHMuNi2IAA/ek9b32bsy8F5R4SvGTIog=", + "lastModified": 1740019556, + "narHash": "sha256-vn285HxnnlHLWnv59Og7muqECNMS33mWLM14soFIv2g=", "owner": "nixos", "repo": "nixpkgs", - "rev": "1128e89fd5e11bb25aedbfc287733c6502202ea9", + "rev": "dad564433178067be1fbdfcce23b546254b6d641", "type": "github" }, "original": { @@ -524,11 +524,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1739357830, - "narHash": "sha256-9xim3nJJUFbVbJCz48UP4fGRStVW5nv4VdbimbKxJ3I=", + "lastModified": 1739923778, + "narHash": "sha256-BqUY8tz0AQ4to2Z4+uaKczh81zsGZSYxjgvtw+fvIfM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "0ff09db9d034a04acd4e8908820ba0b410d7a33a", + "rev": "36864ed72f234b9540da4cf7a0c49e351d30d3f1", "type": "github" }, "original": { @@ -555,11 +555,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1739446958, - "narHash": "sha256-+/bYK3DbPxMIvSL4zArkMX0LQvS7rzBKXnDXLfKyRVc=", + "lastModified": 1739866667, + "narHash": "sha256-EO1ygNKZlsAC9avfcwHkKGMsmipUk1Uc0TbrEZpkn64=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2ff53fe64443980e139eaa286017f53f88336dd0", + "rev": "73cf49b8ad837ade2de76f87eb53fc85ed5d4680", "type": "github" }, "original": { @@ -576,11 +576,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1739581924, - "narHash": "sha256-P3t/T+MKMSaRdj42k1zV8+R7PHXM3VvebsAK7YTlK1c=", + "lastModified": 1740165529, + "narHash": "sha256-GoAHdgxwZDpnDxuRgZp1L3+CW0SJbtJffJrqnx8ElJI=", "owner": "nix-community", "repo": "nur", - "rev": "9f571f72b4eab45743bd936a6587c7ee139c475b", + "rev": "1e28c6bb3ed7dc355ceffa0ad0e54a0a3be66be6", "type": "github" }, "original": { @@ -623,8 +623,7 @@ "nixUnstable": "nixUnstable", "nixpkgs": "nixpkgs", "nur": "nur", - "sops-nix": "sops-nix", - "umu": "umu" + "sops-nix": "sops-nix" } }, "sops-nix": { @@ -683,30 +682,6 @@ "type": "github" } }, - "umu": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "dir": "packaging/nix", - "lastModified": 1739564619, - "narHash": "sha256-S/PJ+91XT7GSH0Q6KQZiXelf6FiRh3BxUED7/nkUG8A=", - "ref": "refs/heads/main", - "rev": "1a81b3ca58f17b6edfad76d71dff1a9e81d39408", - "revCount": 973, - "submodules": true, - "type": "git", - "url": "https://github.com/Open-Wine-Components/umu-launcher/" - }, - "original": { - "dir": "packaging/nix", - "submodules": true, - "type": "git", - "url": "https://github.com/Open-Wine-Components/umu-launcher/" - } - }, "xdph": { "inputs": { "hyprland-protocols": [ diff --git a/flake.nix b/flake.nix index 9eb51f3..84bbc9b 100755 --- a/flake.nix +++ b/flake.nix @@ -21,11 +21,6 @@ url = "git+https://github.com/hyprwm/Hyprland?submodules=1"; inputs.nixpkgs.follows = "nixpkgs"; }; - umu = { - url = - "git+https://github.com/Open-Wine-Components/umu-launcher/?dir=packaging/nix&submodules=1"; - inputs.nixpkgs.follows = "nixpkgs"; - }; sops-nix = { url = "github:Mic92/sops-nix"; inputs.nixpkgs.follows = "nixpkgs"; diff --git a/modules/home/gui/games/default.nix b/modules/home/gui/games/default.nix index 1892dd5..7e9188a 100644 --- a/modules/home/gui/games/default.nix +++ b/modules/home/gui/games/default.nix @@ -15,7 +15,7 @@ openttd-jgrpp bottles lutris - inputs.umu.packages.${pkgs.system}.umu + inputs.pkgs.unstable.umu-launcher wine ]; };