diff --git a/config/alacritty/alacritty.toml b/config/alacritty/alacritty.toml index 629444c..85ca9bc 100644 --- a/config/alacritty/alacritty.toml +++ b/config/alacritty/alacritty.toml @@ -3,6 +3,7 @@ import = [ "~/.config/alacritty/dank-theme.toml" ] [font] size = 13 +offset = { x = 0, y = 5 } [font.normal] family = "Hack Nerd Font" diff --git a/config/nvim/init.lua b/config/nvim/init.lua index f0d04c9..5c8eed2 100644 --- a/config/nvim/init.lua +++ b/config/nvim/init.lua @@ -40,6 +40,7 @@ map("v", "K", ":m '<-2gv=gv") map("v", "", "" , ">gv") map("n", "gd", ":lua vim.lsp.buf.definition()") +map("n", "r", ":lua vim.lsp.buf.rename()") map("n", "p", ":b#") map("n", "e", ":Ex") map("n", "x", ":bd") diff --git a/config/nvim/lua/plugins/init.lua b/config/nvim/lua/plugins/init.lua index 48fae45..269b0b6 100644 --- a/config/nvim/lua/plugins/init.lua +++ b/config/nvim/lua/plugins/init.lua @@ -1,12 +1,11 @@ vim.pack.add({ { src = "https://github.com/ibhagwan/fzf-lua" }, + { src = "https://github.com/catppuccin/nvim", name = "catppuccin" }, { src = "https://github.com/tribela/transparent.nvim" }, { src = "https://github.com/neovim/nvim-lspconfig" }, - { src="https://github.com/folke/trouble.nvim" }, - { src="https://github.com/stevearc/oil.nvim" }, - { src="https://github.com/akinsho/toggleterm.nvim" }, - { src="https://github.com/romus204/tree-sitter-manager.nvim" } + { src = "https://github.com/romus204/tree-sitter-manager.nvim" } }) +vim.cmd(":colorscheme catppuccin-nvim") require("tree-sitter-manager").setup({}) @@ -25,48 +24,9 @@ require("fzf-lua").setup() map("n", "f", ":lua FzfLua.files()") map("n", "o", ":lua FzfLua.buffers()") map("n", "ss", ":lua FzfLua.grep_project()") -map("n", "sb", ":lua FzfLua.grep_curbuf()") +map("n", "sf", ":lua FzfLua.grep_curbuf()") map("n", "sw", ":lua FzfLua.grep_cword()") map("n", "sh", ":lua FzfLua.help_tags()") +map("n", "sd", ":lua FzfLua.diagnostics_document()") +map("n", "sa", ":lua FzfLua.lsp_code_actions()") -require("trouble").setup() -map("n", "ca", ":lua FzfLua.lsp_code_actions()") -map('n', 'cd', ":Trouble diagnostics toggle") - -require("oil").setup({ - keymaps = { - ["q"] = { "actions.close", mode = "n" }, - ["h"] = "actions.parent", - ["l"] = "actions.select", - [""] = false, - [""] = false, - ["gh"] = "actions.toggle_hidden", - }, - view_options = { - show_hidden = false, - } -}) -map("n", "e", ":Oil " .. vim.fn.getcwd() .. "") - -require("toggleterm").setup({ - open_mapping = [[]], - size = function(term) - if term.direction == "horizontal" then - return vim.o.lines * 0.35 - elseif term.direction == "vertical" then - return vim.o.columns * 0.35 - end - return 15 - end, -}) -map({"t","n"}, "", function() require("toggleterm").toggle(1, nil, nil, "float") end) -map({"t","n"}, "", function() require("toggleterm").toggle(1, nil, nil, "vertical") end) - -local Terminal = require('toggleterm.terminal').Terminal -local lazygit = Terminal:new({ cmd = "gitu", hidden = true, direction = "float", }) - -function _lazygit_toggle() - lazygit:toggle() -end - -vim.api.nvim_set_keymap("n", "g", "lua _lazygit_toggle()", {noremap = true, silent = true}) diff --git a/config/tmux/.tmux.conf b/config/tmux/.tmux.conf index 8ec6f98..ad9444c 100644 --- a/config/tmux/.tmux.conf +++ b/config/tmux/.tmux.conf @@ -45,7 +45,7 @@ unbind % bind '`' split-window -h -l 40% -c "#{pane_current_path}" bind '\' split-window -v -l 35% -c "#{pane_current_path}" -bind-key -n 'C-\' run-shell -b "~/.local/bin/tmux-toggle-term float" +bind j run-shell -b "~/.local/bin/tmux-toggle-term float" bind g run-shell 'tmux popup -d "#{pane_current_path}" -xC -yC -w90% -h90% -E gitu' bind e run-shell 'tmux popup -d "#{pane_current_path}" -xC -yC -w90% -h90% -E "~/.local/bin/tmux-lf-helix"'