Compare commits
2 Commits
e40bc60628
...
abac563854
Author | SHA1 | Date |
---|---|---|
pegasust | abac563854 | |
pegasust | 9b5ef176ed |
|
@ -119,6 +119,10 @@
|
||||||
lola = "log --graph --decorate --pretty=oneline --abbrev-commit --all";
|
lola = "log --graph --decorate --pretty=oneline --abbrev-commit --all";
|
||||||
sts = "status";
|
sts = "status";
|
||||||
};
|
};
|
||||||
|
# No idea why this is not appearing in home-manager search
|
||||||
|
# It's in source code, though
|
||||||
|
userName="pegasust";
|
||||||
|
userEmail="pegasucksgg@gmail.com";
|
||||||
extraConfig = {
|
extraConfig = {
|
||||||
merge = { tool = "vimdiff"; conflictstyle = "diff3"; };
|
merge = { tool = "vimdiff"; conflictstyle = "diff3"; };
|
||||||
};
|
};
|
||||||
|
|
|
@ -45,7 +45,7 @@ Plug('hrsh7th/cmp-buffer')
|
||||||
Plug('hrsh7th/cmp-cmdline')
|
Plug('hrsh7th/cmp-cmdline')
|
||||||
Plug('hrsh7th/nvim-cmp')
|
Plug('hrsh7th/nvim-cmp')
|
||||||
Plug('onsails/lspkind-nvim')
|
Plug('onsails/lspkind-nvim')
|
||||||
Plug('yioneko/nvim-yati') -- hopefully fixes Python indentation auto-correct from Tree-sitter
|
Plug('yioneko/nvim-yati', { tag = '*'}) -- hopefully fixes Python indentation auto-correct from Tree-sitter
|
||||||
-- Plug('tzachar/cmp-tabnine', { ['do'] = './install.sh' })
|
-- Plug('tzachar/cmp-tabnine', { ['do'] = './install.sh' })
|
||||||
|
|
||||||
-- DevExp
|
-- DevExp
|
||||||
|
@ -281,7 +281,8 @@ end, { desc = '[Z]ettelkasten [G]rep' })
|
||||||
|
|
||||||
-- treesitter
|
-- treesitter
|
||||||
require('nvim-treesitter.configs').setup {
|
require('nvim-treesitter.configs').setup {
|
||||||
yati = { enable = true, default_lazy = true },
|
yati = { enable = true, default_lazy = true, default_fallback = "auto"},
|
||||||
|
indent = { enable = false },
|
||||||
ensure_installed = {
|
ensure_installed = {
|
||||||
'tsx', 'toml', 'lua', 'typescript', 'rust', 'go', 'yaml', 'json', 'php', 'css',
|
'tsx', 'toml', 'lua', 'typescript', 'rust', 'go', 'yaml', 'json', 'php', 'css',
|
||||||
'python', 'prisma', 'html', "dockerfile", "c", "cpp", "hcl", "svelte", "astro",
|
'python', 'prisma', 'html', "dockerfile", "c", "cpp", "hcl", "svelte", "astro",
|
||||||
|
@ -289,7 +290,6 @@ require('nvim-treesitter.configs').setup {
|
||||||
},
|
},
|
||||||
sync_install = false,
|
sync_install = false,
|
||||||
highlight = { enable = true },
|
highlight = { enable = true },
|
||||||
indent = { enable = false },
|
|
||||||
incremental_selection = {
|
incremental_selection = {
|
||||||
enable = true,
|
enable = true,
|
||||||
keymaps = {
|
keymaps = {
|
||||||
|
@ -496,6 +496,7 @@ cmp.setup {
|
||||||
{ name = 'nvim_lsp' },
|
{ name = 'nvim_lsp' },
|
||||||
{ name = 'luasnip' },
|
{ name = 'luasnip' },
|
||||||
{ name = 'buffer' },
|
{ name = 'buffer' },
|
||||||
|
{ name = 'path' },
|
||||||
-- { name = 'cmp_tabnine' },
|
-- { name = 'cmp_tabnine' },
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue