From 5a597ed8373f36e9af525567548fbf582e360d4a Mon Sep 17 00:00:00 2001 From: winston Date: Thu, 27 Jul 2023 00:38:16 +0200 Subject: [PATCH] chore: remove tmp package --- flake.lock | 72 ++++++++++++++++++++++----------------------- home/apps/media.nix | 35 +--------------------- 2 files changed, 37 insertions(+), 70 deletions(-) diff --git a/flake.lock b/flake.lock index d80a2dd..b305b8e 100644 --- a/flake.lock +++ b/flake.lock @@ -25,11 +25,11 @@ ] }, "locked": { - "lastModified": 1689516967, - "narHash": "sha256-sFAa33wkQHanmij/uhfGduIDK8z4dJAita/rK6u9pvE=", + "lastModified": 1690247892, + "narHash": "sha256-WMGc1yq1cqRd+kzjWgbvHxckJIe8VQfiZ5RfR8tgABw=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "61662a63bfe1726588c1da6b412df86d8ca94d63", + "rev": "efd35d99ce412335c478dff9da9a4256bbd39757", "type": "github" }, "original": { @@ -136,11 +136,11 @@ ] }, "locked": { - "lastModified": 1689495092, - "narHash": "sha256-yZu2j5FpLZEPhJQQutMCPTxa1VMigLPabLYvLTq6ASM=", + "lastModified": 1690269402, + "narHash": "sha256-SybA24IOGigiHfcTB5eBge4UZQI6a0z8Ah+EzD17tdk=", "owner": "nix-community", "repo": "home-manager", - "rev": "2f84579a70b8c74e5ebb37299a0c3ba279f09382", + "rev": "0306d5ed7e9d1662b55ec0d08afc73d4cb5eadca", "type": "github" }, "original": { @@ -154,11 +154,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1689778107, - "narHash": "sha256-6kP3tOdiJXSDNLhELfWbfBoZCUVQWwKA7TEboXUJYf0=", + "lastModified": 1690354958, + "narHash": "sha256-pJNqsWBBgS93O8uFWv7+rFZh1idE5ih7AoXrsoGU2y4=", "owner": "nekowinston", "repo": "nur", - "rev": "43d356bfee2c797cc3c52ffc94ec83523ead7075", + "rev": "b5926a1ad1adb84c13b06171dcf4e91218482ed2", "type": "github" }, "original": { @@ -174,11 +174,11 @@ ] }, "locked": { - "lastModified": 1689479461, - "narHash": "sha256-Ak+PTYdmfOQEmcOsOEnrwqdP0HP20PLraRwpjSAzSeE=", + "lastModified": 1690083300, + "narHash": "sha256-xnUtWO/5TuuHkIpmzMXGvHJqS06FSVADnAZ4bvqO4Zo=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "22fa44b7f14684d184733fb26a628f3878ff7aaf", + "rev": "c1e6fc40dd5c0d16940bc012421268b94e404b0b", "type": "github" }, "original": { @@ -198,11 +198,11 @@ ] }, "locked": { - "lastModified": 1689645892, - "narHash": "sha256-hF6KdY2HpcbIErSt5GRgFb6g9IpaZa6GY4EoR0v2g44=", + "lastModified": 1690249792, + "narHash": "sha256-y8rbgRWIPbIlfRUkeEsy+eb+Ranvn5qgWS+UIov/aJA=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "0fa35c4774a4ac3fe31fdbc4f6822d8b2f440d0c", + "rev": "afd8af80deb9363ed52c0b3fe69d12285a6bb7e7", "type": "github" }, "original": { @@ -263,11 +263,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1689373857, - "narHash": "sha256-mtBksyvhhT98Zsm9tYHuMKuLwUKDwv+BGTl6K5nOGhY=", + "lastModified": 1690031011, + "narHash": "sha256-kzK0P4Smt7CL53YCdZCBbt9uBFFhE0iNvCki20etAf4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "dfdbcc428f365071f0ca3888f6ec8c25c3792885", + "rev": "12303c652b881435065a98729eb7278313041e49", "type": "github" }, "original": { @@ -279,11 +279,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1689534811, - "narHash": "sha256-jnSUdzD/414d94plCyNlvTJJtiTogTep6t7ZgIKIHiE=", + "lastModified": 1690179384, + "narHash": "sha256-+arbgqFTAtoeKtepW9wCnA0njCOyoiDFyl0Q0SBSOtE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "6cee3b5893090b0f5f0a06b4cf42ca4e60e5d222", + "rev": "b12803b6d90e2e583429bb79b859ca53c348b39a", "type": "github" }, "original": { @@ -295,11 +295,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1685866647, - "narHash": "sha256-4jKguNHY/edLYImB+uL8jKPL/vpfOvMmSlLAGfxSrnY=", + "lastModified": 1689261696, + "narHash": "sha256-LzfUtFs9MQRvIoQ3MfgSuipBVMXslMPH/vZ+nM40LkA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a53a3bec10deef6e1cc1caba5bc60f53b959b1e8", + "rev": "df1eee2aa65052a18121ed4971081576b25d6b5c", "type": "github" }, "original": { @@ -311,11 +311,11 @@ }, "nur": { "locked": { - "lastModified": 1689642505, - "narHash": "sha256-Xn2y9CHStXtl1dOFoSfCRRDB6/vGiFTTB9X6kGw69UE=", + "lastModified": 1690287667, + "narHash": "sha256-IDhGfygPFOT591psrpyQTFZetTEi+1BKzIAstb+3qxc=", "owner": "nix-community", "repo": "nur", - "rev": "0c89ba379bdbcd48cf05f79372dc9918f9de0390", + "rev": "58ff5464f35bf1ab2f9e811e48fdd8dbf3800bfe", "type": "github" }, "original": { @@ -333,11 +333,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1689553106, - "narHash": "sha256-RFFf6BbpqQB0l1ehAbgri9g9MGZkAY9UdiNotD9fG8Y=", + "lastModified": 1689668210, + "narHash": "sha256-XAATwDkaUxH958yXLs1lcEOmU6pSEIkatY3qjqk8X0E=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "87589fa438dd6d5b8c7c1c6ab2ad69e4663bb51f", + "rev": "eb433bff05b285258be76513add6f6c57b441775", "type": "github" }, "original": { @@ -373,11 +373,11 @@ ] }, "locked": { - "lastModified": 1689534977, - "narHash": "sha256-EB4hasmjKgetTR0My2bS5AwELZFIQ4zANLqHKi7aVXg=", + "lastModified": 1690199016, + "narHash": "sha256-yTLL72q6aqGmzHq+C3rDp3rIjno7EJZkFLof6Ika7cE=", "owner": "Mic92", "repo": "sops-nix", - "rev": "bd695cc4d0a5e1bead703cc1bec5fa3094820a81", + "rev": "c36df4fe4bf4bb87759b1891cab21e7a05219500", "type": "github" }, "original": { @@ -394,11 +394,11 @@ ] }, "locked": { - "lastModified": 1688721042, - "narHash": "sha256-gyuhsq/lAqSo/EcfbE4DDJxsjX9ML8MpJM99AB6T7Rs=", + "lastModified": 1690164515, + "narHash": "sha256-lZq+8IT44cyhe2r3jKEys91xZk2VlTBiIcuQCnpEsMQ=", "owner": "willpower3309", "repo": "swayfx", - "rev": "c89e4c9bf24635333dcc5572050da63feb98ff36", + "rev": "c15e9f5d39d356562747fd11f7738df90476ac52", "type": "github" }, "original": { diff --git a/home/apps/media.nix b/home/apps/media.nix index 6241427..e4b3c94 100644 --- a/home/apps/media.nix +++ b/home/apps/media.nix @@ -1,41 +1,8 @@ -{ - lib, - pkgs, - ... -}: let +{pkgs, ...}: let inherit (pkgs.stdenv.hostPlatform) isDarwin isLinux; - - applemusic = rec { - name = "apple-music-via-chrome"; - script = pkgs.writeShellScriptBin name '' - exec ${pkgs.google-chrome}/bin/${pkgs.google-chrome.meta.mainProgram} \ - --app=https://music.apple.com \ - --no-crash-upload \ - --no-default-browser-check \ - --no-first-run \ - "$@" - ''; - desktopItem = pkgs.makeDesktopItem { - inherit name; - exec = name; - icon = pkgs.fetchurl { - name = "Apple Music-icon-2016.png"; - url = "https://assets.nflxext.com/us/ffe/siteui/common/icons/nficon2016.png"; - sha256 = "sha256-c0H3uLCuPA2krqVZ78MfC1PZ253SkWZP3PfWGP2V7Yo="; - meta.license = lib.licenses.unfree; - }; - desktopName = "Apple Music via Google Chrome"; - startupNotify = true; - }; - pkg = pkgs.symlinkJoin { - inherit name; - paths = [script desktopItem]; - }; - }; in { programs.mpv.enable = isLinux; programs.zathura.enable = isLinux; - home.packages = lib.mkIf isLinux [applemusic.pkg]; services.discord-applemusic-rich-presence.enable = isDarwin;