feat: config, alias, function updates

This commit is contained in:
2023-05-01 18:43:33 +03:00
parent e2ba7a3b12
commit 22c0ca60be
8 changed files with 77 additions and 24 deletions

View File

@@ -18,6 +18,9 @@ bind -n C-M-Down select-pane -D
# Ctrl+K to clear
bind -n C-k send-keys -R \; send-keys C-l
# Ctrl+Shift+W to close session
bind -n C-S-w confirm-before kill-session
# Enable mouse control
set -g mouse on

View File

@@ -4,26 +4,28 @@ local opts = { }
require('barbar').setup({})
-- Move to previous/next
vim.keymap.set('n', '<A-,>', '<Cmd>BufferPrevious<CR>', opts)
vim.keymap.set('n', '<A-.>', '<Cmd>BufferNext<CR>', opts)
vim.keymap.set('n', '', '<Cmd>BufferPrevious<CR>', opts)
vim.keymap.set('n', '', '<Cmd>BufferNext<CR>', opts)
-- Re-order to previous/next
vim.keymap.set('n', '<A-<>', '<Cmd>BufferMovePrevious<CR>', opts)
vim.keymap.set('n', '<A->>', '<Cmd>BufferMoveNext<CR>', opts)
vim.keymap.set('n', '¯', '<Cmd>BufferMovePrevious<CR>', opts)
vim.keymap.set('n', '˘', '<Cmd>BufferMoveNext<CR>', opts)
-- Goto buffer in position...
vim.keymap.set('n', '<A-1>', '<Cmd>BufferGoto 1<CR>', opts)
vim.keymap.set('n', '<A-2>', '<Cmd>BufferGoto 2<CR>', opts)
vim.keymap.set('n', '<A-3>', '<Cmd>BufferGoto 3<CR>', opts)
vim.keymap.set('n', '<A-4>', '<Cmd>BufferGoto 4<CR>', opts)
vim.keymap.set('n', '<A-5>', '<Cmd>BufferGoto 5<CR>', opts)
vim.keymap.set('n', '<A-6>', '<Cmd>BufferGoto 6<CR>', opts)
vim.keymap.set('n', '<A-7>', '<Cmd>BufferGoto 7<CR>', opts)
vim.keymap.set('n', '<A-8>', '<Cmd>BufferGoto 8<CR>', opts)
vim.keymap.set('n', '<A-9>', '<Cmd>BufferGoto 9<CR>', opts)
vim.keymap.set('n', '<A-0>', '<Cmd>BufferLast<CR>', opts)
vim.keymap.set('n', '¡', '<Cmd>BufferGoto 1<CR>', opts)
vim.keymap.set('n', '', '<Cmd>BufferGoto 2<CR>', opts)
vim.keymap.set('n', '£>', '<Cmd>BufferGoto 3<CR>', opts)
vim.keymap.set('n', '¢', '<Cmd>BufferGoto 4<CR>', opts)
vim.keymap.set('n', '', '<Cmd>BufferGoto 5<CR>', opts)
vim.keymap.set('n', '§', '<Cmd>BufferGoto 6<CR>', opts)
vim.keymap.set('n', '', '<Cmd>BufferGoto 7<CR>', opts)
vim.keymap.set('n', '', '<Cmd>BufferGoto 8<CR>', opts)
vim.keymap.set('n', 'ª', '<Cmd>BufferGoto 9<CR>', opts)
vim.keymap.set('n', 'º', '<Cmd>BufferLast<CR>', opts)
-- Pin/unpin buffer
vim.keymap.set('n', '<A-p>', '<Cmd>BufferPin<CR>', opts)
vim.keymap.set('n', 'π', '<Cmd>BufferPin<CR>', opts)
-- Close buffer
vim.keymap.set('n', '<A-c>', '<Cmd>BufferClose<CR>', opts)
vim.keymap.set('n', 'ç', '<Cmd>BufferClose<CR>', opts)
-- Close all but current
vim.keymap.set('n', '<C-†>', '<Cmd>BufferCloseAllButCurrent<CR>', opts)
-- Wipeout buffer
-- :BufferWipeout
-- Close commands

View File

@@ -0,0 +1,4 @@
require('nvim_comment').setup()
vim.keymap.set("n", "<C-/>", ":CommentToggle<CR>", { noremap = true, silent = true })

View File

@@ -3,6 +3,8 @@
-- Only required if you have packer configured as `opt`
vim.cmd [[packadd packer.nvim]]
vim.cmd('command Ps :PackerSync')
return require('packer').startup(function(use)
-- Packer can manage itself
use 'wbthomason/packer.nvim'
@@ -115,4 +117,6 @@ return require('packer').startup(function(use)
use('mfussenegger/nvim-dap')
use('github/copilot.vim')
use('nvim-tree/nvim-tree.lua')
use("terrortylor/nvim-comment")
end)

View File

@@ -8,6 +8,9 @@ end, { desc = "Save and file explorer" })
vim.keymap.set("v", "J", ":m '>+1<CR>gv=gv", { desc = "Move line down" })
vim.keymap.set("v", "K", ":m '<-2<CR>gv=gv", { desc = "Move line up" })
-- vim.keymap.set({"v", "n"}, "<C-.>", "<C-o>", { desc = "Go to previous cursor location" })
-- vim.keymap.set({"v", "n"}, "<C-,>", "<C-i>", { desc = "Go to next cursor location" })
-- join line - stay on current column
vim.keymap.set("n", "J", "mzJ`z", { desc = "Join line" })
@@ -71,11 +74,10 @@ vim.keymap.set("n", "<leader><leader>", function()
end, { desc = "Source current file" })
-- save file
vim.keymap.set("n", "<leader>w", function()
vim.cmd.write()
end, { desc = "Save file" })
vim.keymap.set("n", "<leader>w", ":w<CR>", { desc = "Save buffer" })
vim.keymap.set("n", "<leader>W", ":wa<CR>", { desc = "Save all buffers" })
vim.keymap.set("n", "<leader>srv", function()
vim.keymap.set("n", "<leader>Srv", function()
local cmd = "python3 -m http.server 5500"
vim.cmd(":silent !open http://localhost:5500")
vim.cmd("split | terminal " .. cmd)

View File

@@ -23,7 +23,7 @@ vim.opt.isfname:append("@-@")
vim.opt.updatetime = 50
vim.opt.colorcolumn = "100"
vim.opt.colorcolumn = {"100", "120"}
vim.g.mapleader = " "
-- nvim-tree

View File

@@ -82,6 +82,8 @@ alias dvc="docker-volume-cd"
alias dvolp="docker-volume-path"
alias dvp="docker-volume-path"
alias scriptls="cat $(find-up package.json) | jq '.scripts'"
alias tmux="tmux -f ~/.config/.tmux.conf"
alias tn="tmux new"
alias tns="tmux new -s"

View File

@@ -168,7 +168,7 @@ find-replace() {
find=$1
replace=$2
file=$3
cat $file | sed "s/$find/$replace/g"
sed "s/$find/$replace/g" $file
}
find-replace-file() {
@@ -178,8 +178,13 @@ find-replace-file() {
return 1
fi
for file in $3; do
out=$(find-replace $1 $2 $file)
files=( "${@:3}" )
find=$1
replace=$2
for file in $files; do
echo "Replacing $find with $replace in $file..."
out=$(find-replace $find $replace $file)
echo $out >$file
done
}
@@ -311,3 +316,34 @@ tn-general () {
tmux attach-session -d -t general
}
tn-custom () {
winname=$1
shift
# Use -d to allow the rest of the function to run
tmux new-session -d -s $winname
# tmux new-window -n $winname
# set as array from argv
dirs=("$@")
# -d to prevent current window from changing
for dir in ${dirs[@]}; do
tabname=$(basename $dir)
echo "tabname=$tabname"
sleep 0.1
tmux new-window -d -n $tabname -c "$dir"
echo "tmux new-window -d -n $tabname -c $dir"
sleep 0.1
tmux send-keys -t $winname:$tabname "v ." Enter
echo "tmux send-keys -t $winname:$tabname v . Enter"
sleep 0.1
echo "tmux split-pane -d -h -t $winname:$tabname -c $dir"
tmux split-pane -d -h -t $winname:$tabname -c "$dir"
done
sleep 1
# -d to detach any other client (which there shouldn't be,
# since you just created the session).
echo "tmux attach-session -d -t $winname"
tmux attach-session -d -t $winname
}