Merge branch 'master' of https://github.com/xlogerais/config-bash

aliases.d/git

@@ -1,29 +1,29 @@
 #!/bin/bash
 
 # Git
-if [ -x /usr/bin/git ]
+if [ -x /usr/bin/git ]; then
-then
+    alias gs='git status'
-  alias gs='git status'
+    alias ga='git add'
-  alias ga='git add'
+    alias gc='git commit'
-  alias gc='git commit'
+    alias gca='git commit -a'
-  alias gca='git commit -a'
+    alias gf='git fetch'
-  alias gu='git pull'
+    alias gu='git pull'
-  alias gp='git pull && git push'
+    alias gp='git pull && git push'
-  alias gd='git diff'
+    alias gd='git diff'
-  alias gdc='git diff --cached'
+    alias gdc='git diff --cached'
-  alias gb='git branch'
+    alias gb='git branch'
-  alias gco='git checkout'
+    alias gco='git checkout'
-  alias gw='git whatchanged'
+    alias gw='git whatchanged'
-  alias gl='git log --graph'
+    alias gl='git log --graph'
 
-  alias gstatus='git status'
+    alias gstatus='git status'
-  alias glog='git log'
+    alias glog='git log'
-  alias glast='git last'
+    alias glast='git last'
-  alias gshow='git show'
+    alias gshow='git show'
-  alias gdiff='git diff'
+    alias gdiff='git diff'
-  alias gcommit='git commit'
+    alias gcommit='git commit'
-  alias gcommitall='git commit --all'
+    alias gcommitall='git commit --all'
-  alias greset='git reset'
+    alias greset='git reset'
-  alias gpull='git pull'
+    alias gpull='git pull'
-  alias gpush='git pull && git push'
+    alias gpush='git pull && git push'
 fi

aliases.d/kubectl

@@ -1,11 +1,8 @@
 #!/bin/bash
 
-if (which kubectl &> /dev/null)
+if (command -v kubectl &> /dev/null)
 then
 
-  # activate completion
-  source <(kubectl completion bash)
-
   # create a quick alias
   alias k=kubectl
   alias ks="kubectl --namespace kube-system"

aliases.d/lazygit

@@ -0,0 +1,5 @@
+# Lazygit
+if ( which lazygit &> /dev/null )
+then
+  alias lg='lazygit'
+fi

aliases.d/lsd

@@ -0,0 +1,5 @@
+# LSD
+if ( command -v lsd &> /dev/null )
+then
+  alias ls='lsd'
+fi

aliases.d/vim

@@ -1,9 +1,20 @@
 #!/bin/bash
 
 # Vim Editor
-if [ -x /usr/bin/vim ]
+if (command -v nvim &> /dev/null)
 then
-  alias vi='vim -p'
+  alias vim=nvim
-  alias view='vim -R'
-  alias vless='vim -u /usr/share/vim/vim*/macros/less.vim'
 fi
+
+# if (command -v lvim &>/dev/null); then
+# 	alias vim=lvim
+# elif (command -v nvim &>/dev/null); then
+# 	alias vim=nvim
+# fi
+
+# if [ -x /usr/bin/vim ]
+# then
+#   alias vi='vim -p'
+#   alias view='vim -R'
+#   alias vless='vim -u /usr/share/vim/vim*/macros/less.vim'
+# fi

completion.d/helm

@@ -1,9 +1,6 @@
 #!/bin/bash
 
-if (which helm &> /dev/null)
+if (command -v helm &> /dev/null)
 then
-
-  # activate completion
   source <( helm completion bash )
-
 fi

completion.d/kubectl

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-if ( which kubectl ) &> /dev/null
+if (command -v kubectl &> /dev/null)
 then
   source <(kubectl completion bash)
 fi

completion.d/poetry

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+if ( command -v poetry &> /dev/null )
+then
+  source <(poetry completions bash)
+fi

completion.d/stern

@@ -1,9 +1,6 @@
 #!/bin/bash
 
-if (which stern &> /dev/null)
+if (command -v stern &> /dev/null)
 then
-
-  # activate completion
   source <(stern --completion bash)
-
 fi

rc.d/broot

@@ -1 +1,23 @@
-[[ -f ~/.config/broot/launcher/bash/br ]] && source ~/.config/broot/launcher/bash/br
+#!/bin/bash
+
+if (command -v broot &>/dev/null); then
+    # This script was automatically generated by the broot program
+    # More information can be found in https://github.com/Canop/broot
+    # This function starts broot and executes the command
+    # it produces, if any.
+    # It's needed because some shell commands, like `cd`,
+    # have no useful effect if executed in a subshell.
+    function br {
+        local cmd cmd_file code
+        cmd_file=$(mktemp)
+        if broot --outcmd "$cmd_file" "$@"; then
+            cmd=$(<"$cmd_file")
+            rm -f "$cmd_file"
+            eval "$cmd"
+        else
+            code=$?
+            rm -f "$cmd_file"
+            return "$code"
+        fi
+    }
+fi

rc.d/git

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+if (command -v git && command -v fzf) &>/dev/null; then
+    function gsb { git checkout "$(git branch --all | fzf | tr -d '[:space:]')"; }
+fi