From cebafd29d604bf1ba8dc927ce4326bee4ff61a53 Mon Sep 17 00:00:00 2001 From: Vasili Svirydau Date: Wed, 13 May 2026 10:38:44 -0700 Subject: [PATCH] chore: updating dependencies, adding merge config, adding fnox tool --- .chezmoi.toml.tmpl | 9 +++ dot_config/mise/config.toml | 1 + dot_config/nvim/init.lua | 100 ++++++++++++++-------------- dot_config/nvim/nvim-pack-lock.json | 40 +++++------ 4 files changed, 80 insertions(+), 70 deletions(-) diff --git a/.chezmoi.toml.tmpl b/.chezmoi.toml.tmpl index 96dc26a..f907011 100644 --- a/.chezmoi.toml.tmpl +++ b/.chezmoi.toml.tmpl @@ -7,3 +7,12 @@ [edit] command = "nvim" + +[merge] + command = "bcomp" + args = [ + {{ printf "%q" "{{ .Destination }}" }}, + {{ printf "%q" "{{ .Source }}" }}, + {{ printf "%q" "{{ .Target }}" }}, + {{ printf "%q" "{{ .Source }}" }}, + ] diff --git a/dot_config/mise/config.toml b/dot_config/mise/config.toml index cde416c..4d0f4a9 100644 --- a/dot_config/mise/config.toml +++ b/dot_config/mise/config.toml @@ -1,5 +1,6 @@ [tools] chezmoi = "latest" +fnox = "latest" jq = "latest" lazygit = "latest" lua-language-server = "latest" diff --git a/dot_config/nvim/init.lua b/dot_config/nvim/init.lua index e3e4b0d..efb53e0 100644 --- a/dot_config/nvim/init.lua +++ b/dot_config/nvim/init.lua @@ -20,27 +20,27 @@ vim.keymap.set("n", "", "zz") vim.keymap.set("n", "w", ":update") vim.keymap.set("n", "", ":Pick files") vim.keymap.set("n", "h", ":Pick help") -vim.keymap.set("n", "cz", function() require("chezmoi.pick").mini() end) -- Pick from chezmoi managed files +vim.keymap.set("n", "cz", function() require("chezmoi.pick").mini() end) -- Pick from chezmoi managed files vim.pack.add( { - { src = "https://github.com/nvim-lua/plenary.nvim" }, -- Base functions library - { src = "https://github.com/folke/lazydev.nvim" }, -- Lua Vim types - { src = "https://github.com/andythigpen/nvim-coverage" }, -- Code coverage visualuzer - { src = "https://github.com/echasnovski/mini.icons" }, -- Icons for Ctrl-P - { src = "https://github.com/echasnovski/mini.pick" }, -- Ctrl-P Alternative - { src = "https://github.com/echasnovski/mini.extra" }, -- Additional things for mini tools - { src = "https://github.com/lewis6991/gitsigns.nvim" }, -- Show git changes in the gutter - { src = "https://github.com/neovim/nvim-lspconfig" }, -- Common LSP Configurations - { src = "https://github.com/sbdchd/neoformat" }, -- Formatter - { src = "https://github.com/tpope/vim-fugitive" }, -- Git bindings + { src = "https://github.com/nvim-lua/plenary.nvim" }, -- Base functions library + { src = "https://github.com/folke/lazydev.nvim" }, -- Lua Vim types + { src = "https://github.com/andythigpen/nvim-coverage" }, -- Code coverage visualuzer + { src = "https://github.com/echasnovski/mini.icons" }, -- Icons for Ctrl-P + { src = "https://github.com/echasnovski/mini.pick" }, -- Ctrl-P Alternative + { src = "https://github.com/echasnovski/mini.extra" }, -- Additional things for mini tools + { src = "https://github.com/lewis6991/gitsigns.nvim" }, -- Show git changes in the gutter + { src = "https://github.com/neovim/nvim-lspconfig" }, -- Common LSP Configurations + { src = "https://github.com/sbdchd/neoformat" }, -- Formatter + { src = "https://github.com/tpope/vim-fugitive" }, -- Git bindings { src = "https://github.com/vim-airline/vim-airline-themes" }, -- Status bar theme - { src = "https://github.com/vim-airline/vim-airline" }, -- Status bar - { src = "https://github.com/rebelot/kanagawa.nvim" }, -- Theme - { src = "https://github.com/mfussenegger/nvim-lint" }, -- Linter + { src = "https://github.com/vim-airline/vim-airline" }, -- Status bar + { src = "https://github.com/rebelot/kanagawa.nvim" }, -- Theme + { src = "https://github.com/mfussenegger/nvim-lint" }, -- Linter { src = "https://github.com/rachartier/tiny-inline-diagnostic.nvim" }, -- Inline diagnostics - { src = "https://github.com/j-hui/fidget.nvim" }, -- LSP Status Popup - { src = "https://github.com/xvzc/chezmoi.nvim" }, -- Chezmoi dotfiles manager + { src = "https://github.com/j-hui/fidget.nvim" }, -- LSP Status Popup + { src = "https://github.com/xvzc/chezmoi.nvim" }, -- Chezmoi dotfiles manager } ) @@ -92,38 +92,38 @@ vim.diagnostic.config({ virtual_text = false }) -- Chezmoi require("chezmoi").setup { - edit = { - watch = false, - force = false, - ignore_patterns = { - "run_onchange_.*", - "run_once_.*", - "%.chezmoiignore", - "%.chezmoitemplate", - -- Add custom patterns here - }, - }, - events = { - on_open = { - notification = { - enable = true, - msg = "Opened a chezmoi-managed file", - opts = {}, - }, - }, - on_watch = { - notification = { - enable = true, - msg = "This file will be automatically applied", - opts = {}, - }, - }, - on_apply = { - notification = { - enable = true, - msg = "Successfully applied", - opts = {}, - }, - }, - }, + edit = { + watch = false, + force = false, + ignore_patterns = { + "run_onchange_.*", + "run_once_.*", + "%.chezmoiignore", + "%.chezmoitemplate", + -- Add custom patterns here + }, + }, + events = { + on_open = { + notification = { + enable = true, + msg = "Opened a chezmoi-managed file", + opts = {}, + }, + }, + on_watch = { + notification = { + enable = true, + msg = "This file will be automatically applied", + opts = {}, + }, + }, + on_apply = { + notification = { + enable = true, + msg = "Successfully applied", + opts = {}, + }, + }, + }, } diff --git a/dot_config/nvim/nvim-pack-lock.json b/dot_config/nvim/nvim-pack-lock.json index abdc8c5..3f5b044 100644 --- a/dot_config/nvim/nvim-pack-lock.json +++ b/dot_config/nvim/nvim-pack-lock.json @@ -5,43 +5,43 @@ "src": "https://github.com/xvzc/chezmoi.nvim" }, "fidget.nvim": { - "rev": "2cb5edb2dd6700a958a446b20bb2be04d318da9d", + "rev": "889e2e96edef4e144965571d46f7a77bcc4d0ddf", "src": "https://github.com/j-hui/fidget.nvim" }, "gitsigns.nvim": { - "rev": "b01433169be710d6c69f7b4ee264d9670698b831", + "rev": "dd3f588bacbeb041be6facf1742e42097f62165d", "src": "https://github.com/lewis6991/gitsigns.nvim" }, "kanagawa.nvim": { - "rev": "debe91547d7fb1eef34ce26a5106f277fbfdd109", + "rev": "bb85e4bfc8d89b0e62c8fa53ccdd13d12e2f77b3", "src": "https://github.com/rebelot/kanagawa.nvim" }, "lazydev.nvim": { - "rev": "2367a6c0a01eb9edb0464731cc0fb61ed9ab9d2c", + "rev": "ff2cbcba459b637ec3fd165a2be59b7bbaeedf0d", "src": "https://github.com/folke/lazydev.nvim" }, "mason.nvim": { - "rev": "9e25c98d4826998460926f8c5c2284848d80ae89", + "rev": "e54f5bf5f12c560da31c17eee5b3e1bd369f3ff9", "src": "https://github.com/mason-org/mason.nvim" }, "mini.extra": { - "rev": "0dec9611833d058f9d2d48f6333b41631f5ef3b9", + "rev": "cf027da13fd217cfe3af6ef978d0e947c7ee0f7a", "src": "https://github.com/echasnovski/mini.extra" }, "mini.icons": { - "rev": "b8f6fa6f5a3fd0c56936252edcd691184e5aac0c", + "rev": "9c7b1b90b15bdd69c52f6e31889dbc9987c30ec4", "src": "https://github.com/echasnovski/mini.icons" }, "mini.pick": { - "rev": "c8f4ff0251ccb8c6a993ee0dee4e06d9c21a4b99", + "rev": "975e398570dd15696575c5374f94e78fd29a7a69", "src": "https://github.com/echasnovski/mini.pick" }, "neoformat": { - "rev": "04264e941927ea24f2f5b092b7503cfe9e15c893", + "rev": "9d95e5ca3ab263363758d5b1d7a174a30556ab2d", "src": "https://github.com/sbdchd/neoformat" }, "nvim": { - "rev": "702d15f269777b8261f3b8904fb0db35f37a1cd9", + "rev": "426dbebe06b5c69fd846ceb17b42e12f890aedf1", "src": "https://github.com/catppuccin/nvim" }, "nvim-coverage": { @@ -49,11 +49,11 @@ "src": "https://github.com/andythigpen/nvim-coverage" }, "nvim-java": { - "rev": "083114902630de67dd82fda73892966748a1eb7c", + "rev": "602a5f7fa92f9c1d425a2159133ff9de86842f0a", "src": "https://github.com/nvim-java/nvim-java" }, "nvim-java-core": { - "rev": "401bf7683012a25929a359deec418f36beb876e2", + "rev": "229ebcdfa33c75cf746f97c46c2893b2de3626e5", "src": "https://github.com/nvim-java/nvim-java-core" }, "nvim-java-dap": { @@ -69,35 +69,35 @@ "src": "https://github.com/nvim-java/nvim-java-test" }, "nvim-lint": { - "rev": "7ef127aaede2a4d5ad8df8321e2eb4e567f29594", + "rev": "665525810630701b84181e4d9eefd24b49845b29", "src": "https://github.com/mfussenegger/nvim-lint" }, "nvim-lspconfig": { - "rev": "4d3b3bb8815fbe37bcaf3dbdb12a22382bc11ebe", + "rev": "75e49cfa588a89ca667d767c0afef3ceac205faa", "src": "https://github.com/neovim/nvim-lspconfig" }, "plenary.nvim": { - "rev": "b9fd5226c2f76c951fc8ed5923d85e4de065e509", + "rev": "74b06c6c75e4eeb3108ec01852001636d85a932b", "src": "https://github.com/nvim-lua/plenary.nvim" }, "spring-boot.nvim": { - "rev": "a6a61c048238457b6a67ec408f4f4d72213fadca", + "rev": "98c6ff1dcdda943d341bba3c00ae9d190a2e5f7d", "src": "https://github.com/JavaHello/spring-boot.nvim" }, "tiny-inline-diagnostic.nvim": { - "rev": "7dcf8542059fb15c978de845fc8665428ae13a04", + "rev": "147af4e49f51dd48f41972de26552872b8ba7b25", "src": "https://github.com/rachartier/tiny-inline-diagnostic.nvim" }, "vim-airline": { - "rev": "5ca7f0b7fef4f174d57fd741b477bbbac0b7886a", + "rev": "1586662296c9dc946083e17cb6a4ef0b3e7c0d68", "src": "https://github.com/vim-airline/vim-airline" }, "vim-airline-themes": { - "rev": "0e976956eb674db8a6f72fae4dda6d1277433660", + "rev": "77aab8c6cf7179ddb8a05741da7e358a86b2c3ab", "src": "https://github.com/vim-airline/vim-airline-themes" }, "vim-fugitive": { - "rev": "61b51c09b7c9ce04e821f6cf76ea4f6f903e3cf4", + "rev": "3b753cf8c6a4dcde6edee8827d464ba9b8c4a6f0", "src": "https://github.com/tpope/vim-fugitive" }, "vim-hybrid": {