mirror of
https://github.com/ryan4yin/nix-config.git
synced 2026-11-20 06:31:27 +01:00
chore: drop conda from the Linux and macOS profiles
Assisted-by: DeepSeek Harness 0.2.0-rc.2 (deepseek-flash)
This commit is contained in:
1 parent
afa7a4c72e
commit
789b230780
5 files changed
+19
-53
No files matched your search
+17
-26
@@ -1,6 +1,5 @@
|
||||
{
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
{
|
||||
@@ -15,36 +14,28 @@
|
||||
#
|
||||
#############################################################
|
||||
|
||||
home.packages =
|
||||
with pkgs;
|
||||
[
|
||||
colmena # nixos's remote deployment tool
|
||||
home.packages = with pkgs; [
|
||||
colmena # nixos's remote deployment tool
|
||||
|
||||
# db related
|
||||
# mycli
|
||||
pgcli
|
||||
sqlite
|
||||
# db related
|
||||
# mycli
|
||||
pgcli
|
||||
sqlite
|
||||
|
||||
# spreadsheets / data files: interactive viewer for csv, xlsx, tsv, json, sqlite
|
||||
visidata
|
||||
# spreadsheets / data files: interactive viewer for csv, xlsx, tsv, json, sqlite
|
||||
visidata
|
||||
|
||||
# embedded development
|
||||
minicom
|
||||
# embedded development
|
||||
minicom
|
||||
|
||||
# ai related
|
||||
python313Packages.huggingface-hub # huggingface-cli
|
||||
yt-dlp # youtube/bilibili/soundcloud/... video/music downloader
|
||||
# ai related
|
||||
python313Packages.huggingface-hub # huggingface-cli
|
||||
yt-dlp # youtube/bilibili/soundcloud/... video/music downloader
|
||||
|
||||
# Automatically trims your branches whose tracking remote refs are merged or gone
|
||||
# It's really useful when you work on a project for a long time.
|
||||
git-trim
|
||||
]
|
||||
# conda is not available on macOS
|
||||
++ lib.optionals pkgs.stdenv.hostPlatform.isLinux [
|
||||
# need to run `conda-install` before using it
|
||||
# need to run `conda-shell` before using command `conda`
|
||||
conda
|
||||
];
|
||||
# Automatically trims your branches whose tracking remote refs are merged or gone
|
||||
# It's really useful when you work on a project for a long time.
|
||||
git-trim
|
||||
];
|
||||
|
||||
programs = {
|
||||
direnv = {
|
||||
|
||||
+2
-20
@@ -3,24 +3,6 @@ let
|
||||
envExtra = ''
|
||||
export PATH="/opt/homebrew/bin:/usr/local/bin:$PATH"
|
||||
'';
|
||||
# copied from the content generated by `conda init bash`
|
||||
initContent = ''
|
||||
arch=$(uname -m)
|
||||
|
||||
if [ "aarch64" = "$arch" ] || [ "arm64" = "$arch" ]; then
|
||||
# >>> (miniforge)conda initialize >>>
|
||||
# !! Contents within this block are managed by 'conda init' !!
|
||||
if [ -f "/opt/homebrew/Caskroom/miniforge/base/etc/profile.d/conda.sh" ]; then
|
||||
. "/opt/homebrew/Caskroom/miniforge/base/etc/profile.d/conda.sh"
|
||||
else
|
||||
export PATH="/opt/homebrew/Caskroom/miniforge/base/bin:$PATH"
|
||||
fi
|
||||
# <<< conda initialize <<<
|
||||
elif [[ "x86_64" = "$arch" ]]; then
|
||||
# do nothing
|
||||
true
|
||||
fi
|
||||
'';
|
||||
in
|
||||
{
|
||||
# Homebrew's default install location:
|
||||
@@ -30,11 +12,11 @@ in
|
||||
# in /opt/homebrew for Apple Silicon and /usr/local for Rosetta 2 to coexist and use bottles.
|
||||
programs.bash = {
|
||||
enable = true;
|
||||
bashrcExtra = lib.mkAfter (envExtra + initContent);
|
||||
bashrcExtra = lib.mkAfter envExtra;
|
||||
};
|
||||
programs.zsh = {
|
||||
enable = true;
|
||||
dotDir = "${config.xdg.configHome}/zsh";
|
||||
inherit envExtra initContent;
|
||||
inherit envExtra;
|
||||
};
|
||||
}
|
||||
@@ -255,7 +255,6 @@ in
|
||||
".cargo" # rust
|
||||
".m2" # java maven
|
||||
".gradle" # java gradle
|
||||
".conda" # python generated by `conda-shell`
|
||||
".local/bin"
|
||||
# python uv
|
||||
".local/share/uv"
|
||||
|
||||
@@ -78,11 +78,6 @@ in
|
||||
sqlite
|
||||
|
||||
yt-dlp # youtube/bilibili/soundcloud/... video/music downloader
|
||||
|
||||
# need to run `conda-install` before using it
|
||||
# need to run `conda-shell` before using command `conda`
|
||||
# conda is not available for MacOS
|
||||
conda
|
||||
]
|
||||
# AI Agent Tools
|
||||
++ [
|
||||
|
||||
@@ -188,7 +188,6 @@ in
|
||||
"mitmproxy" # HTTP/HTTPS traffic inspector
|
||||
"wireshark-app" # network analyzer
|
||||
# "google-cloud-sdk" # Google Cloud SDK
|
||||
"miniforge" # Miniconda's community-driven distribution
|
||||
|
||||
# Setup macfuse: https://github.com/macfuse/macfuse/wiki/Getting-Started
|
||||
"macfuse" # for rclone to mount a fuse filesystem
|
||||
|
||||
Reference in new issue
Block a user