feat: migrate away from poetry

mirkolenz · Jan 10, 2025 · 6434fb7 · 6434fb7
1 parent 8e5fc8b
commit 6434fb7
Show file tree

Hide file tree

Showing 5 changed files with 58 additions and 66 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -113,7 +113,6 @@
       url = "github:recap-utr/arguebuf-python/v2";
       inputs.nixpkgs.follows = "nixpkgs";
       inputs.flake-parts.follows = "flake-parts";
-      inputs.poetry2nix.follows = "poetry2nix";
       inputs.flocken.follows = "flocken";
     };
 
@@ -133,10 +132,6 @@
       inputs.uv2nix.follows = "uv2nix";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    poetry2nix = {
-      url = "github:nix-community/poetry2nix";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
     nixos-generators = {
       url = "github:nix-community/nixos-generators";
       inputs.nixpkgs.follows = "nixpkgs-linux-unstable";

diff --git a/home/mlenz/packages/default.nix b/home/mlenz/packages/default.nix
@@ -61,8 +61,8 @@
     edir
   ];
   home.shellAliases = {
-    py = "poetry run python"; # should use local poetry if possible
-    cat = lib.getExe pkgs.bat;
+    py = "${lib.getExe config.programs.uv.package} run";
+    cat = lib.getExe config.programs.bat.package;
     l = "ll";
     sudo =
       let

diff --git a/home/mlenz/packages/workstation.nix b/home/mlenz/packages/workstation.nix
@@ -2,7 +2,6 @@
   pkgs,
   lib,
   osConfig,
-  config,
   ...
 }:
 let
@@ -74,7 +73,6 @@ lib.mkIf (pkgs.stdenv.isDarwin || (osConfig.services.xserver.enable or false)) {
     # my own packages
     makejinja
     # arguebuf
-    (writeShellScriptBin "poetryup" ''exec ${lib.getExe config.programs.poetry.package} up "$@"'')
     (writeShellScriptBin "npmup" ''exec ${lib.getExe npm-check-updates} "$@"'')
   ];
 }
diff --git a/home/mlenz/programs/poetry.nix b/home/mlenz/programs/poetry.nix
@@ -1,8 +1,7 @@
-{ pkgs, ... }:
+{ ... }:
 {
   programs.poetry = {
     enable = true;
-    package = pkgs.poetry.withPlugins (ps: with ps; [ poetry-plugin-up ]);
     settings = {
       virtualenvs = {
         in-project = true;