diff --git a/flake.lock b/flake.lock index 6291055..84dbfb0 100644 --- a/flake.lock +++ b/flake.lock @@ -114,14 +114,17 @@ ] }, "locked": { - "lastModified": 1690471502, + "lastModified": 1690507298, "narHash": "sha256-iP3MWm0eRhFiHC+dN1O60IT2gp5OHMf6m3/E06UvevI=", - "type": "git", - "url": "file:../discord-applemusic-rich-presence" + "owner": "ryanccn", + "repo": "discord-applemusic-rich-presence", + "rev": "804bbd6a9488b07384669f2d7edfa248ad499449", + "type": "github" }, "original": { - "type": "git", - "url": "file:../discord-applemusic-rich-presence" + "owner": "ryanccn", + "repo": "discord-applemusic-rich-presence", + "type": "github" } }, "fenix": { diff --git a/justfile b/justfile index 8b41b1f..0c26bf9 100644 --- a/justfile +++ b/justfile @@ -1,6 +1,6 @@ switch: darwin-rebuild switch --flake . --show-trace delete-old: - sudo nix-env --profile /nix/var/nix/profiles/system --delete-generations old + sudo nix-env --profile /nix/var/nix/profiles/system --delete-generations old && nix run home-manager#home-manager -- expire-generations now gc: nix store gc diff --git a/programs/fish/conf.d/02_tooling.fish b/programs/fish/conf.d/02_tooling.fish index c337bf8..08aaf1d 100644 --- a/programs/fish/conf.d/02_tooling.fish +++ b/programs/fish/conf.d/02_tooling.fish @@ -3,7 +3,7 @@ set -x SSH_AUTH_SOCK "$HOME/Library/Group Containers/2BUA8C4S2C.com.1password/t/ # Homebrew shell set -x HOMEBREW_NO_ANALYTICS 1 -set -x HOMEBREW_CASK_OPTS "--require-sha" +set -x HOMEBREW_CASK_OPTS --require-sha set -x HOMEBREW_NO_INSECURE_REDIRECT 1 set -x HOMEBREW_NO_EMOJI 1 /opt/homebrew/bin/brew shellenv | source @@ -11,12 +11,6 @@ set -x HOMEBREW_NO_EMOJI 1 # fnm shell env fnm env --use-on-cd | source -# pyenv -set -x PYENV_ROOT "$HOME/.pyenv" -set -x PATH "$PYENV_ROOT/bin:$PATH" -pyenv init - | source -set -x PIPX_DEFAULT_PYTHON "$HOME/.pyenv/shims/python" - # cargo fish_add_path "$HOME/.cargo/bin" # deno @@ -26,9 +20,9 @@ fish_add_path "$HOME/.deno/bin" set -x PNPM_HOME "$HOME/Library/pnpm" # disable telemetry -set -x NEXT_TELEMETRY_DISABLED 1 # Next.js -set -x CHECKPOINT_DISABLE 1 # Prisma -set -x DISABLE_TELEMETRY YES # diffusers +set -x NEXT_TELEMETRY_DISABLED 1 # Next.js +set -x CHECKPOINT_DISABLE 1 # Prisma +set -x DISABLE_TELEMETRY YES # diffusers # direnv set -x DIRENV_LOG_FORMAT "" diff --git a/programs/zsh/envExtra.zsh b/programs/zsh/envExtra.zsh index a029908..022527e 100644 --- a/programs/zsh/envExtra.zsh +++ b/programs/zsh/envExtra.zsh @@ -11,12 +11,6 @@ eval "$(/opt/homebrew/bin/brew shellenv)" # fnm shell env eval "$(fnm env --use-on-cd)" -# pyenv -export PYENV_ROOT="$HOME/.pyenv" -command -v pyenv > /dev/null || export PATH="$PYENV_ROOT/bin:$PATH" -eval "$(pyenv init -)" -export PIPX_DEFAULT_PYTHON="$HOME/.pyenv/shims/python" - # deno export PATH="$HOME/.deno/bin:$PATH" diff --git a/system.nix b/system.nix index 4c92861..9afbaf8 100644 --- a/system.nix +++ b/system.nix @@ -58,7 +58,6 @@ mkcert nerdfix pscale - pyenv railway redis silicon