Fix treesitter

This commit is contained in:
Dave Gallant
2022-09-30 14:08:10 +00:00
parent 099d4094db
commit 8c3cb93752
6 changed files with 20 additions and 17 deletions

24
flake.lock generated
View File

@@ -7,11 +7,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1663677921, "lastModified": 1664210064,
"narHash": "sha256-NfQnUfRrjv8DXeugdbQC5El+MMhShP42ohc8iM+UAdM=", "narHash": "sha256-df6nKVZe/yAhmJ9csirTPahc0dldwm3HBhCVNA6qWr0=",
"owner": "lnl7", "owner": "lnl7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "088c98a584a38b5f844bb9e9cd32eb28479ca6d7", "rev": "02d2551c927b7d65ded1b3c7cd13da5cc7ae3fcf",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -28,11 +28,11 @@
"utils": "utils" "utils": "utils"
}, },
"locked": { "locked": {
"lastModified": 1663932797, "lastModified": 1664449551,
"narHash": "sha256-IH8ZBW99W2k7wKLS+Sat9HiKX1TPZjFTnsPizK5crok=", "narHash": "sha256-iTStJtZB1+MppkT+95Ckqy2NDaISb+QcUkOAa0DS0io=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "de3758e31a3a1bc79d569f5deb5dac39791bf9b6", "rev": "864ff685fe6443101a0a8f3950d21bcb4330e56a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -62,11 +62,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1663229557, "lastModified": 1664452918,
"narHash": "sha256-1uU4nsDLXKG0AHc/VCsNBAEPkTA/07juYhcEWRb1O1E=", "narHash": "sha256-SfnQ2t5b9RTSIqO3PQBDlwrWn4l3t0F65sZtCKTl8eA=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "a0df6cd6e199df4a78c833c273781ea92fa62cfb", "rev": "12f905b731494bc59010f05a7467df8abdcf8d63",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -93,11 +93,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1663850217, "lastModified": 1664370076,
"narHash": "sha256-tp9nXo1/IdN/xN9m06ryy0QUAEfoN6K56ObM/1QTAjc=", "narHash": "sha256-NDnIo0nxJozLwEw0VPM+RApMA90uTfbvaNNtC5eB7Os=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "ae1dc133ea5f1538d035af41e5ddbc2ebcb67b90", "rev": "854fdc68881791812eddd33b2fed94b954979a8e",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@@ -376,7 +376,9 @@ in {
nvim-cmp nvim-cmp
nvim-lspconfig nvim-lspconfig
nvim-tree-lua nvim-tree-lua
nvim-treesitter /*
nvim-treesitter installed with packer for now
*/
nvim-ts-rainbow nvim-ts-rainbow
nvim-web-devicons nvim-web-devicons
packer-nvim packer-nvim

View File

@@ -114,6 +114,7 @@ vim.api.nvim_set_keymap("n", "<space>", "za", { silent = true, noremap = true })
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
require("packer").startup(function() require("packer").startup(function()
-- use({ "ms-jpq/coq.artifacts", branch = "artifacts" }) -- use({ "ms-jpq/coq.artifacts", branch = "artifacts" })
use({ "nvim-treesitter/nvim-treesitter" })
end) end)
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
@@ -255,7 +256,7 @@ require('gitsigns').setup()
-- treesitter -- treesitter
require("nvim-treesitter.configs").setup({ require("nvim-treesitter.configs").setup({
ensure_installed = "all", ensure_installed = {},
highlight = { highlight = {
enable = true, enable = true,

View File

@@ -36,7 +36,7 @@ in {
}; };
# Enable nix flakes # Enable nix flakes
nix.package = pkgs.nixFlakes; nix.package = pkgs.nixVersions.stable;
nix.extraOptions = '' nix.extraOptions = ''
experimental-features = nix-command flakes experimental-features = nix-command flakes
''; '';

View File

@@ -7,7 +7,7 @@
# Auto upgrade nix package and the daemon service. # Auto upgrade nix package and the daemon service.
services.nix-daemon.enable = true; services.nix-daemon.enable = true;
nix.package = pkgs.nixFlakes; nix.package = pkgs.nixVersions.stable;
programs.zsh = { programs.zsh = {
enable = true; enable = true;

View File

@@ -21,7 +21,7 @@ in {
viddy viddy
xclip xclip
wget wget
xdg_utils xdg-utils
yq-go yq-go
zip zip