From d5fb5ba07be683263bd202ec312a7f1664e8438c Mon Sep 17 00:00:00 2001 From: Filippo Berto Date: Fri, 28 Mar 2025 11:31:48 +0100 Subject: [PATCH] Clear out python + fix vim config --- instances/sif/hm.nix | 2 +- modules/hm/development/python.nix | 2 +- modules/hm/vim.nix | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/instances/sif/hm.nix b/instances/sif/hm.nix index d1e72f7..601549a 100644 --- a/instances/sif/hm.nix +++ b/instances/sif/hm.nix @@ -75,7 +75,7 @@ ../../modules/hm/development/latex.nix ../../modules/hm/development/markdown.nix ../../modules/hm/development/nix.nix - ../../modules/hm/development/python.nix + # ../../modules/hm/development/python.nix # ../../modules/hm/development/rust.nix ../../modules/hm/development/web.nix diff --git a/modules/hm/development/python.nix b/modules/hm/development/python.nix index 77c59e4..1e271cb 100644 --- a/modules/hm/development/python.nix +++ b/modules/hm/development/python.nix @@ -13,6 +13,7 @@ in [ py pyPkgs.black + pkgs.ruff ] ++ lib.optionals config.programs.helix.enable ( (builtins.attrValues { inherit (pyPkgs) python-lsp-server pyls-flake8 pyls-isort; }) @@ -22,5 +23,4 @@ in (builtins.attrValues { inherit (pyPkgs) python-lsp-server pyls-flake8 pyls-isort; }) ++ pyPkgs.python-lsp-server.optional-dependencies.all ); - programs.neovim.withPython3 = true; } diff --git a/modules/hm/vim.nix b/modules/hm/vim.nix index 32a98b1..4ee9cf2 100644 --- a/modules/hm/vim.nix +++ b/modules/hm/vim.nix @@ -11,6 +11,8 @@ in vimAlias = true; vimdiffAlias = true; + withPython3 = true; + plugins = [ vp.plenary-nvim