diff --git a/home/user/.config/bash/aliases b/home/user/.config/bash/aliases index d55aebe..7f8f3ad 100644 --- a/home/user/.config/bash/aliases +++ b/home/user/.config/bash/aliases @@ -22,7 +22,7 @@ alias lsl='_d() { ls -lhFA --color=always "${1:-.}" | $PAGER ; }; _d' alias _='sudo' alias root='sudo -i TMOUT=450' -alias rm='rm -ir' +alias rm='rm -Ivr --one-file-system' alias mkdir='mkdir -pv' alias cd..='cd ..' diff --git a/home/user/.config/git/hooks/pre-commit b/home/user/.config/git/hooks/pre-commit index f509054..cbecb6e 100755 --- a/home/user/.config/git/hooks/pre-commit +++ b/home/user/.config/git/hooks/pre-commit @@ -1,6 +1,11 @@ #!/bin/sh set -e if command -v makepkg >/dev/null && [ -e PKGBUILD ]; then + if [ -e VERSION ]; then + sed -i "s/pkgver=.\+/pkgver=$(cat VERSION)/" PKGBUILD + git add PKGBUILD + fi + makepkg --printsrcinfo > .SRCINFO git add .SRCINFO exit diff --git a/home/user/.config/nvim/lua/base/mappings/mappings.lua b/home/user/.config/nvim/lua/base/mappings/mappings.lua index da91663..be7d421 100644 --- a/home/user/.config/nvim/lua/base/mappings/mappings.lua +++ b/home/user/.config/nvim/lua/base/mappings/mappings.lua @@ -45,7 +45,7 @@ map('n', '-', '') map({"n", "v"}, [[\]], ',') -- Select all -map('n', '', 'ggVG') +map('n', '', 'mvggVG') -- Scroll tabs diff --git a/home/user/.config/nvim/lua/base/plugins/leap.lua b/home/user/.config/nvim/lua/base/plugins/leap.lua index 04145b4..39d4c76 100644 --- a/home/user/.config/nvim/lua/base/plugins/leap.lua +++ b/home/user/.config/nvim/lua/base/plugins/leap.lua @@ -2,9 +2,8 @@ return { 'ggandor/leap.nvim', config = function() require('leap').opts.safe_labels = {} + local set = vim.keymap.set + set({'n', 'v'}, 'J', '(leap-forward-to)') + set({'n', 'v'}, 'K', '(leap-backward-to)') end, - keys = { - { 'J', '(leap-forward-to)' }, - { 'K', '(leap-backward-to)' }, - }, } diff --git a/home/user/.config/zsh/aliases b/home/user/.config/zsh/aliases index 288a01d..cb533ce 100644 --- a/home/user/.config/zsh/aliases +++ b/home/user/.config/zsh/aliases @@ -1,5 +1,6 @@ alias -g L='| $PAGER' alias -g HL='| highlight -O ansi -S ' +alias -g JSON='| json HL json' alias -g ALL="&>/dev/null" alias -g BG="ALL &" alias -g ?='| grep' diff --git a/install-hooks/git/post-install b/install-hooks/git/post-install old mode 100755 new mode 100644