unification of work and personal configs.
The work package, when stowed, makes the proper overrides, as long as all work stuff lives in ~/work/
This commit is contained in:
		
							parent
							
								
									ce99161959
								
							
						
					
					
						commit
						ffefa0fffd
					
				
					 4 changed files with 18 additions and 78 deletions
				
			
		| 
						 | 
				
			
			@ -39,3 +39,5 @@
 | 
			
		|||
	sort = -committerdate
 | 
			
		||||
[status]
 | 
			
		||||
	submodulesummary = true
 | 
			
		||||
[includeIf "gitdir:~/work/"]
 | 
			
		||||
    path = ".config/git/work.gitconfig"
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -393,83 +393,5 @@ require('lazy').setup({
 | 
			
		|||
        'ellisonleao/gruvbox.nvim',
 | 
			
		||||
        lazy = true,
 | 
			
		||||
    },
 | 
			
		||||
	use { 'nvim-treesitter/nvim-treesitter',
 | 
			
		||||
		run = ':TSUpdate',
 | 
			
		||||
		config = function()
 | 
			
		||||
			require('nvim-treesitter').setup {
 | 
			
		||||
				ensure_installed = {
 | 
			
		||||
					'c',
 | 
			
		||||
					'lua',
 | 
			
		||||
					'vim',
 | 
			
		||||
					'vimdoc',
 | 
			
		||||
					'query',
 | 
			
		||||
					'bash',
 | 
			
		||||
					'comment',
 | 
			
		||||
					'cpp',
 | 
			
		||||
					'diff',
 | 
			
		||||
					'git_config',
 | 
			
		||||
					'git_rebase',
 | 
			
		||||
					'gitattributes',
 | 
			
		||||
					'gitcommit',
 | 
			
		||||
					'gitignore',
 | 
			
		||||
					'json',
 | 
			
		||||
					'jsonc',
 | 
			
		||||
					'latex',
 | 
			
		||||
					'make',
 | 
			
		||||
					'python',
 | 
			
		||||
					'regex',
 | 
			
		||||
					'rust',
 | 
			
		||||
					'toml',
 | 
			
		||||
				},
 | 
			
		||||
				auto_install = true,
 | 
			
		||||
				highlight = { enable = true },
 | 
			
		||||
				indent = { enable = true },
 | 
			
		||||
				incremental_selection = { enable = true }
 | 
			
		||||
			}
 | 
			
		||||
		end,
 | 
			
		||||
	}
 | 
			
		||||
	use {
 | 
			
		||||
		{
 | 
			
		||||
			"williamboman/mason.nvim",
 | 
			
		||||
			config = function()
 | 
			
		||||
				require("mason").setup({
 | 
			
		||||
					ui = {
 | 
			
		||||
						icons = {
 | 
			
		||||
							package_installed = "✓",
 | 
			
		||||
							package_pending = "➜",
 | 
			
		||||
							package_uninstalled = "✗"
 | 
			
		||||
						}
 | 
			
		||||
					}
 | 
			
		||||
				})
 | 
			
		||||
			end
 | 
			
		||||
		},
 | 
			
		||||
		{
 | 
			
		||||
			"williamboman/mason-lspconfig.nvim",
 | 
			
		||||
			after = "mason.nvim",
 | 
			
		||||
			config = function()
 | 
			
		||||
				require("mason-lspconfig").setup({
 | 
			
		||||
					ensure_installed = {
 | 
			
		||||
						'lua_ls',
 | 
			
		||||
						'rust_analyzer',
 | 
			
		||||
						'bashls',
 | 
			
		||||
                        'pylsp', -- run PylspInstall pylsp-rope python-lsp-black python-lsp-ruff
 | 
			
		||||
                        'pyright',
 | 
			
		||||
						'texlab',
 | 
			
		||||
						'clangd',
 | 
			
		||||
					},
 | 
			
		||||
					automatic_installation = true
 | 
			
		||||
				})
 | 
			
		||||
			end
 | 
			
		||||
		},
 | 
			
		||||
		{
 | 
			
		||||
			"neovim/nvim-lspconfig",
 | 
			
		||||
			after = { "mason-lspconfig.nvim", "rust-tools.nvim" },
 | 
			
		||||
			config = function()
 | 
			
		||||
				require('LSPconfig')
 | 
			
		||||
			end
 | 
			
		||||
		},
 | 
			
		||||
		{ 'simrat39/rust-tools.nvim', },
 | 
			
		||||
		{ 'mfussenegger/nvim-jdtls', },
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
})
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
							
								
								
									
										3
									
								
								work/.config/git/work.gitconfig
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										3
									
								
								work/.config/git/work.gitconfig
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,3 @@
 | 
			
		|||
[user]
 | 
			
		||||
	email = venberggabe@johndeere.com
 | 
			
		||||
	name = Gabe Venberg
 | 
			
		||||
							
								
								
									
										13
									
								
								work/work/.clang-format
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										13
									
								
								work/work/.clang-format
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,13 @@
 | 
			
		|||
---
 | 
			
		||||
#this syncronizes with settings used by neovims treesitters so that the lsp formatting and treesitter formatting do not fight eatch other.
 | 
			
		||||
PointerAlignment: Left
 | 
			
		||||
ColumnLimit: 80
 | 
			
		||||
IndentWidth: 4
 | 
			
		||||
TabWidth: 4
 | 
			
		||||
UseCRLF: false
 | 
			
		||||
UseTab: Never
 | 
			
		||||
AlignAfterOpenBracket: BlockIndent
 | 
			
		||||
AlwaysBreakBeforeMultilineStrings: true
 | 
			
		||||
BreakBeforeBraces: Allman
 | 
			
		||||
BreakBeforeBinaryOperators: None
 | 
			
		||||
...
 | 
			
		||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue