From ffefa0fffdee5ab810a2becead719cad28bbd2a1 Mon Sep 17 00:00:00 2001
From: Gabe Venberg <gabevenberg@gmail.com>
Date: Thu, 22 Feb 2024 13:30:25 -0600
Subject: [PATCH] unification of work and personal configs.

The work package, when stowed, makes the proper overrides, as long as
all work stuff lives in ~/work/
---
 git/.gitconfig                       |  2 +
 neovim/.config/nvim/lua/packages.lua | 78 ----------------------------
 work/.config/git/work.gitconfig      |  3 ++
 work/work/.clang-format              | 13 +++++
 4 files changed, 18 insertions(+), 78 deletions(-)
 create mode 100644 work/.config/git/work.gitconfig
 create mode 100644 work/work/.clang-format

diff --git a/git/.gitconfig b/git/.gitconfig
index d2aaca3..b12fb51 100644
--- a/git/.gitconfig
+++ b/git/.gitconfig
@@ -39,3 +39,5 @@
 	sort = -committerdate
 [status]
 	submodulesummary = true
+[includeIf "gitdir:~/work/"]
+    path = ".config/git/work.gitconfig"
diff --git a/neovim/.config/nvim/lua/packages.lua b/neovim/.config/nvim/lua/packages.lua
index 17e6214..b8faad9 100644
--- a/neovim/.config/nvim/lua/packages.lua
+++ b/neovim/.config/nvim/lua/packages.lua
@@ -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', },
-	}
 
 })
diff --git a/work/.config/git/work.gitconfig b/work/.config/git/work.gitconfig
new file mode 100644
index 0000000..8458bca
--- /dev/null
+++ b/work/.config/git/work.gitconfig
@@ -0,0 +1,3 @@
+[user]
+	email = venberggabe@johndeere.com
+	name = Gabe Venberg
diff --git a/work/work/.clang-format b/work/work/.clang-format
new file mode 100644
index 0000000..feaaf21
--- /dev/null
+++ b/work/work/.clang-format
@@ -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
+...