diff --git a/extras/dev.nix b/extras/dev.nix index e027b3b..2d858ec 100644 --- a/extras/dev.nix +++ b/extras/dev.nix @@ -76,8 +76,9 @@ # python # pypy3 python3 - uv ruff + ty + uv python312 # rust diff --git a/systems/BASED.nix b/systems/BASED.nix index a3836db..749a35b 100644 --- a/systems/BASED.nix +++ b/systems/BASED.nix @@ -90,7 +90,7 @@ services.gnome.gcr-ssh-agent.enable = false; services.printing.enable = lib.mkDefault true; - services.printing.drivers = with pkgs; lib.mkDefault [gutenprint gutenprintBin]; + services.printing.drivers = with pkgs; lib.mkDefault [gutenprint gutenprintBin hplip]; services.avahi = { enable = true; nssmdns4 = true; diff --git a/users/tao/direnv/uv.sh b/users/tao/direnv/uv.sh deleted file mode 100644 index 90b3a1e..0000000 --- a/users/tao/direnv/uv.sh +++ /dev/null @@ -1,23 +0,0 @@ -layout_python_uv() { - local python=${1:-python} - [[ $# -gt 0 ]] && shift - unset PYTHONHOME - local python_version=$($python -V | cut -d " " -f 2 | cut -d . -f 1-2) - if [[ -z $python_version ]]; then - log_error "Could not find python's version" - return 1 - fi - - if [[ -n "${VIRTUAL_ENV:-}" ]]; then - local REPLY - realpath.absolute "$VIRTUAL_ENV" - VIRTUAL_ENV=$REPLY - else - VIRTUAL_ENV=$(direnv_layout_dir)/python-$python_version - fi - if [[ ! -d $VIRTUAL_ENV ]]; then - uv venv -p $python "$@" "$VIRTUAL_ENV" - fi - export VIRTUAL_ENV - PATH_add "$VIRTUAL_ENV/bin" -} diff --git a/users/tao/helix.nix b/users/tao/helix.nix index 49f42d6..13e2c2a 100644 --- a/users/tao/helix.nix +++ b/users/tao/helix.nix @@ -80,6 +80,14 @@ "typst" ]; language = [ + { + name = "python"; + auto-format = true; + # formatter = { + # command = "ruff"; + # args = ["format"]; + # }; + } { name = "typst"; text-width = 100; diff --git a/users/tao/nushell/env.nu b/users/tao/nushell/env.nu index 9997a87..30b491f 100644 --- a/users/tao/nushell/env.nu +++ b/users/tao/nushell/env.nu @@ -79,7 +79,7 @@ $env.NU_PLUGIN_DIRS = [ ] # To add entries to PATH (on Windows you might use Path), you can use the following pattern: -$env.PATH = ($env.PATH | split row (char esep) | prepend '/home/tao/.cargo/bin') +$env.PATH = ($env.PATH | split row (char esep) | prepend '/home/tao/.local/bin') $env.GOPATH = '/home/tao/.go'