From ccb831e991a25d7bee816352d96b542dce21af75 Mon Sep 17 00:00:00 2001 From: Ryan Cao <70191398+ryanccn@users.noreply.github.com> Date: Sat, 29 Jul 2023 12:47:09 +0800 Subject: [PATCH] chore: update discord-applemusic-rich-presence flake --- flake.lock | 18 +++++++++--------- system.nix | 17 ++++++++--------- 2 files changed, 17 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index 84dbfb0..60f1a50 100644 --- a/flake.lock +++ b/flake.lock @@ -114,11 +114,11 @@ ] }, "locked": { - "lastModified": 1690507298, - "narHash": "sha256-iP3MWm0eRhFiHC+dN1O60IT2gp5OHMf6m3/E06UvevI=", + "lastModified": 1690603561, + "narHash": "sha256-IcALWqG/dozxKuvih7qRLoYMEtikHjJQ0KQx908UtxI=", "owner": "ryanccn", "repo": "discord-applemusic-rich-presence", - "rev": "804bbd6a9488b07384669f2d7edfa248ad499449", + "rev": "8e97e31eded1dd9b548047fc90eefc6235540f4c", "type": "github" }, "original": { @@ -135,11 +135,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1690438856, - "narHash": "sha256-OM5x1jls18TZTkGgvG3A9SA8726gBYeXS50v1mUXueo=", + "lastModified": 1690525255, + "narHash": "sha256-jWmEJsV0mbWhUTCmkVg0URTVaQxzX9SPx33DPJPOmWc=", "owner": "nix-community", "repo": "fenix", - "rev": "931d63b40e0aa3e7f65d242361d7fc15bbcbfd74", + "rev": "6d22d0989ebc9e8fc7e1d15f973613fae928ebb2", "type": "github" }, "original": { @@ -221,11 +221,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1690441914, - "narHash": "sha256-Ac+kJQ5z9MDAMyzSc0i0zJDx2i3qi9NjlW5Lz285G/I=", + "lastModified": 1690569970, + "narHash": "sha256-Lf1LLHyi+hajpj3dJqjMRgLMU2Fr++JEOdJyhBaxaWQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "db8672b8d0a2593c2405aed0c1dfa64b2a2f428f", + "rev": "66ce081fafa2dca0038006ec7c6482d7a11d13d8", "type": "github" }, "original": { diff --git a/system.nix b/system.nix index 9afbaf8..75d6809 100644 --- a/system.nix +++ b/system.nix @@ -79,8 +79,6 @@ auto-optimise-store = true; extra-platforms = ["x86_64-darwin" "aarch64-darwin"]; - # extra-sandbox-paths = ["/nix/var/cache/ccache"]; - extra-substituters = [ "https://nix-community.cachix.org" ]; @@ -94,6 +92,7 @@ attic.overlays.default agenix.overlays.default fenix.overlays.default + discord-applemusic-rich-presence.overlays.default (import ./overlays/ryan-mono-bin.nix) ]; @@ -101,15 +100,15 @@ hostPlatform = "aarch64-darwin"; }; + system.activationScripts.extraActivation = { + text = '' + set -eo pipefail + HOME="/var/root" ${pkgs.lib.getExe pkgs.nvd} --nix-bin-dir=${pkgs.nix}/bin diff /run/current-system "$systemConfig" + ''; + }; + programs.zsh.enable = true; programs.fish.enable = true; - programs.fish.shellInit = '' - for p in /run/current-system/sw/bin - if not contains $p $fish_user_paths - set -g fish_user_paths $p $fish_user_paths - end - end - ''; homebrew = { enable = true;