diff --git a/config/nvim/lazy-lock.json b/config/nvim/lazy-lock.json index 01d4d97..20a4a2f 100644 --- a/config/nvim/lazy-lock.json +++ b/config/nvim/lazy-lock.json @@ -7,7 +7,6 @@ "blink.cmp": { "branch": "main", "commit": "b650e976a927be6b46487a0a610b75af111376c5" }, "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" }, @@ -21,15 +20,15 @@ "mini.bufremove": { "branch": "main", "commit": "ee69f823f84508c556127a5882760d9783692023" }, "mini.misc": { "branch": "main", "commit": "de8947231c29012271722651aa07f6749c41d1ed" }, "mini.pairs": { "branch": "main", "commit": "b7fde3719340946feb75017ef9d75edebdeb0566" }, + "neogit": { "branch": "master", "commit": "2b6a9e4dacb435a95eff474c80d0e94ae0e4f909" }, "nvim-colorizer.lua": { "branch": "master", "commit": "fe9eed4d48f530fc9ffe4d785a936a49fa344e1a" }, "nvim-lspconfig": { "branch": "master", "commit": "5a855bcfec7973767a1a472335684bbd71d2fa2b" }, "nvim-surround": { "branch": "main", "commit": "2800277e75eda268df2bfab6ebc53e2635455318" }, "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" }, - "pending.nvim": { "branch": "main", "commit": "0727a03d4109200ed2780dccf7dcd9f2b459a5d1" }, + "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" }, "treesj": { "branch": "main", "commit": "186084dee5e9c8eec40f6e39481c723dd567cb05" }, "vim-abolish": { "branch": "master", "commit": "dcbfe065297d31823561ba787f51056c147aa682" }, "vim-fugitive": { "branch": "master", "commit": "61b51c09b7c9ce04e821f6cf76ea4f6f903e3cf4" }, diff --git a/config/nvim/lua/plugins/cmp.lua b/config/nvim/lua/plugins/cmp.lua index 5986ff2..276c96b 100644 --- a/config/nvim/lua/plugins/cmp.lua +++ b/config/nvim/lua/plugins/cmp.lua @@ -87,6 +87,9 @@ return { 'tmux', 'ghostty', }, + per_filetype = { + pending = { inherit_defaults = true, 'omni' }, + }, providers = { git = { module = 'blink-cmp-git', diff --git a/config/nvim/lua/plugins/git.lua b/config/nvim/lua/plugins/git.lua index 7b6da5c..e5b2858 100644 --- a/config/nvim/lua/plugins/git.lua +++ b/config/nvim/lua/plugins/git.lua @@ -160,7 +160,15 @@ return { }, { 'barrettruth/diffs.nvim', + dir = '~/dev/diffs.nvim', enabled = true, + dependencies = { + { + 'NeogitOrg/neogit', + dependencies = { 'nvim-lua/plenary.nvim' }, + enabled = false, + }, + }, init = function() vim.g.diffs = { fugitive = true, diff --git a/config/nvim/lua/plugins/nvim.lua b/config/nvim/lua/plugins/nvim.lua index 95fbf0a..474b537 100644 --- a/config/nvim/lua/plugins/nvim.lua +++ b/config/nvim/lua/plugins/nvim.lua @@ -60,7 +60,7 @@ return { { 'barrettruth/nonicons.nvim', dir = '~/dev/nonicons.nvim', - enabled = true, + enabled = false, lazy = false, dependencies = { 'nvim-tree/nvim-web-devicons', @@ -440,6 +440,9 @@ return { }, }, { - 'barrettruth/pending.nvim' + 'barrettruth/pending.nvim', + dir = '~/dev/pending.nvim', + -- TODO: should we be using this or `` mappings? + keys = { { 'p', 'Pending' }} } } diff --git a/flake.lock b/flake.lock index b7c7270..46d6dca 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1771901737, - "narHash": "sha256-fP829ef07hjnLp6jZPRXcsFszsR/9E/eA2mI4KEI/To=", + "lastModified": 1771991292, + "narHash": "sha256-Jd0chOUwzwCIQt48lPZSANt6ou2yep4Ima/rsnebacY=", "owner": "ryoppippi", "repo": "claude-code-overlay", - "rev": "adbf5677acbde7aa12bda231d5b43e16aa49c431", + "rev": "59e6c3ba860938148de445f7f66479ac840b9eb5", "type": "github" }, "original": { @@ -61,11 +61,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1771423359, - "narHash": "sha256-yRKJ7gpVmXbX2ZcA8nFi6CMPkJXZGjie2unsiMzj3Ig=", + "lastModified": 1771969195, + "narHash": "sha256-qwcDBtrRvJbrrnv1lf/pREQi8t2hWZxVAyeMo7/E9sw=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "740a22363033e9f1bb6270fbfb5a9574067af15b", + "rev": "41c6b421bdc301b2624486e11905c9af7b8ec68e", "type": "github" }, "original": { @@ -92,11 +92,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1771423170, - "narHash": "sha256-K7Dg9TQ0mOcAtWTO/FX/FaprtWQ8BmEXTpLIaNRhEwU=", + "lastModified": 1771923393, + "narHash": "sha256-Fy0+UXELv9hOE8WjYhJt8fMDLYTU2Dqn3cX4BwoGBos=", "owner": "nixos", "repo": "nixpkgs", - "rev": "bcc4a9d9533c033d806a46b37dc444f9b0da49dd", + "rev": "ea7f1f06811ce7fcc81d6c6fd4213150c23edcf2", "type": "github" }, "original": { @@ -137,11 +137,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1771876204, - "narHash": "sha256-nTX+Qa3W+xsFxBl+lr4RsWvC4vgZocLt/qDeIvnf4+w=", + "lastModified": 1771982860, + "narHash": "sha256-DL7SZYGknFzHMDmvk/kSnV/Tk7R8+qRpsCykMowjfes=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "2f951adfab1f5a090fe5ea4c5eaf11efca7f1039", + "rev": "932b57f0e990243e05008941a1933642370e4340", "type": "github" }, "original": { diff --git a/home/modules/packages.nix b/home/modules/packages.nix index fb6e6c6..2c2c4b1 100644 --- a/home/modules/packages.nix +++ b/home/modules/packages.nix @@ -151,7 +151,7 @@ in xdg.configFile."sioyek/prefs_user.config" = lib.mkIf sioyek { text = '' wheel_zoom_on_cursor 1 - startup_commands toggle_presentation_mode; show_statusbar 0 + startup_commands show_statusbar 0 page_separator_width 10 should_launch_new_window 1