Merge pull request #8 from khaykingleb/setup-user

Setup user
khaykingleb · Feb 3, 2025 · c2a440b · c2a440b
2 parents fed7d05 + 7d8aca0
commit c2a440b
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 0 deletions.
diff --git a/Makefile b/Makefile
@@ -62,6 +62,7 @@ asdf-setup: ## Setup asdf
 
 conda-macos-silicon-setup: ## Setup conda for macOS Silicon
 	@sh users/khaykingleb/scripts/conda.sh install_conda_macos_silicon
+	@conda config --set auto_activate_base false
 .PHONY: conda-macos-silicon-setup
 
 ##=============================================================================

diff --git a/users/khaykingleb/programs/conda.nix b/users/khaykingleb/programs/conda.nix
@@ -1,5 +1,6 @@
 { config, ... }: {
   programs.zsh.initExtra = ''
+    # Conda initialization
     __conda_setup="$(${config.home.homeDirectory}/anaconda3/bin/conda 'shell.zsh' 'hook' 2> /dev/null)"
     if [ $? -eq 0 ]; then
         eval "$__conda_setup"
@@ -11,5 +12,9 @@
         fi
     fi
     unset __conda_setup
+
+    # Force deactivation of base environment for conda
+    # (otherwise, it's activated in Cursor IDE for some reason)
+    conda deactivate
   '';
 }
diff --git a/users/khaykingleb/wallpapers/vincent_van_gogh_the_olive_trees.jpg b/users/khaykingleb/wallpapers/vincent_van_gogh_the_olive_trees.jpg
diff --git a/users/khaykingleb/wallpapers/vincent_van_gogh_wheat_field_with_cypresses.jpg b/users/khaykingleb/wallpapers/vincent_van_gogh_wheat_field_with_cypresses.jpg
diff --git a/users/khaykingleb/wallpapers/vincent_van_gogh_wheatfield_under_thunderclouds.jpg b/users/khaykingleb/wallpapers/vincent_van_gogh_wheatfield_under_thunderclouds.jpg
diff --git a/users/khaykingleb/wallpapers/vincent_van_gogh_wheatfield_with_crows.jpg b/users/khaykingleb/wallpapers/vincent_van_gogh_wheatfield_with_crows.jpg