diff --git a/bash/.bashrc b/bash/.bashrc index 3793c53..df934b3 100644 --- a/bash/.bashrc +++ b/bash/.bashrc @@ -264,3 +264,6 @@ export MANPAGER='nvim +Man!' export FLYCTL_INSTALL="/home/matt/.fly" export PATH="$FLYCTL_INSTALL/bin:$PATH" export PATH="$PATH:/Users/matt/.foundry/bin" + +# Created by `pipx` on 2026-04-22 15:46:28 +export PATH="$PATH:/Users/matt/.local/bin" diff --git a/nnn/.config/nnn/bookmarks/doc b/nnn/.config/nnn/bookmarks/doc new file mode 120000 index 0000000..3f7f5cc --- /dev/null +++ b/nnn/.config/nnn/bookmarks/doc @@ -0,0 +1 @@ +/Users/matt/doc \ No newline at end of file diff --git a/nnn/.config/nnn/bookmarks/projects b/nnn/.config/nnn/bookmarks/projects new file mode 120000 index 0000000..176f9db --- /dev/null +++ b/nnn/.config/nnn/bookmarks/projects @@ -0,0 +1 @@ +/Users/matt/doc/dev/projects \ No newline at end of file diff --git a/nvim/.config/nvim/lazy-lock.json b/nvim/.config/nvim/lazy-lock.json index af8e8cb..ed6867c 100644 --- a/nvim/.config/nvim/lazy-lock.json +++ b/nvim/.config/nvim/lazy-lock.json @@ -1,30 +1,29 @@ { - "CopilotChat.nvim": { "branch": "main", "commit": "743d6005fb412c85309d3f3aa45f18f3a2fb2098" }, + "CopilotChat.nvim": { "branch": "main", "commit": "5378035c2eb4089de245473dec1768e0986543bd" }, "LuaSnip": { "branch": "master", "commit": "1f4ad8bb72bdeb60975e98652636b991a9b7475d" }, "cmp-nvim-lsp": { "branch": "main", "commit": "cbc7b02bb99fae35cb42f514762b89b5126651ef" }, "copilot.vim": { "branch": "release", "commit": "a12fd5672110c8aa7e3c8419e28c96943ca179be" }, "formatter.nvim": { "branch": "master", "commit": "b9d7f853da1197b83b8edb4cc4952f7ad3a42e41" }, - "gitsigns.nvim": { "branch": "main", "commit": "9f3c6dd7868bcc116e9c1c1929ce063b978fa519" }, - "headlines.nvim": { "branch": "master", "commit": "bf17c96a836ea27c0a7a2650ba385a7783ed322e" }, - "helm-ls.nvim": { "branch": "main", "commit": "f0b9a1723890971a6d84890b50dbf5f40974ea1b" }, + "gitsigns.nvim": { "branch": "main", "commit": "6d808f99bd63303646794406e270bd553ad7792e" }, + "helm-ls.nvim": { "branch": "main", "commit": "20df43509b02a3ce3c6b3eee254d6e2bffa9a370" }, "lazy.nvim": { "branch": "main", "commit": "306a05526ada86a7b30af95c5cc81ffba93fef97" }, "leetcode.nvim": { "branch": "master", "commit": "fdd3f91800b3983e27bc9fcfb99cfa7293d7f11a" }, - "mason.nvim": { "branch": "main", "commit": "44d1e90e1f66e077268191e3ee9d2ac97cc18e65" }, + "mason.nvim": { "branch": "main", "commit": "12ddd182d9efbdc848b540f16484a583d52da0fb" }, "neodev.nvim": { "branch": "main", "commit": "46aa467dca16cf3dfe27098042402066d2ae242d" }, "nnn.nvim": { "branch": "master", "commit": "efe690293eee87558f034a83ed96157e52639cdb" }, "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" }, "nvim-autopairs": { "branch": "master", "commit": "59bce2eef357189c3305e25bc6dd2d138c1683f5" }, - "nvim-cmp": { "branch": "main", "commit": "da88697d7f45d16852c6b2769dc52387d1ddc45f" }, - "nvim-dap": { "branch": "master", "commit": "b516f20b487b0ac6a281e376dfac1d16b5040041" }, + "nvim-cmp": { "branch": "main", "commit": "a1d504892f2bc56c2e79b65c6faded2fd21f3eca" }, + "nvim-dap": { "branch": "master", "commit": "45a69eba683a2c448dd9ecfc4de89511f0646b5f" }, "nvim-dap-go": { "branch": "main", "commit": "b4421153ead5d726603b02743ea40cf26a51ed5f" }, - "nvim-dap-ui": { "branch": "master", "commit": "cf91d5e2d07c72903d052f5207511bf7ecdb7122" }, - "nvim-lspconfig": { "branch": "master", "commit": "ead0f5f342d8d323441e7d4b88f0fc436a81ad5f" }, + "nvim-dap-ui": { "branch": "master", "commit": "1a66cabaa4a4da0be107d5eda6d57242f0fe7e49" }, + "nvim-lspconfig": { "branch": "master", "commit": "e146efacbafed3789ac568abcc5a981c5decaa58" }, "nvim-nio": { "branch": "master", "commit": "21f5324bfac14e22ba26553caf69ec76ae8a7662" }, - "nvim-tree.lua": { "branch": "master", "commit": "c8d8d515c29f0f0b1a352e0d75616f74f42fc03b" }, - "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" }, - "orgmode": { "branch": "master", "commit": "f3ea61f6d71486c9062d40efe3c882050758e9b3" }, - "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" }, + "nvim-tree.lua": { "branch": "master", "commit": "d277467fc0d1d0e2bca88165a1de6b526f9f6fe8" }, + "orgmode": { "branch": "master", "commit": "a214db3c8ed7eb68cb74924575b91ffc658e7d82" }, + "plenary.nvim": { "branch": "master", "commit": "74b06c6c75e4eeb3108ec01852001636d85a932b" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, - "telescope.nvim": { "branch": "master", "commit": "5255aa27c422de944791318024167ad5d40aad20" }, + "telescope.nvim": { "branch": "master", "commit": "506338434fec5ad19cb1f8d45bf92d66c4917393" }, + "tree-sitter-manager.nvim": { "branch": "main", "commit": "48396293d84a8dd88b857f298ee5953fa3572e5f" }, "zen-mode.nvim": { "branch": "main", "commit": "8564ce6d29ec7554eb9df578efa882d33b3c23a7" } } diff --git a/nvim/.config/nvim/lua/lsp.lua b/nvim/.config/nvim/lua/lsp.lua index 8215d86..1639688 100644 --- a/nvim/.config/nvim/lua/lsp.lua +++ b/nvim/.config/nvim/lua/lsp.lua @@ -123,10 +123,7 @@ cmp.setup { }, } --- Bordered LSP UI -local float = { focusable = true, style = "minimal", border = "rounded", } -vim.lsp.handlers["textDocument/hover"] = vim.lsp.with(vim.lsp.handlers.hover, float) -vim.lsp.handlers["textDocument/signatureHelp"] = vim.lsp.with(vim.lsp.handlers.signature_help, float) +vim.o.winborder = "rounded" -- Global mappings. -- See `:help vim.diagnostic.*` for documentation on any of the below functions diff --git a/nvim/.config/nvim/lua/plugins.lua b/nvim/.config/nvim/lua/plugins.lua index 45cb90f..a125e41 100644 --- a/nvim/.config/nvim/lua/plugins.lua +++ b/nvim/.config/nvim/lua/plugins.lua @@ -28,9 +28,7 @@ require('lazy').setup({ 'rcarriga/nvim-dap-ui', 'nvim-neotest/nvim-nio', 'leoluz/nvim-dap-go', - -- 'mfussenegger/nvim-dap-python', - -- Visual - 'nvim-treesitter/nvim-treesitter', + 'romus204/tree-sitter-manager.nvim', 'luukvbaal/nnn.nvim', 'nvim-tree/nvim-tree.lua', 'lewis6991/gitsigns.nvim', @@ -122,15 +120,7 @@ require('lazy').setup({ -- Initialize Plugins require("mason").setup() require('neodev').setup() -require('nvim-treesitter.configs').setup { - ensured_installed = { "go", "bash", "javascript", "html", "lua", "org" }, - sync_install = false, - auto_install = true, - highlight = { - enable = true, - additional_vim_regex_highlighting = true, - }, -} +require("tree-sitter-manager").setup() require('nnn').setup({ picker = { cmd = "nnn -C", diff --git a/opencode/.config/opencode/opencode.json b/opencode/.config/opencode/opencode.json new file mode 100644 index 0000000..30af7d9 --- /dev/null +++ b/opencode/.config/opencode/opencode.json @@ -0,0 +1,19 @@ +{ + "$schema": "https://opencode.ai/config.json", + "model": "ollama/llama2-uncensored:7b", + "provider": { + "ollama": { + "models": { + "llama2-uncensored:7b": { + "_launch": true, + "name": "llama2-uncensored:7b" + } + }, + "name": "Ollama", + "npm": "@ai-sdk/openai-compatible", + "options": { + "baseURL": "http://127.0.0.1:11434/v1" + } + } + } +} \ No newline at end of file diff --git a/tmux/.tmux.conf b/tmux/.tmux.conf index 5c10787..b66a8fc 100644 --- a/tmux/.tmux.conf +++ b/tmux/.tmux.conf @@ -51,7 +51,8 @@ setw -g mode-keys vi bind -T copy-mode-vi 'v' send -X begin-selection bind -T copy-mode-vi 'y' send -X copy-pipe-and-cancel "pbcopy" -set -g status-right "#(date +'%I:%M %p')" +# set -g status-right "#(date +'%I:%M %p')" +set -g status-right "" # Activate OFF mode bind o \