From aedd86949ca4c4c0f98a53fc148f9949cd487877 Mon Sep 17 00:00:00 2001 From: Matt Layman Date: Mon, 18 Mar 2024 20:05:21 -0400 Subject: [PATCH 1/8] ih-config v2. --- git/.gitconfig | 5 +++++ starship.toml | 6 ++++++ zsh/zshrc | 3 +++ 3 files changed, 14 insertions(+) diff --git a/git/.gitconfig b/git/.gitconfig index 10ea5f7..78c9691 100644 --- a/git/.gitconfig +++ b/git/.gitconfig @@ -11,5 +11,10 @@ branch = false [init] defaultBranch = main + templateDir = /Users/matt.layman/.ih/git-template [alias] gone = "!f() { git fetch --all --prune; git branch -vv | awk '/: gone]/{print $1}' | xargs git branch -D; }; f" +[core] + excludesfile = /Users/matt.layman/.gitignore_global +[url "git@github.com:ConsultingMD"] + insteadOf = https://github.com/ConsultingMD diff --git a/starship.toml b/starship.toml index 9221cfd..92d6976 100644 --- a/starship.toml +++ b/starship.toml @@ -8,3 +8,9 @@ command_timeout = 1000 [aws] disabled = true + +[custom.aws] +command = 'echo "$AWS_ENVIRONMENT/$AWS_ENVIRONMENT_ROLE:$AWS_DEFAULT_REGION"' +format = "[$symbol ($output)]($style) " +symbol = "🌩 " +when = true diff --git a/zsh/zshrc b/zsh/zshrc index 88b6379..1c213d2 100644 --- a/zsh/zshrc +++ b/zsh/zshrc @@ -76,3 +76,6 @@ eval "$(starship init zsh)" # Example aliases # alias zshconfig="mate ~/.zshrc" # alias ohmyzsh="mate ~/.oh-my-zsh" + +# This loads the Included Health shell augmentations into your interactive shell +. "$HOME/.ih/augment.sh" From 7ad1ba3bd259b57ce6ab6377fb96fff1794e8b27 Mon Sep 17 00:00:00 2001 From: Matt Layman Date: Fri, 26 Apr 2024 17:14:44 -0400 Subject: [PATCH 2/8] Add a shortcut for golinks. --- zsh/zshrc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/zsh/zshrc b/zsh/zshrc index 1c213d2..a50b603 100644 --- a/zsh/zshrc +++ b/zsh/zshrc @@ -77,5 +77,9 @@ eval "$(starship init zsh)" # alias zshconfig="mate ~/.zshrc" # alias ohmyzsh="mate ~/.oh-my-zsh" +gol() { + open https://go/$1 +} + # This loads the Included Health shell augmentations into your interactive shell . "$HOME/.ih/augment.sh" From 1bea875c3abdedc16b043919b5ba560022f80135 Mon Sep 17 00:00:00 2001 From: Matt Layman Date: Fri, 26 Apr 2024 17:17:09 -0400 Subject: [PATCH 3/8] Use an easier to remember function name. --- zsh/zshrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zsh/zshrc b/zsh/zshrc index a50b603..cc28839 100644 --- a/zsh/zshrc +++ b/zsh/zshrc @@ -77,7 +77,7 @@ eval "$(starship init zsh)" # alias zshconfig="mate ~/.zshrc" # alias ohmyzsh="mate ~/.oh-my-zsh" -gol() { +function go/() { open https://go/$1 } From c875d7c87bc639dc3057c4a42fa135ba3775447b Mon Sep 17 00:00:00 2001 From: Matt Layman Date: Tue, 19 Nov 2024 16:19:29 -0500 Subject: [PATCH 4/8] Handle acceptance and server build flags. --- nvim/lua/mblayman/plugins/lsp.lua | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/nvim/lua/mblayman/plugins/lsp.lua b/nvim/lua/mblayman/plugins/lsp.lua index 1f57d44..8da458e 100644 --- a/nvim/lua/mblayman/plugins/lsp.lua +++ b/nvim/lua/mblayman/plugins/lsp.lua @@ -148,7 +148,13 @@ return { -- See `:help lspconfig-all` for a list of all the pre-configured LSPs local servers = { clangd = {}, -- C - gopls = {}, -- Go + gopls = { + settings = { + gopls = { + buildFlags = { "-tags=acceptance server" }, + }, + }, + }, -- Go pyright = {}, -- Python lua_ls = { -- cmd = {...}, From fe7b430aeab5cb31099faf978e1a4501d346609e Mon Sep 17 00:00:00 2001 From: Matt Layman Date: Mon, 17 Mar 2025 14:52:20 -0400 Subject: [PATCH 5/8] IH needs homebrew LLVM because macOS compiler is being weird. --- zsh/zshrc | 1 + 1 file changed, 1 insertion(+) diff --git a/zsh/zshrc b/zsh/zshrc index 91668d5..e0387bd 100644 --- a/zsh/zshrc +++ b/zsh/zshrc @@ -62,6 +62,7 @@ eval "$(starship init zsh)" # This loads the Included Health shell augmentations into your interactive shell . "$HOME/.ih/augment.sh" +export PATH="/opt/homebrew/opt/llvm/bin:$PATH" # You may need to manually set your language environment # export LANG=en_US.UTF-8 From c3845d8384ada6a120d3802a0d4178712a58da32 Mon Sep 17 00:00:00 2001 From: Matt Layman Date: Mon, 17 Mar 2025 14:53:43 -0400 Subject: [PATCH 6/8] Update Lazy lock file. --- nvim/lazy-lock.json | 54 ++++++++++++++++++++++----------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/nvim/lazy-lock.json b/nvim/lazy-lock.json index 52dd36a..ff84638 100644 --- a/nvim/lazy-lock.json +++ b/nvim/lazy-lock.json @@ -1,45 +1,45 @@ { "Comment.nvim": { "branch": "master", "commit": "e30b7f2008e52442154b66f7c519bfd2f1e32acb" }, - "LuaSnip": { "branch": "master", "commit": "ce0a05ab4e2839e1c48d072c5236cce846a387bc" }, + "LuaSnip": { "branch": "master", "commit": "c9b9a22904c97d0eb69ccb9bab76037838326817" }, "avante.nvim": { "branch": "main", "commit": "f60f150a21e2a32f1b0ee194abd7f2be3bab92db" }, - "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" }, + "cmp-nvim-lsp": { "branch": "main", "commit": "99290b3ec1322070bcfb9e846450a46f6efa50f0" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, - "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, - "conform.nvim": { "branch": "master", "commit": "cd75be867f2331b22905f47d28c0c270a69466aa" }, + "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" }, + "conform.nvim": { "branch": "master", "commit": "db8a4a9edb217067b1d7a2e0362c74bfe9cc944d" }, "dressing.nvim": { "branch": "master", "commit": "2d7c2db2507fa3c4956142ee607431ddb2828639" }, - "fidget.nvim": { "branch": "main", "commit": "d855eed8a06531a7e8fd0684889b2943f373c469" }, - "friendly-snippets": { "branch": "main", "commit": "45a1b96e46efe5fce8af325d4bed45feb9d29d0f" }, - "gitsigns.nvim": { "branch": "main", "commit": "e9c4187c3774a46df2d086a66cf3a7e6bea4c432" }, + "fidget.nvim": { "branch": "main", "commit": "d9ba6b7bfe29b3119a610892af67602641da778e" }, + "friendly-snippets": { "branch": "main", "commit": "efff286dd74c22f731cdec26a70b46e5b203c619" }, + "gitsigns.nvim": { "branch": "main", "commit": "011dc6718bcebdf92a5336bb0da79189c3afe621" }, "img-clip.nvim": { "branch": "main", "commit": "24c13df08e3fe66624bed5350a2a780f77f1f65b" }, - "indent-blankline.nvim": { "branch": "master", "commit": "65e20ab94a26d0e14acac5049b8641336819dfc7" }, - "lazy.nvim": { "branch": "main", "commit": "7e6c863bc7563efbdd757a310d17ebc95166cef3" }, - "lualine.nvim": { "branch": "master", "commit": "6a40b530539d2209f7dc0492f3681c8c126647ad" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "37a336b653f8594df75c827ed589f1c91d91ff6c" }, - "mason-tool-installer.nvim": { "branch": "main", "commit": "c5e07b8ff54187716334d585db34282e46fa2932" }, - "mason.nvim": { "branch": "main", "commit": "f96a31855fa8aea55599cea412fe611b85a874ed" }, + "indent-blankline.nvim": { "branch": "master", "commit": "e10626f7fcd51ccd56d7ffc00883ba7e0aa28f78" }, + "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, + "lualine.nvim": { "branch": "master", "commit": "02d61f515e7d88e1b02366ca972aecf2768d53df" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "1a31f824b9cd5bc6f342fc29e9a53b60d74af245" }, + "mason-tool-installer.nvim": { "branch": "main", "commit": "5639d58a3d11ff7c05c8e31e159bfedae55d7961" }, + "mason.nvim": { "branch": "main", "commit": "fc98833b6da5de5a9c5b1446ac541577059555be" }, "monokai.nvim": { "branch": "master", "commit": "b8bd44d5796503173627d7a1fc51f77ec3a08a63" }, "neodev.nvim": { "branch": "main", "commit": "46aa467dca16cf3dfe27098042402066d2ae242d" }, "nui.nvim": { "branch": "main", "commit": "8d3bce9764e627b62b07424e0df77f680d47ffdb" }, - "nvim-cmp": { "branch": "main", "commit": "a110e12d0b58eefcf5b771f533fc2cf3050680ac" }, - "nvim-config-local": { "branch": "main", "commit": "83bb6d9881653a5cf8b489ba8a6fe5a06049a10a" }, - "nvim-lspconfig": { "branch": "master", "commit": "216deb2d1b5fbf24398919228208649bbf5cbadf" }, - "nvim-treesitter": { "branch": "master", "commit": "7f4ac678770175cdf0d42c015f4a5b6e18b6cb33" }, - "nvim-treesitter-textobjects": { "branch": "master", "commit": "34867c69838078df7d6919b130c0541c0b400c47" }, - "nvim-web-devicons": { "branch": "master", "commit": "c0cfc1738361b5da1cd0a962dd6f774cc444f856" }, - "plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" }, + "nvim-cmp": { "branch": "main", "commit": "c27370703e798666486e3064b64d59eaf4bdc6d5" }, + "nvim-config-local": { "branch": "main", "commit": "990f3e35e0fba8fb83012d7e85f9a6a77de7f87f" }, + "nvim-lspconfig": { "branch": "master", "commit": "8a1529e46eef5efc86c34c8d9bdd313abc2ecba0" }, + "nvim-treesitter": { "branch": "master", "commit": "683816f14718b257666b29f792a8d330936cf5c1" }, + "nvim-treesitter-textobjects": { "branch": "master", "commit": "143856b1cee509a190cc8c17ddb0638002171235" }, + "nvim-web-devicons": { "branch": "master", "commit": "ab4cfee554e501f497bce0856788d43cf2eb93d7" }, + "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" }, "quickfix-reflector.vim": { "branch": "master", "commit": "6a6a9e28e1713b9e9db99eec1e6672e5666c01b9" }, "render-markdown.nvim": { "branch": "main", "commit": "08e1fa4e281e48ee4aa892428de9fb91e66edca6" }, - "telescope-fzf-native.nvim": { "branch": "main", "commit": "cf48d4dfce44e0b9a2e19a008d6ec6ea6f01a83b" }, + "telescope-fzf-native.nvim": { "branch": "main", "commit": "1f08ed60cafc8f6168b72b80be2b2ea149813e55" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, "telescope.nvim": { "branch": "0.1.x", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" }, - "vim-endwise": { "branch": "master", "commit": "3719ffddb5e42bf67b55b2183d7a6fb8d3e5a2b8" }, - "vim-fugitive": { "branch": "master", "commit": "8c8cdf4405cb8bdb70dd9812a33bb52363a87dbc" }, - "vim-rhubarb": { "branch": "master", "commit": "ee69335de176d9325267b0fd2597a22901d927b1" }, + "vim-endwise": { "branch": "master", "commit": "f6a32fbe4d4e511d446ac189e926f8e24f69cc1e" }, + "vim-fugitive": { "branch": "master", "commit": "4a745ea72fa93bb15dd077109afbb3d1809383f2" }, + "vim-rhubarb": { "branch": "master", "commit": "386daa2e9d98e23e27ad089afcbe5c5a903e488d" }, "vim-ripgrep": { "branch": "master", "commit": "2bb2425387b449a0cd65a54ceb85e123d7a320b8" }, - "vim-sleuth": { "branch": "master", "commit": "1cc4557420f215d02c4d2645a748a816c220e99b" }, - "vim-test": { "branch": "master", "commit": "34aab77f7a63f20a623df45684156915f6182a55" }, + "vim-sleuth": { "branch": "master", "commit": "be69bff86754b1aa5adcbb527d7fcd1635a84080" }, + "vim-test": { "branch": "master", "commit": "0f50a546aef59efe5f1301de8fa9819ecb9fd482" }, "vim-unimpaired": { "branch": "master", "commit": "6d44a6dc2ec34607c41ec78acf81657248580bf1" }, "vim-vinegar": { "branch": "master", "commit": "bb1bcddf43cfebe05eb565a84ab069b357d0b3d6" }, - "which-key.nvim": { "branch": "main", "commit": "30cf839c82bcc0f90be951f8834c256c1cdc295c" }, + "which-key.nvim": { "branch": "main", "commit": "370ec46f710e058c9c1646273e6b225acf47cbed" }, "words-to-avoid.vim": { "branch": "master", "commit": "65913c5e43ae948c1856b68e013f435ee68fd451" } } From e820f8eb6c3cd0846e307bfa10e78e43dcf41fd3 Mon Sep 17 00:00:00 2001 From: Matt Layman Date: Thu, 5 Jun 2025 12:09:05 -0400 Subject: [PATCH 7/8] Let proto files be handled by buf_ls only. --- nvim/lua/mblayman/plugins/lsp.lua | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/nvim/lua/mblayman/plugins/lsp.lua b/nvim/lua/mblayman/plugins/lsp.lua index 4d9e5c2..56feaad 100644 --- a/nvim/lua/mblayman/plugins/lsp.lua +++ b/nvim/lua/mblayman/plugins/lsp.lua @@ -139,7 +139,9 @@ return { -- For example, to see the options for `lua_ls`, you could go to: https://luals.github.io/wiki/settings/ -- See `:help lspconfig-all` for a list of all the pre-configured LSPs local servers = { - clangd = {}, -- C + clangd = { + filetypes = { "c", "cpp", "objc", "objcpp", "cuda" }, + }, -- C gopls = { settings = { gopls = { @@ -163,6 +165,9 @@ return { }, }, }, + buf_ls = { + filetypes = { "proto" }, + }, } require("mason").setup() From 80b8d2963cd54ba416ad8fc554f43ac05a08135a Mon Sep 17 00:00:00 2001 From: Matt Layman Date: Thu, 5 Jun 2025 12:09:24 -0400 Subject: [PATCH 8/8] Add some GOBIN stuff. --- zsh/zshrc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/zsh/zshrc b/zsh/zshrc index 3e777b9..8cae4c4 100644 --- a/zsh/zshrc +++ b/zsh/zshrc @@ -72,6 +72,8 @@ eval "$(starship init zsh)" # This loads the Included Health shell augmentations into your interactive shell . "$HOME/.ih/augment.sh" export PATH="/opt/homebrew/opt/llvm/bin:$PATH" +export GOBIN="$HOME/go/bin" +export PATH="$PATH:$GOBIN" # You may need to manually set your language environment # export LANG=en_US.UTF-8