From 8c3cb9375212ebcacda1f9aca8286264af230ea4 Mon Sep 17 00:00:00 2001 From: Dave Gallant Date: Fri, 30 Sep 2022 14:08:10 +0000 Subject: [PATCH] Fix treesitter --- flake.lock | 24 ++++++++++++------------ home/default.nix | 4 +++- home/nvim/lua/init.lua | 3 ++- machines/aether/configuration.nix | 2 +- machines/zelus/configuration.nix | 2 +- packages/common.nix | 2 +- 6 files changed, 20 insertions(+), 17 deletions(-) diff --git a/flake.lock b/flake.lock index e32ec1b..7323fa7 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1663677921, - "narHash": "sha256-NfQnUfRrjv8DXeugdbQC5El+MMhShP42ohc8iM+UAdM=", + "lastModified": 1664210064, + "narHash": "sha256-df6nKVZe/yAhmJ9csirTPahc0dldwm3HBhCVNA6qWr0=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "088c98a584a38b5f844bb9e9cd32eb28479ca6d7", + "rev": "02d2551c927b7d65ded1b3c7cd13da5cc7ae3fcf", "type": "github" }, "original": { @@ -28,11 +28,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1663932797, - "narHash": "sha256-IH8ZBW99W2k7wKLS+Sat9HiKX1TPZjFTnsPizK5crok=", + "lastModified": 1664449551, + "narHash": "sha256-iTStJtZB1+MppkT+95Ckqy2NDaISb+QcUkOAa0DS0io=", "owner": "nix-community", "repo": "home-manager", - "rev": "de3758e31a3a1bc79d569f5deb5dac39791bf9b6", + "rev": "864ff685fe6443101a0a8f3950d21bcb4330e56a", "type": "github" }, "original": { @@ -62,11 +62,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1663229557, - "narHash": "sha256-1uU4nsDLXKG0AHc/VCsNBAEPkTA/07juYhcEWRb1O1E=", + "lastModified": 1664452918, + "narHash": "sha256-SfnQ2t5b9RTSIqO3PQBDlwrWn4l3t0F65sZtCKTl8eA=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "a0df6cd6e199df4a78c833c273781ea92fa62cfb", + "rev": "12f905b731494bc59010f05a7467df8abdcf8d63", "type": "github" }, "original": { @@ -93,11 +93,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1663850217, - "narHash": "sha256-tp9nXo1/IdN/xN9m06ryy0QUAEfoN6K56ObM/1QTAjc=", + "lastModified": 1664370076, + "narHash": "sha256-NDnIo0nxJozLwEw0VPM+RApMA90uTfbvaNNtC5eB7Os=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ae1dc133ea5f1538d035af41e5ddbc2ebcb67b90", + "rev": "854fdc68881791812eddd33b2fed94b954979a8e", "type": "github" }, "original": { diff --git a/home/default.nix b/home/default.nix index 549322d..24b1567 100644 --- a/home/default.nix +++ b/home/default.nix @@ -376,7 +376,9 @@ in { nvim-cmp nvim-lspconfig nvim-tree-lua - nvim-treesitter + /* + nvim-treesitter installed with packer for now + */ nvim-ts-rainbow nvim-web-devicons packer-nvim diff --git a/home/nvim/lua/init.lua b/home/nvim/lua/init.lua index 3254c07..4fea520 100644 --- a/home/nvim/lua/init.lua +++ b/home/nvim/lua/init.lua @@ -114,6 +114,7 @@ vim.api.nvim_set_keymap("n", "", "za", { silent = true, noremap = true }) ------------------------------------------------------------------------------- require("packer").startup(function() -- use({ "ms-jpq/coq.artifacts", branch = "artifacts" }) + use({ "nvim-treesitter/nvim-treesitter" }) end) ------------------------------------------------------------------------------- @@ -255,7 +256,7 @@ require('gitsigns').setup() -- treesitter require("nvim-treesitter.configs").setup({ - ensure_installed = "all", + ensure_installed = {}, highlight = { enable = true, diff --git a/machines/aether/configuration.nix b/machines/aether/configuration.nix index 52e4f27..e581822 100644 --- a/machines/aether/configuration.nix +++ b/machines/aether/configuration.nix @@ -36,7 +36,7 @@ in { }; # Enable nix flakes - nix.package = pkgs.nixFlakes; + nix.package = pkgs.nixVersions.stable; nix.extraOptions = '' experimental-features = nix-command flakes ''; diff --git a/machines/zelus/configuration.nix b/machines/zelus/configuration.nix index 81a76c3..8b1b213 100644 --- a/machines/zelus/configuration.nix +++ b/machines/zelus/configuration.nix @@ -7,7 +7,7 @@ # Auto upgrade nix package and the daemon service. services.nix-daemon.enable = true; - nix.package = pkgs.nixFlakes; + nix.package = pkgs.nixVersions.stable; programs.zsh = { enable = true; diff --git a/packages/common.nix b/packages/common.nix index 68a170a..b475b3e 100644 --- a/packages/common.nix +++ b/packages/common.nix @@ -21,7 +21,7 @@ in { viddy xclip wget - xdg_utils + xdg-utils yq-go zip