home-nix/home.nix

@@ -119,10 +119,6 @@
       lola = "log --graph --decorate --pretty=oneline --abbrev-commit --all";
       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 = {
       merge = { tool = "vimdiff"; conflictstyle = "diff3"; };
     };

neovim/init.lua

@@ -45,7 +45,7 @@ Plug('hrsh7th/cmp-buffer')
 Plug('hrsh7th/cmp-cmdline')
 Plug('hrsh7th/nvim-cmp')
 Plug('onsails/lspkind-nvim')
-Plug('yioneko/nvim-yati', { tag = '*'}) -- hopefully fixes Python indentation auto-correct from Tree-sitter
+Plug('yioneko/nvim-yati') -- hopefully fixes Python indentation auto-correct from Tree-sitter
 -- Plug('tzachar/cmp-tabnine', { ['do'] = './install.sh' })
 
 -- DevExp
@@ -281,8 +281,7 @@ end, { desc = '[Z]ettelkasten [G]rep' })
 
 -- treesitter
 require('nvim-treesitter.configs').setup {
-    yati = { enable = true, default_lazy = true, default_fallback = "auto"},
-    indent = { enable = false },
+    yati = { enable = true, default_lazy = true },
     ensure_installed = {
         'tsx', 'toml', 'lua', 'typescript', 'rust', 'go', 'yaml', 'json', 'php', 'css',
         'python', 'prisma', 'html', "dockerfile", "c", "cpp", "hcl", "svelte", "astro",
@@ -290,6 +289,7 @@ require('nvim-treesitter.configs').setup {
     },
     sync_install = false,
     highlight = { enable = true },
+    indent = { enable = false },
     incremental_selection = {
         enable = true,
         keymaps = {
@@ -496,7 +496,6 @@ cmp.setup {
         { name = 'nvim_lsp' },
         { name = 'luasnip' },
         { name = 'buffer' },
-        { name = 'path' },
         -- { name = 'cmp_tabnine' },
     },
 }