MacOS 2024-08-06 (#57)

Makefile

@@ -36,12 +36,12 @@ test: setup-nix
 
 .PHONY: setup-pyenv python js
 
-setup-pyenv:
-	bash ./python/setup-pyenv.sh
+setup-uv:
+	bash ./python/setup-uv.sh
 
-python: setup-pyenv
-	bash ./python/setup-general-venv.sh general 3.12.2
-	bash ./python/setup-general-venv-pkgs.sh
+python: setup-uv
+	cd ~ && ~/.local/bin/uv venv --python 3.11.9
+	~/.local/bin/uv pip install -r ./python/pyproject.toml
 
 js:
 	npm install -g @tailwindcss/language-server markserv

README.md

@@ -33,7 +33,7 @@ This will also setup dependencies with Nix.
 
 ### Python
 
-Install `pyenv` and `pyenv-virtualenv`, and setup a global Python installation in a pyenv virtual environment:
+Install `uv` and setup a global Python installation in a virtual environment:
 
 ```bash
 $ make python
@@ -76,7 +76,7 @@ $ make nix-pkgs -o setup-nix
 
 ### Neovim
 
-Neovim config is in `./nvim`. To use the Neovim setup, put this folder (ie `.`, not `./nvim`) into `$XDG_CONFIG_HOME`.
+Neovim config is in `./nvim`. To use the Neovim setup, put this folder into `$XDG_CONFIG_HOME`.
 
 I use Lazy for package management in Neovim - it will install packages when you first open the editor.
 

dotfiles/.envrc

@@ -0,0 +1,4 @@
+source_env_if_exists ~/.envrc.secret
+export TRACE=0
+export VIRTUAL_ENV=."venv"
+layout python

dotfiles/common/.bash_profile

@@ -8,11 +8,13 @@ export EDITOR=$(which nvim)
 eval "$(zoxide init bash)"
 
 # pyenv
-source "$HOME/dotfiles/macos/pyenv-flags"
-export PYENV_ROOT="$HOME/.pyenv"
-export PATH="$PYENV_ROOT/bin:$PATH"
-eval "$(pyenv init --path)"
-eval "$(pyenv virtualenv-init -)"
+if [ "$DISABLE_PYENV" = "" ]; then
+  source "$HOME/dotfiles/macos/pyenv-flags"
+  export PYENV_ROOT="$HOME/.pyenv"
+  export PATH="$PYENV_ROOT/bin:$PATH"
+  eval "$(pyenv init --path)"
+  eval "$(pyenv virtualenv-init -)"
+fi
 
 { eval "$(ssh-agent)"; } &>/dev/null
 eval "$(direnv hook bash)"

dotfiles/common/.zshrc

@@ -1,18 +1,22 @@
 bash $HOME/dotfiles/scripts/trace.sh "$0"
 
+export DISABLE_PYENV=1
+
 pyenv_init() {
-  export PYENV_ROOT="$HOME/.pyenv"
-  export PATH="$PYENV_ROOT/bin:$PATH"
-  export PIPENV_PYTHON="$PYENV_ROOT/shims/python"
-  export PYENV_VIRTUALENV_DISABLE_PROMPT=1
-  eval "$(pyenv init -)"
-  eval "$(pyenv virtualenv-init -)"
+  if [ -z "$DISABLE_PYENV" ]; then
+    export PYENV_ROOT="$HOME/.pyenv"
+    export PATH="$PYENV_ROOT/bin:$PATH"
+    export PIPENV_PYTHON="$PYENV_ROOT/shims/python"
+    export PYENV_VIRTUALENV_DISABLE_PROMPT=1
+    eval "$(pyenv init -)"
+    eval "$(pyenv virtualenv-init -)"
+  fi
 }
 
 fzf_init() {
     export FZF_BASE=/usr/local/bin/fzf
     bindkey -v
-    source ~/dotfiles/fzf/.fzf.zsh
+    source $HOME/.fzf.zsh
     export FZF_DEFAULT_COMMAND='rg --files --hidden --smart-case --line-buffered --ignore-file ~/.gitignore'
     export FZF_DEFAULT_OPTS='--height 40% --preview "bat -p {}" --preview-window=down:50%:wrap --border=none'
     export FZF_CTRL_R_OPTS='--height 20% --no-preview'
@@ -60,7 +64,6 @@ SAVEHIST=$HISTSIZE
 export AWS_LOG_LEVEL=3
 
 alias brew='arch -arm64 brew'
-source "$HOME/dotfiles/dotfiles/common/setup-path.sh"
 
 source ~/dotfiles/macos/pyenv-flags
 
@@ -83,3 +86,4 @@ eval "$(direnv hook zsh)"
 # done twice for a reason
 pretzo_init
 fzf_init
+source "$HOME/dotfiles/dotfiles/common/setup-path.sh"

dotfiles/common/setup-path.sh

@@ -4,5 +4,5 @@ export PATH="$HOME/checkmake:$PATH"
 export PATH="$HOME/dotfiles/scripts:$PATH"
 export PATH="$HOME/personal/para/area/script:$PATH"
 export PATH="$HOME/go/bin:$PATH"
-
+export PATH="$HOME/.local/bin:$PATH"
 export GOPATH="$HOME/go"

dotfiles/macos/.bash_profile

@@ -1,2 +1,4 @@
 source "$HOME"/dotfiles/dotfiles/common/.bash_profile
 . "$HOME/.cargo/env"
+
+. "$HOME/.local/bin/env"

dotfiles/macos/.bashrc

@@ -2,3 +2,5 @@ source "$HOME"/dotfiles/dotfiles/common/.bashrc
 
 [ -f ~/.fzf.bash ] && source ~/.fzf.bash
 . "$HOME/.cargo/env"
+
+. "$HOME/.local/bin/env"

dotfiles/macos/.zshrc

@@ -1,5 +1,7 @@
 source $HOME/dotfiles/dotfiles/common/.zshrc
 # eval "$(gh copilot alias -- zsh)"
-head -n 15 $HOME/personal/para/resource/cheat_sheet.md | tail -n 9 | bat --language=markdown -p --color=always --paging=never --theme=Dracula
+head -n 20 $HOME/personal/para/resource/cheat_sheet.md | tail -n 14 | bat --language=markdown -p --color=always --paging=never --theme=Dracula
 
 [ -f ~/.fzf.zsh ] && source ~/.fzf.zsh
+
+. "$HOME/.local/bin/env"

dotfiles/windows/.bashrc

@@ -18,11 +18,6 @@ SAVEHIST=$HISTSIZE
 # after each command, save and reload history
 export PROMPT_COMMAND="history -a; history -c; history -r; $PROMPT_COMMAND"
 
-
-# ALIASES
-
-export PYENV_GENERAL="$HOME/.pyenv/versions/3.10.6/envs/general/bin"
-
 # experimental
 alias p='nbe'