diff --git a/config/nvim/lazy-lock.json b/config/nvim/lazy-lock.json index c151831..ac31720 100644 --- a/config/nvim/lazy-lock.json +++ b/config/nvim/lazy-lock.json @@ -1,14 +1,23 @@ { "blink-cmp-env": { "branch": "main", "commit": "99af62c1f9aa46005e8f50ad4ccee581946546ca" }, + "blink-cmp-ghostty": { "branch": "main", "commit": "0b137d64f6c2172aedca8388ecbe2e2c215844d0" }, "blink-cmp-git": { "branch": "master", "commit": "10783593af764424018a95e75df6ad5a8b66fe07" }, - "blink.cmp": { "branch": "main", "commit": "b4d379393882561f9055abe780342ee00f02c573" }, + "blink-cmp-ssh": { "branch": "main", "commit": "4d6c8e0c0983acb74bf7a2988307ab867ce231a9" }, + "blink-cmp-tmux": { "branch": "main", "commit": "c0c59d1e5771a8de25b547dc18eb274cbce2438c" }, + "blink.cmp": { "branch": "main", "commit": "b650e976a927be6b46487a0a610b75af111376c5" }, + "canola.nvim": { "branch": "main", "commit": "60bfbe05da1a0adb0b3ed28ac055cd23528b764e" }, + "cp.nvim": { "branch": "main", "commit": "e989897c7767b8d9c9a1be4ca5c0618b13a18ea4" }, "dial.nvim": { "branch": "master", "commit": "f2634758455cfa52a8acea6f142dcd6271a1bf57" }, + "diffs.nvim": { "branch": "main", "commit": "dfebc68a1fc3e93dae5b6d49133243ec1886cb19" }, "fzf-lua": { "branch": "main", "commit": "9004cbb4c065a32b690e909c49903967b45301eb" }, "gitsigns.nvim": { "branch": "main", "commit": "9f3c6dd7868bcc116e9c1c1929ce063b978fa519" }, + "guard-collection": { "branch": "main", "commit": "edf6c86c06badc972964dadb7fd469022690cbf0" }, "guard.nvim": { "branch": "main", "commit": "addb8d2f40662b8b62d60dd7d18f503beb2332e7" }, "lazy.nvim": { "branch": "main", "commit": "306a05526ada86a7b30af95c5cc81ffba93fef97" }, "lazydev.nvim": { "branch": "main", "commit": "5231c62aa83c2f8dc8e7ba957aa77098cda1257d" }, "live-rename.nvim": { "branch": "main", "commit": "3a3cddf23b89a17992f9ca67afc5858077769462" }, + "live-server.nvim": { "branch": "main", "commit": "baeb211719085eee61cdae22f106e53dcbdc4b6f" }, + "midnight.nvim": { "branch": "main", "commit": "7891879b4e7ba183f377369beb094450d115bb4b" }, "mini.ai": { "branch": "main", "commit": "4b0a6207341d895b6cfe9bcb1e4d3e8607bfe4f4" }, "mini.bufremove": { "branch": "main", "commit": "ee69f823f84508c556127a5882760d9783692023" }, "mini.misc": { "branch": "main", "commit": "de8947231c29012271722651aa07f6749c41d1ed" }, @@ -19,6 +28,7 @@ "nvim-treesitter": { "branch": "main", "commit": "dc42c209f3820bdfaae0956f15de29689aa6b451" }, "nvim-treesitter-textobjects": { "branch": "main", "commit": "a0e182ae21fda68c59d1f36c9ed45600aef50311" }, "nvim-vtsls": { "branch": "main", "commit": "0b5f73c9e50ce95842ea07bb3f05c7d66d87d14a" }, + "nvim-web-devicons": { "branch": "master", "commit": "746ffbb17975ebd6c40142362eee1b0249969c5c" }, "overseer.nvim": { "branch": "master", "commit": "392093e610333c0aea89bf43de7362e25783eada" }, "treesj": { "branch": "main", "commit": "186084dee5e9c8eec40f6e39481c723dd567cb05" }, "vim-abolish": { "branch": "master", "commit": "dcbfe065297d31823561ba787f51056c147aa682" }, diff --git a/config/nvim/lua/plugins/cmp.lua b/config/nvim/lua/plugins/cmp.lua index 7500e37..5986ff2 100644 --- a/config/nvim/lua/plugins/cmp.lua +++ b/config/nvim/lua/plugins/cmp.lua @@ -5,9 +5,9 @@ return { 'Kaiser-Yang/blink-cmp-git', 'folke/lazydev.nvim', 'bydlw98/blink-cmp-env', - { 'barrettruth/blink-cmp-ssh', dir = '~/dev/blink-cmp-ssh' }, - { 'barrettruth/blink-cmp-tmux', dir = '~/dev/blink-cmp-tmux' }, - { 'barrettruth/blink-cmp-ghostty', dir = '~/dev/blink-cmp-ghostty' }, + 'barrettruth/blink-cmp-ssh', + 'barrettruth/blink-cmp-tmux', + 'barrettruth/blink-cmp-ghostty' }, ---@module 'blink.cmp' ---@type blink.cmp.Config diff --git a/config/nvim/lua/plugins/cp.lua b/config/nvim/lua/plugins/cp.lua index 8e4f1ac..9113847 100644 --- a/config/nvim/lua/plugins/cp.lua +++ b/config/nvim/lua/plugins/cp.lua @@ -128,7 +128,6 @@ end return { 'barrettruth/cp.nvim', - dir = '~/dev/cp.nvim', cmd = 'CP', keys = { { 'ce', 'CP edit' }, diff --git a/config/nvim/lua/plugins/git.lua b/config/nvim/lua/plugins/git.lua index bcab21f..616d22c 100644 --- a/config/nvim/lua/plugins/git.lua +++ b/config/nvim/lua/plugins/git.lua @@ -159,7 +159,7 @@ return { cmd = { 'Git', 'G', 'Gread', 'Gwrite', 'Gdiffsplit', 'Gvdiffsplit' }, }, { - dir = '~/dev/diffs.nvim', + 'barrettruth/diffs.nvim', enabled = true, init = function() vim.g.diffs = { diff --git a/config/nvim/lua/plugins/guard.lua b/config/nvim/lua/plugins/guard.lua index 944e020..23df07e 100644 --- a/config/nvim/lua/plugins/guard.lua +++ b/config/nvim/lua/plugins/guard.lua @@ -1,7 +1,7 @@ return { 'nvimdev/guard.nvim', dependencies = { - { dir = '~/dev/guard-collection', 'nvimdev/guard-collection' }, + 'nvimdev/guard-collection', }, init = function() vim.g.guard_config = { diff --git a/config/nvim/lua/plugins/nvim.lua b/config/nvim/lua/plugins/nvim.lua index 3477ac4..cb55028 100644 --- a/config/nvim/lua/plugins/nvim.lua +++ b/config/nvim/lua/plugins/nvim.lua @@ -41,9 +41,18 @@ end local git_status = new_git_status() return { + { + 'barrettruth/live-server.nvim', + enabled = false, + init = function() + vim.g.live_server = { + debug = false + } + end, + keys = { { 'l', 'LiveServerToggle' } }, + }, { 'barrettruth/midnight.nvim', - dir = '~/dev/midnight.nvim', config = function() vim.cmd.colorscheme('midnight') end, @@ -51,7 +60,7 @@ return { { 'barrettruth/nonicons.nvim', dir = '~/dev/nonicons.nvim', - enabled = false, + enabled = true, lazy = false, dependencies = { 'nvim-tree/nvim-web-devicons', @@ -269,8 +278,8 @@ return { event = 'BufReadPre', }, { - 'stevearc/oil.nvim', - dir = '~/dev/oil.nvim', + 'barrettruth/canola.nvim', + dir = '~/dev/canola.nvim', config = function(_, opts) require('oil').setup(opts) local refresh = require('oil.actions').refresh @@ -419,6 +428,7 @@ return { }, }, { + -- TODO: replace this with own barrettruth/render.nvim 'wallpants/github-preview.nvim', dir = '~/dev/github-preview.nvim', keys = { { 'm', 'silent GithubPreviewToggle' } }, diff --git a/flake.lock b/flake.lock index f18861f..b7c7270 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1771632278, - "narHash": "sha256-yu2llU2/ZT53ZLQUgCUp1XxbmKpHY9BAnee1EjqxCxo=", + "lastModified": 1771901737, + "narHash": "sha256-fP829ef07hjnLp6jZPRXcsFszsR/9E/eA2mI4KEI/To=", "owner": "ryoppippi", "repo": "claude-code-overlay", - "rev": "3791a1a1729333cafcc03e9e12acac8e142e3d09", + "rev": "adbf5677acbde7aa12bda231d5b43e16aa49c431", "type": "github" }, "original": { @@ -25,11 +25,11 @@ ] }, "locked": { - "lastModified": 1771756436, - "narHash": "sha256-Tl2I0YXdhSTufGqAaD1ySh8x+cvVsEI1mJyJg12lxhI=", + "lastModified": 1771851181, + "narHash": "sha256-gFgE6mGUftwseV3DUENMb0k0EiHd739lZexPo5O/sdQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "5bd3589390b431a63072868a90c0f24771ff4cbb", + "rev": "9a4b494b1aa1b93d8edf167f46dc8e0c0011280c", "type": "github" }, "original": { @@ -92,11 +92,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1771207753, - "narHash": "sha256-b9uG8yN50DRQ6A7JdZBfzq718ryYrlmGgqkRm9OOwCE=", + "lastModified": 1771423170, + "narHash": "sha256-K7Dg9TQ0mOcAtWTO/FX/FaprtWQ8BmEXTpLIaNRhEwU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d1c15b7d5806069da59e819999d70e1cec0760bf", + "rev": "bcc4a9d9533c033d806a46b37dc444f9b0da49dd", "type": "github" }, "original": { @@ -137,11 +137,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1771815813, - "narHash": "sha256-Xol2jIwVaLzkv6KMRYXiDvQy8plKBdvbHRmfCtrUkHg=", + "lastModified": 1771876204, + "narHash": "sha256-nTX+Qa3W+xsFxBl+lr4RsWvC4vgZocLt/qDeIvnf4+w=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "5607e31e1b0c816e182412c966e8ef2f915b0463", + "rev": "2f951adfab1f5a090fe5ea4c5eaf11efca7f1039", "type": "github" }, "original": {