diff --git a/nvim/.config/nvim/lua/plugins/git.lua b/nvim/.config/nvim/lua/plugins/git.lua new file mode 100644 index 0000000..0f7d10c --- /dev/null +++ b/nvim/.config/nvim/lua/plugins/git.lua @@ -0,0 +1,11 @@ +return { + { + "tpope/vim-fugitive" + }, + { + "lewis6991/gitsigns.nvim", + config = function() + require("gitsigns").setup() + end + } +} diff --git a/nvim/.config/nvim/lua/plugins/lsp-config.lua b/nvim/.config/nvim/lua/plugins/lsp-config.lua index b5b8745..1e3de0e 100644 --- a/nvim/.config/nvim/lua/plugins/lsp-config.lua +++ b/nvim/.config/nvim/lua/plugins/lsp-config.lua @@ -7,6 +7,9 @@ return { }, { "williamboman/mason-lspconfig.nvim", + opts = { + auto_install = true + }, config = function() require('mason-lspconfig').setup({ ensure_installed = { "lua_ls", "bashls", "gopls", "jsonls", "biome", "zk", "pyre", "rust_analyzer", "sqls", "taplo", "yamlls" } @@ -30,8 +33,6 @@ return { lspconfig.sqls.setup({ capabilities = capabilities }) lspconfig.taplo.setup({ capabilities = capabilities }) lspconfig.yamlls.setup({ capabilities = capabilities }) - vim.keymap.set("n", "ca", vim.lsp.buf.code_action, {}) - vim.keymap.set("n", "K", vim.lsp.buf.hover, {}) - end + end } } diff --git a/nvim/.config/nvim/lua/plugins/neotree.lua b/nvim/.config/nvim/lua/plugins/neotree.lua index 35a3834..97e0d10 100644 --- a/nvim/.config/nvim/lua/plugins/neotree.lua +++ b/nvim/.config/nvim/lua/plugins/neotree.lua @@ -1,4 +1,4 @@ -return { +return { 'nvim-neo-tree/neo-tree.nvim', branch = 'v3.x', dependencies = { @@ -6,9 +6,21 @@ return { 'nvim-tree/nvim-web-devicons', 'MunifTanjim/nui.nvim', }, - config = function() - vim.keymap.set("n", "", ":Neotree filesystem reveal left") -- ctrl + n = show filesystem on left side - end + opts = { + filesystem = { + filtered_items = { + visible = true, + show_hidden_count = true, + hide_dotfiles = false, + hide_gitignored = true, + hide_by_name = { + '.DS_Store', + 'thumbs.db' + }, + never_show = { '.git' } + } + } + } } diff --git a/nvim/.config/nvim/lua/vim-settings.lua b/nvim/.config/nvim/lua/vim-settings.lua index ea24575..37ab5d6 100644 --- a/nvim/.config/nvim/lua/vim-settings.lua +++ b/nvim/.config/nvim/lua/vim-settings.lua @@ -2,4 +2,12 @@ vim.cmd("set expandtab") vim.cmd("set tabstop=2") vim.cmd("set softtabstop=2") vim.cmd("set shiftwidth=2") +vim.cmd("set clipboard+=unnamedplus") vim.g.mapleader = " " + +-- Setup custom keybinds +vim.keymap.set("n", "", "Neotree toggle") -- Open Neotree fs with CTRL - n +vim.keymap.set("n", "ca", vim.lsp.buf.code_action) -- Open Code actions with Space - ca +vim.keymap.set("n", "K", vim.lsp.buf.hover) -- Open information with captial K +vim.keymap.set("n", "gp", "Gitsigns preview_hunk") -- Open tab with changes with Space - gp +vim.keymap.set("n", "gt", "Gitsigns toggle_current_line_blame") -- Shows when and who changed with Space - gt diff --git a/plasma/.config/gtkrc-2.0 b/plasma/.config/gtkrc-2.0 index 8e65ba5..6704a09 100644 --- a/plasma/.config/gtkrc-2.0 +++ b/plasma/.config/gtkrc-2.0 @@ -1,4 +1,4 @@ -# created by KDE Plasma, Tue Jun 18 23:34:43 2024 +# created by KDE Plasma, Wed Jun 26 10:00:02 2024 # gtk-alternative-button-order = 1