diff --git a/config.nix b/config.nix index a732c0ef12392421e6fa94a620645cb85d0cb4e0..414a68ba9bb4a7852d4f063520a830a8e5a2020b 100644 --- a/config.nix +++ b/config.nix @@ -254,7 +254,7 @@ formatter = { command = "sh"; args = [ "-c" - "set -o pipefail; ${lib.getExe' gotools "goimports"} | ${lib.getExe gofumpt}" + "set -o pipefail; ${gotools}/bin/goimports | ${gofumpt}/bin/gofumpt" ]; }; } @@ -262,7 +262,7 @@ { name = "nix"; auto-format = true; formatter = { - command = "${lib.getExe nixfmt-rfc-style}"; + command = "${nixfmt-rfc-style}/bin/nixfmt"; args = [ "-q" ]; }; } @@ -270,44 +270,13 @@ { name = "jsonnet"; auto-format = true; formatter = { - command = "${lib.getExe' jsonnet "jsonnet"}"; + command = "${jsonnet}/bin/jsonnetfmt"; args = [ "-" ]; }; } - { - name = "python"; - auto-format = true; - formatter = { - args = [ - "format" - "--stdin-filename" - "file.py" - "-" - ]; - command = "${lib.getExe ruff}"; - }; - language-servers = [ "pylsp" ]; - } ]; language-server = { nil.config.nil.nix.flake.autoEvalInputs = true; - pylsp.config.pylsp = { - plugins = { - flake8.enabled = false; - mypy = { - dmypy = true; - enabled = true; - report_progress = true; - }; - pycodestyle.enabled = false; - pyflakes.enabled = false; - ruff = { - enabled = true; - extendSelect = [ "I" ]; - format = [ "I" ]; - }; - }; - }; }; }; themes = { diff --git a/flake.nix b/flake.nix index 4b676d1fc0ac8e1a8656441631accca9561c92ef..d7cf81a76a8b99b6f8d9d607826ebe87f02dab52 100644 --- a/flake.nix +++ b/flake.nix @@ -83,9 +83,7 @@ { packages.x86_64-linux.default = pkgs.runCommand "hx" { - buildInputs = with pkgs; [ - makeWrapper - ]; + buildInputs = [ pkgs.makeWrapper ]; } '' mkdir $out @@ -114,9 +112,7 @@ mkdir -p $out/home/git ln -s ${ignoreFile} $out/home/git/ignore - makeWrapper ${pkgs.helix}/bin/hx $out/bin/hx \ - --set HELIX_RUNTIME $out/lib/runtime \ - --set XDG_CONFIG_HOME $out/home \ + makeWrapper ${pkgs.helix}/bin/hx $out/bin/hx --set HELIX_RUNTIME $out/lib/runtime --set XDG_CONFIG_HOME $out/home ''; }; }