diff --git a/flake.lock b/flake.lock index 40dd4a5..eacccb8 100644 --- a/flake.lock +++ b/flake.lock @@ -140,16 +140,16 @@ "gnome-shell": { "flake": false, "locked": { - "lastModified": 1713702291, - "narHash": "sha256-zYP1ehjtcV8fo+c+JFfkAqktZ384Y+y779fzmR9lQAU=", + "lastModified": 1732369855, + "narHash": "sha256-JhUWbcYPjHO3Xs3x9/Z9RuqXbcp5yhPluGjwsdE2GMg=", "owner": "GNOME", "repo": "gnome-shell", - "rev": "0d0aadf013f78a7f7f1dc984d0d812971864b934", + "rev": "dadd58f630eeea41d645ee225a63f719390829dc", "type": "github" }, "original": { "owner": "GNOME", - "ref": "46.1", + "ref": "47.2", "repo": "gnome-shell", "type": "github" } @@ -246,11 +246,11 @@ ] }, "locked": { - "lastModified": 1733780592, - "narHash": "sha256-SCEjUwyt6R2+36BS7xQG+rHUrhE8HDpmRwQzKHJkimQ=", + "lastModified": 1733847310, + "narHash": "sha256-VHzWuZYK/m5OFXzAczrjnI7vH6knj0sfLnziRVDqgFE=", "owner": "nix-community", "repo": "nixvim", - "rev": "cf7e026c8c86c5548d270e20c04f456939591219", + "rev": "b752606681ded3f69e99ed568c7075b3578dce48", "type": "github" }, "original": { @@ -298,11 +298,11 @@ "tinted-tmux": "tinted-tmux" }, "locked": { - "lastModified": 1732993760, - "narHash": "sha256-t1J6wgzGjvvGNfdd0ei8HnZf9sTw+SpvCNAX0i6Qgwc=", + "lastModified": 1733859110, + "narHash": "sha256-Tg2uBKzy0mHhmMJqYTWhAEal0JafVDNGh6hnNUaMENE=", "owner": "danth", "repo": "stylix", - "rev": "d13ffb381c83b6139b9d67feff7addf18f8408fe", + "rev": "072a313b45f960758f449cab51378bc084c413c2", "type": "github" }, "original": { @@ -399,11 +399,11 @@ }, "unstable": { "locked": { - "lastModified": 1733581040, - "narHash": "sha256-Qn3nPMSopRQJgmvHzVqPcE3I03zJyl8cSbgnnltfFDY=", + "lastModified": 1733759999, + "narHash": "sha256-463SNPWmz46iLzJKRzO3Q2b0Aurff3U1n0nYItxq7jU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "22c3f2cf41a0e70184334a958e6b124fb0ce3e01", + "rev": "a73246e2eef4c6ed172979932bc80e1404ba2d56", "type": "github" }, "original": { diff --git a/nvim/dev-plugins.nix b/nvim/dev-plugins.nix index b29f66b..00a46e7 100644 --- a/nvim/dev-plugins.nix +++ b/nvim/dev-plugins.nix @@ -9,13 +9,13 @@ let inherit (helpers) enableExceptInTests; cfg = config.jhome.nvim; enabledLSPs = [ + "basedpyright" "bashls" "clangd" # "html" # Not writing html "jsonls" "marksman" "nixd" - "pyright" "ruff" "taplo" # "texlab" # Not using it @@ -45,6 +45,13 @@ in lsp = { enable = true; servers = { + # Pyright needs to have the project root set? + basedpyright.rootDir = # lua + '' + function() + return vim.fs.root(0, {'flake.nix', '.git', '.jj', 'pyproject.toml', 'setup.py'}) + end + ''; bashls.package = lib.mkDefault pkgs.bash-language-server; # Adds ~2 GiB, install in a devShell instead clangd.package = lib.mkDefault null;