diff --git a/nvim/.config/nvim/after/plugin/harpoon.lua b/nvim/.config/nvim/after/plugin/harpoon.lua index 3b74a82..09aded2 100644 --- a/nvim/.config/nvim/after/plugin/harpoon.lua +++ b/nvim/.config/nvim/after/plugin/harpoon.lua @@ -7,4 +7,3 @@ vim.keymap.set("n", "", ui.toggle_quick_menu) vim.keymap.set("n", "", function() ui.nav_file(1) end) vim.keymap.set("n", "", function() ui.nav_file(2) end) vim.keymap.set("n", "", function() ui.nav_file(3) end) -vim.keymap.set("n", "", function() ui.nav_file(4) end) diff --git a/nvim/.config/nvim/after/plugin/lsp.lua b/nvim/.config/nvim/after/plugin/lsp.lua index 763ab9a..0345ef1 100644 --- a/nvim/.config/nvim/after/plugin/lsp.lua +++ b/nvim/.config/nvim/after/plugin/lsp.lua @@ -50,7 +50,7 @@ lsp.on_attach(function(client, bufnr) vim.keymap.set("n", "vws", function() vim.lsp.workspace_symbol() end, opts) vim.keymap.set("n", "vd", function() vim.diagnostic.open_float() end, opts) vim.keymap.set("n", "[d", function() vim.diagnostic.goto_next() end, opts) - vim.keymap.set("n", "]d", function() vim.diagnosti.goto_prev() end, opts) + vim.keymap.set("n", "]d", function() vim.diagnostic.goto_prev() end, opts) vim.keymap.set("n", "vca", function() vim.lsp.buf.code_action() end, opts) vim.keymap.set("n", "vrr", function() vim.lsp.buf.references() end, opts) vim.keymap.set("n", "vrn", function() vim.lsp.buf.rename() end, opts) diff --git a/nvim/.config/nvim/after/plugin/telescope.lua b/nvim/.config/nvim/after/plugin/telescope.lua index 737f21b..b5b1af4 100644 --- a/nvim/.config/nvim/after/plugin/telescope.lua +++ b/nvim/.config/nvim/after/plugin/telescope.lua @@ -1,6 +1,6 @@ local builtin = require('telescope.builtin') vim.keymap.set('n', 'pf', builtin.find_files, {}) -vim.keymap.set('n', '', builtin.git_files, {}) +vim.keymap.set('n', 'pg', builtin.git_files, {}) vim.keymap.set('n', 'pb', builtin.buffers, {}) vim.keymap.set('n', 'ps', function() builtin.grep_string({ search = vim.fn.input("Grep > ") }) diff --git a/tmux/.tmux.conf b/tmux/.tmux.conf index df49287..98673e8 100644 --- a/tmux/.tmux.conf +++ b/tmux/.tmux.conf @@ -3,13 +3,20 @@ set-option -g default-terminal "screen-256color" set-option -g focus-events on set -s escape-time 0 unbind C-b -set-option -g prefix C-a -bind-key C-a send-prefix +set-option -g prefix C-l +bind-key C-l send-prefix +set -g repeat-time 1000 set -g status-style 'bg=#333333 fg=#5eacd3' +set -g status-right "#{?window_bigger,[#{window_offset_x}#,#{window_offset_y}] ,}\"#{=21:pane_title}\" %H:%M %d-%b-%y #(tms sessions)" bind r source-file ~/.tmux.conf set -g base-index 1 +bind C-o display-popup -E "tms" +bind C-l display-popup -E "tms switch" +bind C-w display-popup -E "tms windows" +bind C-r "run-shell 'tms refresh'" + set-window-option -g mode-keys vi bind -T copy-mode-vi v send-keys -X begin-selection bind -T copy-mode-vi y send-keys -X copy-pipe-and-cancel 'xclip -in -selection clipboard'