diff --git a/dot_config/lazygit/empty_config.yml b/dot_config/lazygit/empty_config.yml new file mode 100644 index 0000000..5fd5726 --- /dev/null +++ b/dot_config/lazygit/empty_config.yml @@ -0,0 +1,2 @@ +git: + autoFetch: false diff --git a/dot_config/mise/config.toml b/dot_config/mise/config.toml index 58c5d99..a8c7928 100644 --- a/dot_config/mise/config.toml +++ b/dot_config/mise/config.toml @@ -14,6 +14,8 @@ starship = "latest" "npm:graphql-language-service-cli" = "latest" "npm:bash-language-server" = "latest" "npm:yaml-language-server" = "latest" +"npm:vscode-langservers-extracted" = "latest" +tmux = "latest" [env] RIPGREP_CONFIG_PATH = "{{ env.HOME }}/.config/ripgrep/config" diff --git a/dot_config/nvim/init.lua b/dot_config/nvim/init.lua index b16a915..3a06139 100644 --- a/dot_config/nvim/init.lua +++ b/dot_config/nvim/init.lua @@ -81,7 +81,7 @@ vim.api.nvim_create_autocmd({ "BufWritePost" }, { vim.cmd.colorscheme "kanagawa-dragon" -- LSP -vim.lsp.enable({ "lua_ls", "ts_ls", "bashls", "yamlls", "graphql" }) +vim.lsp.enable({ "lua_ls", "ts_ls", "bashls", "yamlls", "graphql", "jsonls" }) ---@type vim.lsp.Config local lua_ls_config = { ---@type lspconfig.settings.lua_ls diff --git a/dot_config/nvim/nvim-pack-lock.json b/dot_config/nvim/nvim-pack-lock.json index b1337c4..d03be9a 100644 --- a/dot_config/nvim/nvim-pack-lock.json +++ b/dot_config/nvim/nvim-pack-lock.json @@ -5,15 +5,15 @@ "src": "https://github.com/xvzc/chezmoi.nvim" }, "fidget.nvim": { - "rev": "889e2e96edef4e144965571d46f7a77bcc4d0ddf", + "rev": "82404b196e73a00b1727a91903beef5ddc319d22", "src": "https://github.com/j-hui/fidget.nvim" }, "fzf-lua": { - "rev": "fea9eedc6894c44d44cbb772a5cd11c93b82d7a1", + "rev": "988416cc782dfe28bff3f0da9b8c943b236cd86a", "src": "https://github.com/ibhagwan/fzf-lua" }, "gitsigns.nvim": { - "rev": "dd3f588bacbeb041be6facf1742e42097f62165d", + "rev": "25050e4ed39e628282831d4cbecb1850454ce915", "src": "https://github.com/lewis6991/gitsigns.nvim" }, "kanagawa.nvim": { @@ -25,19 +25,19 @@ "src": "https://github.com/folke/lazydev.nvim" }, "mason.nvim": { - "rev": "e54f5bf5f12c560da31c17eee5b3e1bd369f3ff9", + "rev": "16ba83bfc8a25f52bb545134f5bee082b195c460", "src": "https://github.com/mason-org/mason.nvim" }, "mini.extra": { - "rev": "cf027da13fd217cfe3af6ef978d0e947c7ee0f7a", + "rev": "ffb7b3a726e059b011b3655f26e61ec6f7cf5b84", "src": "https://github.com/nvim-mini/mini.extra" }, "mini.icons": { - "rev": "9c7b1b90b15bdd69c52f6e31889dbc9987c30ec4", + "rev": "520995f1d75da0e4cc901ee95080b1ff2bc46b94", "src": "https://github.com/nvim-mini/mini.icons" }, "mini.pick": { - "rev": "975e398570dd15696575c5374f94e78fd29a7a69", + "rev": "34fdef3b0966974378c4f39e3ddb54ffc628fbe9", "src": "https://github.com/nvim-mini/mini.pick" }, "neoformat": { @@ -45,7 +45,7 @@ "src": "https://github.com/sbdchd/neoformat" }, "nvim": { - "rev": "426dbebe06b5c69fd846ceb17b42e12f890aedf1", + "rev": "0303a7208dba448c459767486a38a6ec05c4216b", "src": "https://github.com/catppuccin/nvim" }, "nvim-coverage": { @@ -77,11 +77,11 @@ "src": "https://github.com/nvim-java/nvim-java-test" }, "nvim-lint": { - "rev": "665525810630701b84181e4d9eefd24b49845b29", + "rev": "d48f3a76189d03b2239f6df1b2f7e3fa8353743b", "src": "https://github.com/mfussenegger/nvim-lint" }, "nvim-lspconfig": { - "rev": "75e49cfa588a89ca667d767c0afef3ceac205faa", + "rev": "229b79051b380377664edc4cbd534930154921a1", "src": "https://github.com/neovim/nvim-lspconfig" }, "nvim-surround": { @@ -98,11 +98,11 @@ "src": "https://github.com/JavaHello/spring-boot.nvim" }, "tiny-inline-diagnostic.nvim": { - "rev": "147af4e49f51dd48f41972de26552872b8ba7b25", + "rev": "680762989e8b05a72e90769959d0fb9a557e6917", "src": "https://github.com/rachartier/tiny-inline-diagnostic.nvim" }, "vim-airline": { - "rev": "1586662296c9dc946083e17cb6a4ef0b3e7c0d68", + "rev": "f02ddb633868d0b1e83f2612b5b25ef1ecd210db", "src": "https://github.com/vim-airline/vim-airline" }, "vim-airline-themes": { diff --git a/dot_config/tmux/tmux.conf b/dot_config/tmux/tmux.conf index 6351d3f..cc6a89a 100644 --- a/dot_config/tmux/tmux.conf +++ b/dot_config/tmux/tmux.conf @@ -20,7 +20,7 @@ unbind C-a unbind C-b set -g prefix C-a -bind-key C-a last-window +bind C-a last-window set -g terminal-overrides 'xterm*:smcup@:rmcup@' # enable native xterm scrolling where available @@ -37,7 +37,7 @@ set -g mouse on set-option -ga update-environment "DISPLAY SSH_ASKPASS SSH_AUTH_SOCK SSH_AGENT_PID SSH_CONNECTION WINDOWID XAUTHORITY" -new-session # always create a session (can always `tmux a`) +# new-session # always create a session (can always `tmux a`) set -g status on set -g status-interval 15 @@ -51,3 +51,6 @@ set -g status-right "#[fg=colour235,bg=colour237,nobold,nounderscore,noitalics] set -g status-right-length 100 set -g status-right-style default set -g status-style fg=black,bg=colour237 + +bind h display-popup -T "htop" -E -w 90% -h 90% "htop" +bind g display-popup -T "lazygit" -E -w 90% -h 90% "cd #{pane_current_path} && lazygit" diff --git a/empty_dot_ripgreprc b/empty_dot_ripgreprc deleted file mode 100644 index 05c8437..0000000 --- a/empty_dot_ripgreprc +++ /dev/null @@ -1,2 +0,0 @@ ---hidden ---smart-case