From 31145354fba30c6c39dc1882b30f1b2bea4a7842 Mon Sep 17 00:00:00 2001 From: EdenQwQ Date: Fri, 21 Mar 2025 17:25:44 +0800 Subject: [PATCH] use ruff for py --- flake.nix | 2 +- home/lib/colorScheme/matu2base16.py | 6 ++---- home/lib/colorScheme/recolor.py | 1 - home/programs/coding/nixvim/lsp.nix | 4 ++-- 4 files changed, 5 insertions(+), 8 deletions(-) diff --git a/flake.nix b/flake.nix index e466328..8a9de47 100644 --- a/flake.nix +++ b/flake.nix @@ -20,7 +20,7 @@ treefmt = { projectRootFile = "flake.nix"; programs.nixfmt.enable = true; - programs.black.enable = true; + programs.ruff-format.enable = true; programs.prettier.enable = true; programs.beautysh.enable = true; programs.toml-sort.enable = true; diff --git a/home/lib/colorScheme/matu2base16.py b/home/lib/colorScheme/matu2base16.py index 47d4cce..9f0fc03 100644 --- a/home/lib/colorScheme/matu2base16.py +++ b/home/lib/colorScheme/matu2base16.py @@ -56,7 +56,7 @@ matugen_output = subprocess.run( colors = json.loads(matugen_output)["colors"][polarity] base16_colors = { - name: f'"{colors[hex].strip("\'")}"' for name, hex in base16_map.items() + name: f'"{colors[hex].strip("'")}"' for name, hex in base16_map.items() } yaml_content = f"""system: "base16" @@ -64,9 +64,7 @@ name: "{name}" author: "matugen" variant: "{polarity}" palette: -""" + "\n".join( - [f" {k}: {v}" for k, v in base16_colors.items()] -) +""" + "\n".join([f" {k}: {v}" for k, v in base16_colors.items()]) with open(output, "w") as f: f.write(yaml_content) diff --git a/home/lib/colorScheme/recolor.py b/home/lib/colorScheme/recolor.py index a7a8209..382093b 100644 --- a/home/lib/colorScheme/recolor.py +++ b/home/lib/colorScheme/recolor.py @@ -454,7 +454,6 @@ def closest_match(color: str, palette: Dict[str, Lab]) -> str: min_distance = float("inf") for entry in palette: - # Prior dictionary lookup and update. lab_color = hex_to_lab_dict.get(color) diff --git a/home/programs/coding/nixvim/lsp.nix b/home/programs/coding/nixvim/lsp.nix index 6b90da4..face2ba 100644 --- a/home/programs/coding/nixvim/lsp.nix +++ b/home/programs/coding/nixvim/lsp.nix @@ -27,7 +27,7 @@ }; }; servers = { - pyright.enable = true; + ruff.enable = true; lua_ls.enable = true; bashls.enable = true; nixd = { @@ -92,7 +92,7 @@ "injected" ]; yaml = [ "yamlfmt" ]; - python = [ "black" ]; + python = [ "ruff" ]; tex = [ "latexindent" ]; }; formatters = {