Merge remote-tracking branch 'refs/remotes/origin/main'

This commit is contained in:
Tyrel Souza 2023-01-02 13:18:27 -05:00
commit 9053a872c1
4 changed files with 6 additions and 15 deletions

View File

@ -30,7 +30,6 @@ call plug#begin('~/.vim/plugged')
Plug 'whatyouhide/vim-gotham'
Plug 'nanotech/jellybeans.vim'
Plug 'sickill/vim-monokai'
Plug 'nvim-treesitter/nvim-treesitter', {'do': ':TSUpdate'}
Plug 'flebel/vim-mypy', { 'for': 'python', 'branch': 'bugfix/fast_parser_is_default_and_only_parser' }
Plug 'tpope/vim-fugitive'
Plug 'tpope/vim-rhubarb'
@ -147,16 +146,6 @@ endfunction
" TreeSitter
lua <<EOF
require'nvim-treesitter.configs'.setup {
-- One of "all", "maintained" (parsers with maintainers), or a list of languages
ensure_installed = "all",
-- Install languages synchronously (only applied to `ensure_installed`)
sync_install = false,
auto_install = true,
-- List of parsers to ignore installing
ignore_install = {},
highlight = {
-- `false` will disable the whole extension
enable = true,

View File

@ -11,6 +11,7 @@
exa
fzf
ripgrep
tree-sitter
wget
];

View File

@ -23,9 +23,10 @@
programs.neovim = {
enable = true;
};
programs.fish = {
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))
];
};

View File

@ -2,5 +2,5 @@
NIX_PATH=nixpkgs=/nix/var/nix/profiles/per-user/tyrel/channels/nixpkgs:/nix/var/nix/profiles/per-user/tyrel/channels
#nix run ./_ubuntu switch -vv
nix run ./_ubuntu switch -vv
home-manager switch --flake ./_ubuntu