daniel/dotfiles
1
0
Fork 0
Code Activity Actions

Fix tree-sitter integration/compilation

Browse source 
... by switching to the precompiled packages
This commit is contained in:
Daniel Kempkens 2022-01-20 23:11:19 +01:00
parent 8a6a63ba4e
commit c9998f927f
6 changed files with 76 additions and 71 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
config/nvim/lua/nifoc/config/treesitter.lua
View file

@ -18,7 +18,7 @@ treesitter.define_modules {
} }
treesitter_config.setup { treesitter_config.setup {
ensure_installed = "maintained", ensure_installed = false,
highlight = { highlight = {
enable = true, enable = true,
}, },

24
flake.lock
View file

@ -38,11 +38,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1642117744, "lastModified": 1642676973,
"narHash": "sha256-/SvxBe/m6JiRSlKIrgD6LQxee9GGewFyq+lsPxoViMY=", "narHash": "sha256-bLQ6n0pXYaIuNSyJnm30JGCfjmuTi59qAmj8S2ExDXI=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "a5dd5d5f197724f3065fd39c59c7ccea3c8dcb8f", "rev": "7eb5106548eaab99ebeb21c87f93092de54fe931",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -61,11 +61,11 @@
}, },
"locked": { "locked": {
"dir": "contrib", "dir": "contrib",
"lastModified": 1642316915, "lastModified": 1642625619,
"narHash": "sha256-6afFNKsYHSOAupMUmFKKZ9l1YD2pAGKVoZZfJHzUia4=", "narHash": "sha256-i4aj1DrrkzbTMvFM/zoQzB06L11HoqYBvI2i/LOp5UU=",
"owner": "neovim", "owner": "neovim",
"repo": "neovim", "repo": "neovim",
"rev": "7085e5b0c8588618e643c87802afc515f67812d9", "rev": "431915fe6af4e176a84a60c95ad7aa9d36b71e50",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -84,11 +84,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1642320861, "lastModified": 1642666417,
"narHash": "sha256-gj68dBwDH0LjeBnt+03nbYiCwz97l7Ouz8/Ghbry4aY=", "narHash": "sha256-AeeQm6nSk5Nw832UvaZV6kx0k5IeXKc1POaVFP1ukUM=",
"owner": "nix-community", "owner": "nix-community",
"repo": "neovim-nightly-overlay", "repo": "neovim-nightly-overlay",
"rev": "41934fe7e0c6b2b338f6e3bcd6b756638b556319", "rev": "ce7c2f8b7d8697ed47414bae79ffd2d954a40688",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -119,11 +119,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1642069818, "lastModified": 1642336556,
"narHash": "sha256-666w6j8wl/bojfgpp0k58/UJ5rbrdYFbI2RFT2BXbSQ=", "narHash": "sha256-QSPPbFEwy0T0DrIuSzAACkaANPQaR1lZR/nHZGz9z04=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "46821ea01c8f54d2a20f5a503809abfc605269d7", "rev": "f3d9d4bd898cca7d04af2ae4f6ef01f2219df3d6",
"type": "github" "type": "github"
}, },
"original": { "original": {

2
home.nix
View file

@ -65,8 +65,6 @@
echo 'Done' echo 'Done'
echo -n 'Running LuaCacheClear: ' echo -n 'Running LuaCacheClear: '
nvim -c 'try | execute "LuaCacheClear" | echo "Done" | catch /.*/ | echo "Command not found" | endtry | q' --headless nvim -c 'try | execute "LuaCacheClear" | echo "Done" | catch /.*/ | echo "Command not found" | endtry | q' --headless
printf '\nRunning TSUpdateSync ... '
nvim -c 'try | execute "TSUpdateSync" | echo "Done" | catch /.*/ | echo "Command not found" | endtry | q' --headless
printf '\n' printf '\n'
''; '';

29
programs/nvim/default.nix
View file

@ -25,15 +25,11 @@ in
withPython3 = false; withPython3 = false;
extraConfig = '' extraConfig = ''
let $CC = '${pkgs.clang}/bin/clang'
let $CXX = '${pkgs.clang}/bin/clang++'
lua require('impatient') lua require('impatient')
lua require('nix_init') lua require('nix_init')
''; '';
extraPackages = with pkgs; [ extraPackages = with pkgs; [
clang
nodejs-16_x nodejs-16_x
tree-sitter tree-sitter
@ -76,7 +72,30 @@ in
dracula-nvim dracula-nvim
# Syntax # Syntax
nvim-treesitter (pkgs.vimPlugins.nvim-treesitter.withPlugins (
plugins: with plugins; [
tree-sitter-bash
tree-sitter-comment
tree-sitter-css
tree-sitter-dockerfile
tree-sitter-elixir
tree-sitter-erlang
tree-sitter-fish
tree-sitter-java
tree-sitter-javascript
tree-sitter-json
tree-sitter-make
tree-sitter-nix
tree-sitter-query
tree-sitter-regex
tree-sitter-ruby
tree-sitter-svelte
tree-sitter-toml
tree-sitter-typescript
tree-sitter-vim
tree-sitter-yaml
]
))
playground playground
Jenkinsfile-vim-syntax Jenkinsfile-vim-syntax

89
programs/nvim/plugins.nix
View file

@ -3,12 +3,12 @@
{ {
impatient-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix { impatient-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix {
pname = "impatient.nvim"; pname = "impatient.nvim";
version = "1640506679"; version = "1642507082";
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "lewis6991"; owner = "lewis6991";
repo = "impatient.nvim"; repo = "impatient.nvim";
rev = "3ea9abedb6941995b05fdad654d9cfd51c38a31f"; rev = "4df4e9360975a8be6e7a7270466fedfd1adcc5b6";
sha256 = "M33tmUHmwM2ukAsJzD5QSSh4Ewl9z6vg7jLzc96AaBk="; sha256 = "0CkM5JdSroilHkOIO/roLnrBbBjcPxe6AR1eqifJUSA=";
}; };
meta.homepage = "https://github.com/lewis6991/impatient.nvim"; meta.homepage = "https://github.com/lewis6991/impatient.nvim";
}; };
@ -36,12 +36,12 @@
}; };
which-key-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix { which-key-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix {
pname = "which-key.nvim"; pname = "which-key.nvim";
version = "1642056136"; version = "1642619077";
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "folke"; owner = "folke";
repo = "which-key.nvim"; repo = "which-key.nvim";
rev = "387fd676d3f9b419d38890820f6e262dc0fadb46"; rev = "28d2bd129575b5e9ebddd88506601290bb2bb221";
sha256 = "vumqkTgHN6PJgeiyq9oFqm4uw2NUzzu6/1pHS/uxH/0="; sha256 = "bz41c/zenRVVIkwtHHIi8wF/LZn2JEkFc6tkPv/BYY4=";
}; };
meta.homepage = "https://github.com/folke/which-key.nvim"; meta.homepage = "https://github.com/folke/which-key.nvim";
}; };
@ -89,17 +89,6 @@
}; };
meta.homepage = "https://github.com/Mofiqul/dracula.nvim"; meta.homepage = "https://github.com/Mofiqul/dracula.nvim";
}; };
nvim-treesitter = pkgs.vimUtils.buildVimPluginFrom2Nix {
pname = "nvim-treesitter";
version = "1642349814";
src = pkgs.fetchFromGitHub {
owner = "nvim-treesitter";
repo = "nvim-treesitter";
rev = "dada29a1e5ab458f3493e9e1175fe29a3aa341fb";
sha256 = "a6yEtIlyygfg9LEJadgyTmMG7qWsWXlwaGRSrcu/mX4=";
};
meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter";
};
playground = pkgs.vimUtils.buildVimPluginFrom2Nix { playground = pkgs.vimUtils.buildVimPluginFrom2Nix {
pname = "playground"; pname = "playground";
version = "1631739633"; version = "1631739633";
@ -146,12 +135,12 @@
}; };
telescope-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix { telescope-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix {
pname = "telescope.nvim"; pname = "telescope.nvim";
version = "1642348491"; version = "1642489815";
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "nvim-telescope"; owner = "nvim-telescope";
repo = "telescope.nvim"; repo = "telescope.nvim";
rev = "c1b9dab30030820999145ee6292fce7dc092c4fe"; rev = "0011b1148d3975600f5a9f0be8058cdaac4e30d9";
sha256 = "xT/jBDodKXmXUiPBOTp4+n9ac9wp2rlaOu1xec8rNhg="; sha256 = "0W3nHrNsunTarlLBKeZuH1zVaEyFzu2npStkfouCLIk=";
}; };
meta.homepage = "https://github.com/nvim-telescope/telescope.nvim"; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim";
}; };
@ -169,45 +158,45 @@
}; };
project-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix { project-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix {
pname = "project.nvim"; pname = "project.nvim";
version = "1636215460"; version = "1642582804";
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "ahmedkhalf"; owner = "ahmedkhalf";
repo = "project.nvim"; repo = "project.nvim";
rev = "71d0e23dcfc43cfd6bb2a97dc5a7de1ab47a6538"; rev = "cef52b8da07648b750d7f1e8fb93f12cb9482988";
sha256 = "RUPbmMPfa1lT2fIslC9vZR3e23IkOyPpYnWDytxkvUs="; sha256 = "BrseGCUZV689EbeLAme2PBeWOerwDV3lGaRTihS4l+M=";
}; };
meta.homepage = "https://github.com/ahmedkhalf/project.nvim"; meta.homepage = "https://github.com/ahmedkhalf/project.nvim";
}; };
nvim-lspconfig = pkgs.vimUtils.buildVimPluginFrom2Nix { nvim-lspconfig = pkgs.vimUtils.buildVimPluginFrom2Nix {
pname = "nvim-lspconfig"; pname = "nvim-lspconfig";
version = "1642267151"; version = "1642685354";
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "neovim"; owner = "neovim";
repo = "nvim-lspconfig"; repo = "nvim-lspconfig";
rev = "89eda6c9ba3ded27ecd38dfcee811c11c91eae05"; rev = "58f260a603fc73ff537569ff2e81510554e54e38";
sha256 = "NA705It5vYlXIHDXNa7Pg2ZarNss4b6cNedSydl0VX0="; sha256 = "Gch5CGQbPDAKrFM3frK5gDWAaTiI8l3b4oEmCoyD+dg=";
}; };
meta.homepage = "https://github.com/neovim/nvim-lspconfig"; meta.homepage = "https://github.com/neovim/nvim-lspconfig";
}; };
null-ls-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix { null-ls-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix {
pname = "null-ls.nvim"; pname = "null-ls.nvim";
version = "1642350939"; version = "1642623035";
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "jose-elias-alvarez"; owner = "jose-elias-alvarez";
repo = "null-ls.nvim"; repo = "null-ls.nvim";
rev = "069f60f63914c678ddbe09b2c0b898ea4228e4fb"; rev = "4d45075678db7442f4d78287efd11b08bd414bcd";
sha256 = "tl5+wcjfclq+HoxPoLPMwMGwxFlAlMOQYN2raaOAjwU="; sha256 = "dxHUzTeLAIrwGSbmCb4aRDhvascOtIZUR78xxgzwIGs=";
}; };
meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim"; meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim";
}; };
nvim-web-devicons = pkgs.vimUtils.buildVimPluginFrom2Nix { nvim-web-devicons = pkgs.vimUtils.buildVimPluginFrom2Nix {
pname = "nvim-web-devicons"; pname = "nvim-web-devicons";
version = "1640033101"; version = "1642530817";
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "kyazdani42"; owner = "kyazdani42";
repo = "nvim-web-devicons"; repo = "nvim-web-devicons";
rev = "ac71ca88b1136e1ecb2aefef4948130f31aa40d1"; rev = "634e26818f2bea9161b7efa76735746838971824";
sha256 = "DWbUhVTIhKYw+39rEHxUhDE7hRm3CtYMzfRDFj0j9Lk="; sha256 = "3zigwYJrw3gocsF2WqHMBS4cFkTyj78StiSP3o9S0N0=";
}; };
meta.homepage = "https://github.com/kyazdani42/nvim-web-devicons"; meta.homepage = "https://github.com/kyazdani42/nvim-web-devicons";
}; };
@ -246,12 +235,12 @@
}; };
nvim-cmp = pkgs.vimUtils.buildVimPluginFrom2Nix { nvim-cmp = pkgs.vimUtils.buildVimPluginFrom2Nix {
pname = "nvim-cmp"; pname = "nvim-cmp";
version = "1642262453"; version = "1642667165";
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "hrsh7th"; owner = "hrsh7th";
repo = "nvim-cmp"; repo = "nvim-cmp";
rev = "a54064d940ee3a34f94d596602fc958eb5c2bfcb"; rev = "1797f9e1acd2e0b5b4b6805928aebc1dcc0ecbff";
sha256 = "bjdlhS8VLZbcg9bMVhdDzb1mgRoAe4YMpNH/dlNYb08="; sha256 = "YYi/5ed4efAuimzCYITDcnoT6+kVPKgXWBd7H/WgUYg=";
}; };
meta.homepage = "https://github.com/hrsh7th/nvim-cmp"; meta.homepage = "https://github.com/hrsh7th/nvim-cmp";
}; };
@ -312,12 +301,12 @@
}; };
cmp-path = pkgs.vimUtils.buildVimPluginFrom2Nix { cmp-path = pkgs.vimUtils.buildVimPluginFrom2Nix {
pname = "cmp-path"; pname = "cmp-path";
version = "1640869280"; version = "1642430705";
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "hrsh7th"; owner = "hrsh7th";
repo = "cmp-path"; repo = "cmp-path";
rev = "4d58224e315426e5ac4c5b218ca86cab85f80c79"; rev = "c5230cb439df9547294678d0f1c1465ad7989e5f";
sha256 = "d82E/Vl4a/WGAVKWuPYXjZO/jVo+7aKp05JaRoA6dgU="; sha256 = "qKPYOW+Nid3CdFJfeU1JVb9zaDZAk2F/WQ4ddjNDRnk=";
}; };
meta.homepage = "https://github.com/hrsh7th/cmp-path"; meta.homepage = "https://github.com/hrsh7th/cmp-path";
}; };
@ -400,12 +389,12 @@
}; };
nvim-treesitter-textobjects = pkgs.vimUtils.buildVimPluginFrom2Nix { nvim-treesitter-textobjects = pkgs.vimUtils.buildVimPluginFrom2Nix {
pname = "nvim-treesitter-textobjects"; pname = "nvim-treesitter-textobjects";
version = "1641756003"; version = "1642552023";
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "nvim-treesitter"; owner = "nvim-treesitter";
repo = "nvim-treesitter-textobjects"; repo = "nvim-treesitter-textobjects";
rev = "99600641de75419f7729698acf9dc3d79117ff70"; rev = "c2e643b5db31e90f034c5412f38913523090378e";
sha256 = "U7io/9F9Se9bLGHDHwnm6PisCZKjs4FzrsBTkBoVXHg="; sha256 = "rLTGeaiZwltEBdcTeztyyxuArMEfAbaKR884o5GEXHs=";
}; };
meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects"; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects";
}; };
@ -422,12 +411,12 @@
}; };
vim-matchup = pkgs.vimUtils.buildVimPluginFrom2Nix { vim-matchup = pkgs.vimUtils.buildVimPluginFrom2Nix {
pname = "vim-matchup"; pname = "vim-matchup";
version = "1641663154"; version = "1642550757";
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "andymass"; owner = "andymass";
repo = "vim-matchup"; repo = "vim-matchup";
rev = "0981e4d5e0ad25688362b875269499ce6de36101"; rev = "43483d27bc7abdd8f7c8c71f4d0bbf56d62e0461";
sha256 = "iD3xd3Zuc387FlDyhk6KbL7GFvUW4cFG1TX3GJ9AwRM="; sha256 = "ZoMycEo29MkVo/5lZwj1pY6DJW7UMqAUgpoVym0cxV8=";
}; };
meta.homepage = "https://github.com/andymass/vim-matchup"; meta.homepage = "https://github.com/andymass/vim-matchup";
}; };
@ -510,12 +499,12 @@
}; };
gitsigns-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix { gitsigns-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix {
pname = "gitsigns.nvim"; pname = "gitsigns.nvim";
version = "1642235414"; version = "1642699957";
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "lewis6991"; owner = "lewis6991";
repo = "gitsigns.nvim"; repo = "gitsigns.nvim";
rev = "f4648dcc055a10573f36e83343592824155ab466"; rev = "ddffc618ea9e11ae57129549e0eccf832cb8b37d";
sha256 = "/vdH8rdEvCY5xj2ZwjNZsX1oWXq1Xuqu0B96mjjGsNU="; sha256 = "6w+qUFLYO5J2dcXYE85mvlpajHcuzNEvEIlEBOgde1Y=";
}; };
meta.homepage = "https://github.com/lewis6991/gitsigns.nvim"; meta.homepage = "https://github.com/lewis6991/gitsigns.nvim";
}; };
@ -576,12 +565,12 @@
}; };
todo-comments-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix { todo-comments-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix {
pname = "todo-comments.nvim"; pname = "todo-comments.nvim";
version = "1639214028"; version = "1642601933";
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "folke"; owner = "folke";
repo = "todo-comments.nvim"; repo = "todo-comments.nvim";
rev = "672cd22bd15928434374ac52d0cf38dd250231df"; rev = "98b1ebf198836bdc226c0562b9f906584e6c400e";
sha256 = "16damc7E0J9dXTIe4pSWrbPoobZDRh1FQ1XyFzJvnoE="; sha256 = "8uj5TxO9XZlSCB4lVRbKRc1IlUEKcBf/4bDviwuxEgs=";
}; };
meta.homepage = "https://github.com/folke/todo-comments.nvim"; meta.homepage = "https://github.com/folke/todo-comments.nvim";
}; };

1
programs/nvim/plugins.txt
View file

@ -6,7 +6,6 @@ svermeulen/vim-yoink
svermeulen/vim-cutlass svermeulen/vim-cutlass
svermeulen/vim-subversive svermeulen/vim-subversive
Mofiqul/dracula.nvim Mofiqul/dracula.nvim
nvim-treesitter/nvim-treesitter
nvim-treesitter/playground nvim-treesitter/playground
martinda/Jenkinsfile-vim-syntax martinda/Jenkinsfile-vim-syntax
nvim-lua/popup.nvim nvim-lua/popup.nvim