Merge branch 'master' of git.venberg.xyz:Gabe/dotfiles

neovim/.config/nvim/foldtext.vimrc

@@ -1,9 +0,0 @@
-"TODO: cleanup this function!
-function! Minimal_foldtext()
-	let lines_count = v:foldend - v:foldstart + 1
-	let lines_count_text = '+' . v:folddashes . '| ' . printf("%10S" , lines_count) . ' lines |'
-	let line_level_text = '| ' . printf("%8S" , 'level ' . v:foldlevel) . ' |'
-	let fold_text_end = line_level_text . repeat('-',8)
-	let fold_text_length = strlen(lines_count_text . fold_text_end) + &foldcolumn
-	return lines_count_text . repeat('-' , winwidth(0) - fold_text_length - 4) . fold_text_end
-endfunction

neovim/.config/nvim/lua/packages.lua

@@ -6,6 +6,9 @@ if fn.empty(fn.glob(install_path)) > 0 then
 end
 
 return require('packer').startup(function(use)
+
+	--base plugins.
+
 	use 'wbthomason/packer.nvim'
 
 	use {
@@ -17,13 +20,44 @@ return require('packer').startup(function(use)
 			indent={enable=true},
 			incremental_selection={enable=true},
 		}end,
+
 	}
 
 	use 'neovim/nvim-lspconfig'
 
-	use 'yamatsum/nvim-cursorline'
+	use {'hrsh7th/nvim-cmp',
+		requires = {
+			'neovim/nvim-lspconfig',
+			'hrsh7th/cmp-nvim-lsp',
+			'saadparwaiz1/cmp_luasnip',
+			'L3MON4D3/LuaSnip'
+		}
+	}
 
-	use 'simrat39/rust-tools.nvim'
+	use {'nvim-telescope/telescope.nvim',
+		requires = {
+			{'nvim-lua/plenary.nvim'},
+			{'nvim-lua/popup.nvim'},
+			{'nvim-treesitter/nvim-treesitter'},
+			{'nvim-telescope/telescope-fzf-native.nvim', run = 'make' },
+			{'nvim-telescope/telescope-symbols.nvim'},
+			{'nvim-telescope/telescope-file-browser.nvim'},
+		},
+		config=function()
+			require'telescope'.load_extension('fzf')
+		end
+	}
+
+	use {'kyazdani42/nvim-tree.lua',
+		requires = {
+		  'kyazdani42/nvim-web-devicons', -- optional, for file icon
+		},
+		config = function() require'nvim-tree'.setup {} end
+	}
+
+	--UI stuff
+
+	use 'yamatsum/nvim-cursorline'
 
 	use {'stevearc/dressing.nvim',
 		config=function()
@@ -62,6 +96,7 @@ return require('packer').startup(function(use)
 			extensions = {}
 		} end,
 	}
+
 	use {'kdheepak/tabline.nvim',
 		config = function()
 			require'tabline'.setup {
@@ -87,59 +122,17 @@ return require('packer').startup(function(use)
 		requires = { { 'hoob3rt/lualine.nvim', opt=true }, {'kyazdani42/nvim-web-devicons', opt = true} }
 	}
 
-
+	use {
-	use {'numToStr/Comment.nvim',
+	  "folke/trouble.nvim",
+	  requires = "kyazdani42/nvim-web-devicons",
 	  config = function()
-			require('Comment').setup()
+		require("trouble").setup {
-		end
 		}
-
-	use {'glepnir/lspsaga.nvim',
-		requires = {
-			'neovim/nvim-lspconfig',
-		}
-	}
-
-	use {'hrsh7th/nvim-cmp',
-		requires = {
-			'neovim/nvim-lspconfig',
-			'hrsh7th/cmp-nvim-lsp',
-			'saadparwaiz1/cmp_luasnip',
-			'L3MON4D3/LuaSnip'
-		}
-	}
-
-	use {'folke/todo-comments.nvim',
-		requires = 'nvim-lua/plenary.nvim',
-		config = function()
-			require('todo-comments').setup()
-		end
-	}
-
-	use {'nvim-telescope/telescope.nvim',
-		requires = {
-			{'nvim-lua/plenary.nvim'},
-			{'nvim-lua/popup.nvim'},
-			{'nvim-treesitter/nvim-treesitter'},
-			{'nvim-telescope/telescope-fzf-native.nvim', run = 'make' },
-			{'nvim-telescope/telescope-symbols.nvim'},
-			{'https://github.com/nvim-telescope/telescope-file-browser.nvim'},
-		},
-		config=function()
-			require'telescope'.load_extension('fzf')
 	  end
 	}
 
 	use {'romgrk/nvim-treesitter-context',
 		requires = 'nvim-treesitter/nvim-treesitter',
-		config=function() require('treesitter-context').setup() end,
-	}
-
-	use {'kyazdani42/nvim-tree.lua',
-		requires = {
-		  'kyazdani42/nvim-web-devicons', -- optional, for file icon
-		},
-		config = function() require'nvim-tree'.setup {} end
 	}
 
 	use {'lewis6991/gitsigns.nvim',
@@ -152,16 +145,6 @@ return require('packer').startup(function(use)
 
 	use 'tversteeg/registers.nvim'
 
-	use {
-		'sudormrfbin/cheatsheet.nvim',
-
-		requires = {
-			{'nvim-telescope/telescope.nvim'},
-			{'nvim-lua/popup.nvim'},
-			{'nvim-lua/plenary.nvim'},
-		}
-	}
-
 	use {'lewis6991/spellsitter.nvim',
 		config=function() require('spellsitter').setup() end
 	}
@@ -177,10 +160,59 @@ return require('packer').startup(function(use)
 		end
 	}
 
+	--editing utilities
+
+	use {'numToStr/Comment.nvim',
+		config = function()
+			require('Comment').setup()
+		end
+	}
+
+	--misc
+
+	use {
+		'xeluxee/competitest.nvim',
+		requires = 'MunifTanjim/nui.nvim',
+		config = function() require'competitest'.setup() end
+	}
+
+	use {'folke/todo-comments.nvim',
+		requires = 'nvim-lua/plenary.nvim',
+		config = function()
+			require('todo-comments').setup()
+		end
+	}
+
+	use {'sudormrfbin/cheatsheet.nvim',
+
+		requires = {
+			{'nvim-telescope/telescope.nvim'},
+			{'nvim-lua/popup.nvim'},
+			{'nvim-lua/plenary.nvim'},
+		}
+	}
+
+	--color scheme stuff.
+
 	use 'bluz71/vim-moonfly-colors'
 
 	use 'bluz71/vim-nightfly-guicolors'
 
+	--language specific tools.
+
+	use{'eddiebergman/nvim-treesitter-pyfold',
+		config=function ()
+			require('nvim-treesitter.configs').setup {
+				pyfold = {
+					enable = true,
+					custom_foldtext = true -- Sets provided foldtext on window where module is active
+				}
+			}
+		end
+	}
+
+	use 'simrat39/rust-tools.nvim'
+
 	if Packer_Bootstrap then
 		require('packer').sync()
 	end