fix

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.12
+	~/.local/bin/uv pip install -r ./python/pyproject.toml
 
 js:
 	npm install -g @tailwindcss/language-server markserv

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,12 +1,16 @@
 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() {
@@ -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,5 +86,4 @@ eval "$(direnv hook zsh)"
 # done twice for a reason
 pretzo_init
 fzf_init
-
-eval "$(~/.local/bin/mise activate zsh)"
+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

@@ -3,3 +3,5 @@ source $HOME/dotfiles/dotfiles/common/.zshrc
 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'
 

nvim/lua/config/keymap.lua

@@ -133,7 +133,7 @@ vim.keymap.set("n", "<leader>o", "<CMD>split | Oil<CR>")
 -- CopilotChat
 vim.keymap.set("n", "<leader>c", ":CopilotChat<CR>")
 
--- ZenMode Zoom
+-- ZenMode
 vim.keymap.set("n", "<leader>z", ":ZenMode<CR>")
 
 -- Misc / Unused / Broken

nvim/lua/plugins/text-editing.lua

@@ -8,6 +8,7 @@ return {
 	{ "tpope/vim-repeat" },
 	{ "farmergreg/vim-lastplace" },
 	{ "axelf4/vim-strip-trailing-whitespace" },
+<<<<<<< HEAD
 
 	{
 		"folke/zen-mode.nvim",
@@ -29,6 +30,11 @@ return {
 		dependencies = { "nvim-lua/plenary.nvim" },
 		opts = {},
 	},
+||||||| 4de39f3
+=======
+
+	{ "folke/zen-mode.nvim" },
+>>>>>>> 44d0041f59c821dbe9771616034d3af6a00f08b6
 	{
 		"mbbill/undotree",
 		config = function()

python/pyproject.toml

@@ -1,45 +0,0 @@
-[tool.poetry]
-name = "general"
-version = "0.1.0"
-description = ""
-authors = ["Adam Green <[email protected]>"]
-readme = "README.md"
-
-[tool.poetry.dependencies]
-python = "^3.10.6"
-pandas = "^2.0.3"
-requests = "^2.31.0"
-typer = "^0.9.0"
-mypy = "^1.4.1"
-black = "^23.7.0"
-zxpy = "^1.6.3"
-awscli = "^1.29.21"
-polars = "^0.18.13"
-matplotlib = "^3.7.2"
-pytest = "^7.4.0"
-seaborn = "^0.12.2"
-pulp = "^2.7.0"
-pandera = "*"
-pandas-stubs = "^2.0.2.230605"
-ruff = "^0.1.5"
-hypothesis = "^6.84.2"
-datasette = "^0.64.3"
-isort = "^5.12.0"
-djlint = "^1.32.1"
-proselint = "^0.13.0"
-yamllint = "^1.32.0"
-pydocstyle = "^6.3.0"
-ipython = "^8.16.1"
-textual = "^0.40.0"
-urllib3 = "^2.0.7"
-pillow = "^10.1.0"
-mdformat = "^0.7.17"
-mdformat-frontmatter = "^2.0.8"
-mdformat-footnote = "^0.1.1"
-jupyterlab = "^4.0.9"
-pydantic = "2.9.0"
-yamlfix = "^1.17.0"
-
-[build-system]
-requires = ["poetry-core"]
-build-backend = "poetry.core.masonry.api"

python/setup-uv.sh

@@ -0,0 +1,5 @@
+curl -LsSf https://astral.sh/uv/install.sh | sh
+uv tool install mypy --python 3.11.9
+uv tool install pytest --python 3.11.9
+uv tool install ruff --python 3.11.9
+uv tool install yamllint --python 3.11.9