diff options
| -rw-r--r-- | shellrc.d/dev | 9 | ||||
| -rw-r--r-- | shellrc.d/git | 1 |
2 files changed, 8 insertions, 2 deletions
diff --git a/shellrc.d/dev b/shellrc.d/dev index 74d692b..c394a8a 100644 --- a/shellrc.d/dev +++ b/shellrc.d/dev @@ -61,6 +61,11 @@ if command -v bear >/dev/null; then bear --output build/compile_commands.json --append -- make "$@" } + bmmake() { + mkdir -p build + bear --output build/compile_commands.json --append -- make "-j$(($(nproc) * 2))" "-l$(nproc)" "$@" + } + alias mbmake='bmake -j$(($(nproc) * 2)) -l$(nproc)' fi @@ -75,11 +80,11 @@ nvim_config() ( if command -v nix 2>/dev/null >&2; then nrun() { - nix run . -- "$@" + nix run .?submodules=1# -- "$@" } nrun_() { local package="$1" shift - nix run ".#$package" -- "$@" + nix run ".?submodules=1#$package" -- "$@" } fi diff --git a/shellrc.d/git b/shellrc.d/git index 15b949a..18b3b79 100644 --- a/shellrc.d/git +++ b/shellrc.d/git @@ -47,6 +47,7 @@ gitbmerge() ( fi git merge --ff-only "$branch" \ && git push \ + && sleep 1 \ && git branch -d "$branch" \ && { if [ -n "$upstream" ]; then git push origin :"$branch"; fi; } ) |