Merge branch 'main' of github.com:TheK4n/dotfiles

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

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

home/user/.config/nvim/lua/base/mappings/mappings.lua

@@ -45,7 +45,7 @@ map('n', '-', '<C-x>')
 map({"n", "v"}, [[\]], ',')
 
 -- Select all
-map('n', '<C-a>', 'ggVG')
+map('n', '<C-a>', 'mvggVG')
 
 
 -- Scroll tabs

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', '<Plug>(leap-forward-to)')
+        set({'n', 'v'}, 'K', '<Plug>(leap-backward-to)')
     end,
-    keys = {
-        { 'J', '<Plug>(leap-forward-to)' },
-        { 'K', '<Plug>(leap-backward-to)' },
-    },
 }

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'