From 08cc57ada1827ef4707132451e4ee9d2eddbfc24 Mon Sep 17 00:00:00 2001 From: Stefan Junker Date: Sat, 17 Aug 2024 17:19:34 +0200 Subject: [PATCH] feat: bump nix-direnv and tweak vscode nix LSP settings --- .envrc | 6 +++--- .vscode/settings.json | 19 ++++++++++++++++--- 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/.envrc b/.envrc index 831c737..fd277e4 100644 --- a/.envrc +++ b/.envrc @@ -1,5 +1,5 @@ -if ! has nix_direnv_version || ! nix_direnv_version 3.0.4; then - source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/3.0.4/direnvrc" "sha256-DzlYZ33mWF/Gs8DDeyjr8mnVmQGx7ASYqA5WlxwvBG4=" +if ! has nix_direnv_version || ! nix_direnv_version 3.0.5; then + source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/3.0.5/direnvrc" "sha256-RuwIS+QKFj/T9M2TFXScjBsLR6V3A17YVoEW/Q6AZ1w=" fi -use_flake .#develop +use flake .#develop diff --git a/.vscode/settings.json b/.vscode/settings.json index 0691bf9..8ace7b1 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,6 +1,19 @@ { - "nixEnvSelector.nixFile": "${workspaceRoot}/shell.nix", - "[nix]": { - "editor.defaultFormatter": "jnoortheen.nix-ide" + "nix.serverSettings": { + // settings for 'nil' LSP + "nil": { + "autoArchive": true, + "diagnostics": { + "ignored": [ + "unused_binding", + "unused_with" + ] + }, + "formatting": { + "command": [ + "alejandra", + ] + } + } }, }