aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjakobst1n <jakob.stendahl@outlook.com>2024-02-27 21:45:25 +0100
committerjakobst1n <jakob.stendahl@outlook.com>2024-02-27 21:46:06 +0100
commit09376c1e359ed257f1f31811dea1fe93a2bda617 (patch)
tree55c31129d1d96b44ff77adf23150a294d55cc5cb
parent860d096ad7ea024124ec6926a6968d25db59c2d2 (diff)
downloaddotfiles-09376c1e359ed257f1f31811dea1fe93a2bda617.tar.gz
dotfiles-09376c1e359ed257f1f31811dea1fe93a2bda617.zip
tweaks
-rwxr-xr-xCommon/nvim/lua/basic.lua32
-rw-r--r--linux/tmux.conf.m44
2 files changed, 6 insertions, 30 deletions
diff --git a/Common/nvim/lua/basic.lua b/Common/nvim/lua/basic.lua
index ab3a9c7..82c0194 100755
--- a/Common/nvim/lua/basic.lua
+++ b/Common/nvim/lua/basic.lua
@@ -32,7 +32,7 @@ vim.opt.path:append("**")
-- Turn off netrw banner
vim.g.netrw_banner = 0
-- Tree style listing in netrw
-vim.g.netrw_liststyle = 3
+vim.g.netrw_liststyle = 1
-- Make browse set split
-- vim.g.netrw_browse_split = 4
-- Split to the right, instead of to the left
@@ -162,20 +162,10 @@ map('', '<C-k>', '<C-W>k', silentnoremap)
map('', '<C-h>', '<C-W>h', silentnoremap)
map('', '<C-l>', '<C-W>l', silentnoremap)
--- Close current buffer
-map('n', '<leader>bd', ':Bclose<cr>:tabclose<cr>gT', silentnoremap)
--- Close all buffers
-map('n', '<leader>ba', ':bufdo bd<cr>', silentnoremap)
--- Navigate buffers
-map('n', '<leader>l', ':bnext<cr>', silentnoremap)
-map('n', '<leader>h', ':bprevious<cr>', silentnoremap)
-
-- Tab commands
-map('n', '<leader>tn', ':tabnew<cr>', silentnoremap)
-map('n', '<leader>to', ':tabonly<cr>', silentnoremap)
---map('n', '<leader>tc', ':tabclose<cr>', silentnoremap)
-map('n', '<leader>tm', ':tabmove', silentnoremap)
-map('n', '<leader>t<leader>', ':tabnext', silentnoremap)
+map('n', '<leader>tn', ':tabnext<cr>', silentnoremap)
+map('n', '<leader>tc', ':tabnew<cr>', silentnoremap)
+map('n', '<leader>tx', ':tabclose<cr>', silentnoremap)
-- Switch CWD to directory of the open buffer
map('n', '<leader>cd', ':cd %:p:h<cr>:pwd<cr', silentnoremap)
@@ -205,20 +195,6 @@ vim.opt.laststatus = 2
Mappings
--]]
--- Move a line of text using ALT+[jk]
-map('n', '<M-j>', 'mz:m+<cr>`z', silentnoremap)
-map('n', '<M-k>', 'mz:m-2<cr>`z', silentnoremap)
-map('v', '<M-j>', ":m'>+<cr>`<my`>mzgv`yo`z", silentnoremap)
-map('v', '<M-k>', ":m'<-2<cr>`>my`<mzgv`yo`z", silentnoremap)
-
--- Move line using Command+[jk] on mac
-if vim.fn.has("mac") or vim.fn.has("macunix") then
- map('n', '<D-j>', '<M-j>', silentnoremap)
- map('n', '<D-k>', '<M-k>', silentnoremap)
- map('v', '<D-j>', '<M-j>', silentnoremap)
- map('v', '<D-k>', '<M-k>', silentnoremap)
-end
-
-- Interact with system clipboard
map('v', '<leader>y', '"+y', noremap)
map('n', '<leader>Y', '"+yg_', noremap)
diff --git a/linux/tmux.conf.m4 b/linux/tmux.conf.m4
index 29848d4..ae6ca78 100644
--- a/linux/tmux.conf.m4
+++ b/linux/tmux.conf.m4
@@ -45,8 +45,8 @@ bind-key -T copy-mode-vi 'r' send -X rectangle-toggle
bind-key -T copy-mode-vi 'y' send -X copy-pipe-and-cancel 'xclip -sel clip -i'
unbind -T copy-mode-vi Enter
bind-key -T copy-mode-vi Enter send-keys -X copy-pipe-and-cancel 'xclip -se c -i'
-#bind-key -T copy-mode-vi MouseDragEnd1Pane send-keys -X copy-pipe-and-cancel 'xclip -se c -ind-key -T copy-mode-vi Enter send-keys -X copy-pipe-and-cancel 'xclip -se c -i'
-#bind-key -T copy-mode-vi MouseDragEnd1Pane send-keys -X copy-pipe-and-cancel 'xclip -se c -i''
+bind-key -T copy-mode-vi MouseDragEnd1Pane send-keys -X copy-pipe-and-cancel 'xclip -se c -ind-key -T copy-mode-vi Enter send-keys -X copy-pipe-and-cancel 'xclip -se c -i'
+bind-key -T copy-mode-vi MouseDragEnd1Pane send-keys -X copy-pipe-and-cancel 'xclip -se c -i''
# Bells
set -g visual-bell on