diff --git a/flake.lock b/flake.lock index e3973fe..c2ae145 100644 --- a/flake.lock +++ b/flake.lock @@ -11,11 +11,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1711416635, - "narHash": "sha256-mhqtVG7gZC5Dvi6WUZeT33muqZYNOXiye7FEauXGNBA=", + "lastModified": 1711702249, + "narHash": "sha256-QHLcC8jxQhEk8+wAGiAsMyPjv45vExVwJOdvGYZ15bA=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "6be3f18f4547b7e16b914a3e1e55baa1e775a3e3", + "rev": "673b93046cd4bf71ad5284e29e9df96e50ef4c82", "type": "github" }, "original": { @@ -116,11 +116,11 @@ ] }, "locked": { - "lastModified": 1711133180, - "narHash": "sha256-WJOahf+6115+GMl3wUfURu8fszuNeJLv9qAWFQl3Vmo=", + "lastModified": 1711625603, + "narHash": "sha256-W+9dfqA9bqUIBV5u7jaIARAzMe3kTq/Hp2SpSVXKRQw=", "owner": "nix-community", "repo": "home-manager", - "rev": "1c2c5e4cabba4c43504ef0f8cc3f3dfa284e2dbb", + "rev": "c0ef0dab55611c676ad7539bf4e41b3ec6fa87d2", "type": "github" }, "original": { @@ -142,11 +142,11 @@ ] }, "locked": { - "lastModified": 1711035742, - "narHash": "sha256-5vvhCSUGG9TA2G1eIRgokuYizhRnZu0ZbcU1MXfHsUE=", + "lastModified": 1711466786, + "narHash": "sha256-sArxGyUBiCA1in+q6t0QqT+ZJiZ1PyBp7cNPKLmREM0=", "owner": "hyprwm", "repo": "hyprcursor", - "rev": "6a92473237f430399a417e1c2da9d7fcd4970086", + "rev": "d3876f34779cc03ee51e4aafc0d00a4f187c7544", "type": "github" }, "original": { @@ -168,11 +168,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1711466169, - "narHash": "sha256-8LyPRWHz6YFWS5IIgjb94K6eDH5Riwe65BBkreC6v1c=", + "lastModified": 1711673030, + "narHash": "sha256-atpS9c2LR56DIURlDLmuKHGmVQj9Xky2aETGhdTwMKg=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "ae52b7f4680716976d05b638aaa90e169d199117", + "rev": "fcd9d77b642c0cd45cae61cf10ed1924f2e7945b", "type": "github" }, "original": { @@ -188,11 +188,11 @@ ] }, "locked": { - "lastModified": 1711094856, - "narHash": "sha256-2TL7tbLLsh2xWhszubVU2xDv8dx1fUMmPnEXlERu+m4=", + "lastModified": 1711702159, + "narHash": "sha256-Xvp88HF1Q/qzqI2cAa/Pd+NP2+TD7Oagz12sTn82AxE=", "owner": "outfoxxed", "repo": "hy3", - "rev": "315e7902c9637e66352c9a26f6dff15c602fc85c", + "rev": "cc953fc8c0b0c7fedbbc5e4656dae1326b673fdf", "type": "github" }, "original": { @@ -261,11 +261,11 @@ ] }, "locked": { - "lastModified": 1710960526, - "narHash": "sha256-tt0UgVKWeLQ+tFzvqrm4uAZbzONwdGshpfiLHAQ1P2c=", + "lastModified": 1711250455, + "narHash": "sha256-LSq1ZsTpeD7xsqvlsepDEelWRDtAhqwetp6PusHXJRo=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "a2f39421144d42541c057be235154ce21b76c0f6", + "rev": "b3e430f81f3364c5dd1a3cc9995706a4799eb3fa", "type": "github" }, "original": { @@ -348,11 +348,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1711124224, - "narHash": "sha256-l0zlN/3CiodvWDtfBOVxeTwYSRz93muVbXWSpaMjXxM=", + "lastModified": 1711460390, + "narHash": "sha256-akSgjDZL6pVHEfSE6sz1DNSXuYX6hq+P/1Z5IoYWs7E=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "56528ee42526794d413d6f244648aaee4a7b56c0", + "rev": "44733514b72e732bd49f5511bd0203dea9b9a434", "type": "github" }, "original": { @@ -364,11 +364,11 @@ }, "nur": { "locked": { - "lastModified": 1711416992, - "narHash": "sha256-N1D7mT7DX5CEndSsM3Q608glUsrqtovafiJdbVKva00=", + "lastModified": 1711701097, + "narHash": "sha256-znOXaDb5XrVHpZ/kEXtUSZio+RkI0P/GFmxtFMkABnw=", "owner": "nix-community", "repo": "NUR", - "rev": "ea5441d71ded45d67d6766ea591960f94fab37f6", + "rev": "9e4b87de57109c8f4c1062e262b4537732607804", "type": "github" }, "original": { @@ -384,11 +384,11 @@ ] }, "locked": { - "lastModified": 1711533176, - "narHash": "sha256-AxHssrU8ekAxDl4EsfDmuWM9RMDJhS2fInjkDouo3Gs=", + "lastModified": 1711618169, + "narHash": "sha256-K5j+SlsGfyrJeBzcZVH02O8P4T+ep4UEFryVVBWFdAw=", "ref": "refs/heads/master", - "rev": "c3fe93efe652d4528098573d863ffcc14b236b4e", - "revCount": 135, + "rev": "439788fce09efff383768ac2403526f9e0fe5ddd", + "revCount": 136, "type": "git", "url": "https://git.outfoxxed.me/outfoxxed/quickshell" }, @@ -425,11 +425,11 @@ ] }, "locked": { - "lastModified": 1711332768, - "narHash": "sha256-SFnlIwnrwJxEawLcrH7+zGb8spePcYyai5asMZnm0BM=", + "lastModified": 1711678273, + "narHash": "sha256-7lIB0hMRnfzx/9oSIwTnwXmVnbvVGRoadOCW+1HI5zY=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "8a8e3ea9a9a4b2225cb5e33e07c3a337f820168c", + "rev": "42a168449605950935f15ea546f6f770e5f7f629", "type": "github" }, "original": { @@ -506,11 +506,11 @@ ] }, "locked": { - "lastModified": 1711539794, - "narHash": "sha256-ZFCYRbStTGDfZ1nnSlDgEAgXzhkRUrzY469gXfF4mY4=", + "lastModified": 1711699175, + "narHash": "sha256-ZZSrsb6r71Afaua/QINh/x33UR/p46nK+AY3M9QN8t8=", "owner": "abenz1267", "repo": "walker", - "rev": "d7989dfc5212917502ac2bb40c1e8f08b6189fdb", + "rev": "d8f849627424ba58f03e4f107b0dd61865cd04a4", "type": "github" }, "original": { diff --git a/modules/user/modules/walker/style.css b/modules/user/modules/walker/style.css index c249c49..5268da9 100644 --- a/modules/user/modules/walker/style.css +++ b/modules/user/modules/walker/style.css @@ -3,6 +3,7 @@ } #window { + background: none; } #box { @@ -85,3 +86,6 @@ .activation .search { opacity: 0.5; } + +#spinner { opacity: 0 } +#spinner.visible { opacity: 1 } diff --git a/systems/msi/osu.nix b/systems/msi/osu.nix new file mode 100644 index 0000000..a67656f --- /dev/null +++ b/systems/msi/osu.nix @@ -0,0 +1,73 @@ +{ lib +, stdenv +, fetchurl +, fetchzip +, appimageTools +}: + +let + pname = "osu-lazer-bin"; + version = "2024.221.0"; + + src = { + aarch64-darwin = fetchzip { + url = "https://github.com/ppy/osu/releases/download/${version}/osu.app.Apple.Silicon.zip"; + hash = "sha256-U7i3rO7NVbBdOFMYpGrjI7LC//TEon3vdAHzjKeGsuk="; + stripRoot = false; + }; + x86_64-darwin = fetchzip { + url = "https://github.com/ppy/osu/releases/download/${version}/osu.app.Intel.zip"; + hash = "sha256-HEx1ZxxXnsHUD8Cqzld3RQoPZOfiXEmInlUMZVdDt6E="; + stripRoot = false; + }; + x86_64-linux = fetchurl { + url = "https://github.com/ppy/osu/releases/download/${version}/osu.AppImage"; + hash = "sha256-UY1HSOpcir9ybcxDuicklArynOFWkDtKqJe/LGeQOEM="; + }; + }.${stdenv.system} or (throw "${pname}-${version}: ${stdenv.system} is unsupported."); + + meta = { + description = "Rhythm is just a *click* away (AppImage version for score submission and multiplayer, and binary distribution for Darwin systems)"; + homepage = "https://osu.ppy.sh"; + license = with lib.licenses; [ + mit + cc-by-nc-40 + unfreeRedistributable # osu-framework contains libbass.so in repository + ]; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + maintainers = with lib.maintainers; [ delan gepbird spacefault stepbrobd ]; + mainProgram = "osu!"; + platforms = [ "aarch64-darwin" "x86_64-darwin" "x86_64-linux" ]; + }; + + passthru.updateScript = ./update-bin.sh; +in +if stdenv.isDarwin +then stdenv.mkDerivation { + inherit pname version src meta passthru; + + installPhase = '' + runHook preInstall + APP_DIR="$out/Applications" + mkdir -p "$APP_DIR" + cp -r . "$APP_DIR" + runHook postInstall + ''; +} +else appimageTools.wrapType2 { + inherit pname version src meta passthru; + + extraPkgs = pkgs: with pkgs; [ icu ]; + + extraInstallCommands = + let + contents = appimageTools.extract { inherit pname version src; }; + in + '' + mv -v $out/bin/${pname}-${version} $out/bin/osu\! + install -m 444 -D ${contents}/osu\!.desktop -t $out/share/applications + for i in 16 32 48 64 96 128 256 512 1024; do + install -D ${contents}/osu\!.png $out/share/icons/hicolor/''${i}x$i/apps/osu\!.png + done + ''; +}