Updates to software configs, nvim, alacritty, tmux

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"

config/nvim/init.lua

@@ -40,6 +40,7 @@ map("v", "K", ":m '<-2<CR>gv=gv")
 map("v", "<S-Tab>", "<gv")
 map("v", "<Tab>"  , ">gv")
 map("n", "gd", ":lua vim.lsp.buf.definition()<CR>")
+map("n", "<leader>r", ":lua vim.lsp.buf.rename()<CR>")
 map("n", "<leader>p", ":b#<CR>")
 map("n", "<leader>e", ":Ex<CR>")
 map("n", "<leader>x", ":bd<CR>")

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" }
 })
+vim.cmd(":colorscheme catppuccin-nvim")
 
 require("tree-sitter-manager").setup({})
 
@@ -25,48 +24,9 @@ require("fzf-lua").setup()
 map("n", "<leader>f", ":lua FzfLua.files()<CR>")
 map("n", "<leader>o", ":lua FzfLua.buffers()<CR>")
 map("n", "<leader>ss", ":lua FzfLua.grep_project()<CR>")
-map("n", "<leader>sb", ":lua FzfLua.grep_curbuf()<CR>")
+map("n", "<leader>sf", ":lua FzfLua.grep_curbuf()<CR>")
 map("n", "<leader>sw", ":lua FzfLua.grep_cword()<CR>")
 map("n", "<leader>sh", ":lua FzfLua.help_tags()<CR>")
+map("n", "<leader>sd", ":lua FzfLua.diagnostics_document()<CR>")
+map("n", "<leader>sa", ":lua FzfLua.lsp_code_actions()<CR>")
 
-require("trouble").setup()
-map("n", "<leader>ca", ":lua FzfLua.lsp_code_actions()<CR>")
-map('n', '<leader>cd', ":Trouble diagnostics toggle<CR>")
-
-require("oil").setup({
-    keymaps = {
-        ["q"] = { "actions.close", mode = "n" },
-        ["h"] = "actions.parent",
-        ["l"] = "actions.select",
-        ["<C-s>"] = false,
-        ["<C-h>"] = false,
-        ["gh"] = "actions.toggle_hidden",
-    },
-    view_options = {
-        show_hidden = false,
-    }
-})
-map("n", "<leader>e", ":Oil " .. vim.fn.getcwd() .. "<CR>")
-
-require("toggleterm").setup({
-    open_mapping = [[<C-\>]],
-    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"}, "<C-`>", function() require("toggleterm").toggle(1, nil, nil, "float") end)
-map({"t","n"}, "<C-\\>", 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", "<leader>g", "<cmd>lua _lazygit_toggle()<CR>", {noremap = true, silent = true})

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"'