From 8608f855a8708ddb7c4c3c61570782b00c623da7 Mon Sep 17 00:00:00 2001 From: Tyrel Souza Date: Mon, 2 Jan 2023 18:12:45 -0500 Subject: [PATCH] ag, and vim stuff --- home/config/nvim/lua/plugins.lua | 19 +++++++++---------- hosts/_common/home.nix | 1 + hosts/_common/programs.nix | 18 +++++++++--------- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/home/config/nvim/lua/plugins.lua b/home/config/nvim/lua/plugins.lua index 5350799..0700576 100644 --- a/home/config/nvim/lua/plugins.lua +++ b/home/config/nvim/lua/plugins.lua @@ -2,17 +2,16 @@ vim.cmd([[autocmd BufWritePost plugins.lua PackerCompile]]) return function(use) -- Prevents reinstall of treesitter plugins every boot - local parser_install_dir = vim.fn.stdpath("cache") .. "/treesitters" - vim.fn.mkdir(parser_install_dir, "p") - vim.opt.runtimepath:append(parser_install_dir) + -- local parser_install_dir = vim.fn.stdpath("cache") .. "/treesitters" + -- vim.fn.mkdir(parser_install_dir, "p") + -- vim.opt.runtimepath:append(parser_install_dir) - -- Treesitter is managed by the package config, we just manage configs/deps here - use({ "nvim-treesitter/nvim-treesitter-refactor" }) - use({ "RRethy/nvim-treesitter-textsubjects" }) - - require("nvim-treesitter.configs").setup({ - parser_install_dir = parser_install_dir, - }) + -- -- Treesitter is managed by the package config, we just manage configs/deps here + -- use({ "nvim-treesitter/nvim-treesitter-refactor" }) + -- use({ "RRethy/nvim-treesitter-textsubjects" }) + -- require("nvim-treesitter.configs").setup({ + -- parser_install_dir = parser_install_dir, + -- }) use({'atelierbram/vim-colors_atelier-schemes'}) use({'robertmeta/nofrils'}) diff --git a/hosts/_common/home.nix b/hosts/_common/home.nix index 2f7a3f0..e710fbe 100644 --- a/hosts/_common/home.nix +++ b/hosts/_common/home.nix @@ -13,6 +13,7 @@ fd ripgrep tree-sitter + silver-searcher wget ]; diff --git a/hosts/_common/programs.nix b/hosts/_common/programs.nix index 7b155bb..8f39f90 100644 --- a/hosts/_common/programs.nix +++ b/hosts/_common/programs.nix @@ -23,17 +23,17 @@ programs.neovim = { enable = true; - plugins = with pkgs.vimPlugins; [ - # Inject tree-sitters, since they're annoying to maintain with sideloading - (nvim-treesitter.withPlugins (plugins: pkgs.tree-sitter.allGrammars)) - ]; + #plugins = with pkgs.vimPlugins; [ + # # Inject tree-sitters, since they're annoying to maintain with sideloading + # (nvim-treesitter.withPlugins (plugins: pkgs.tree-sitter.allGrammars)) + #]; # We used to manage our own init.lua but now we want the home-manager # managed init.vim to load our init.lua which makes this a little dirty. - extraConfig = '' - lua << EOF - ${builtins.readFile ../../home/config/nvim/init.lua} - EOF - ''; + # extraConfig = '' + # lua << EOF + # ${builtins.readFile ../../home/config/nvim/init.lua} + # EOF + # ''; }; programs.fish = {