Merge branch 'master' of git.axenov.dev:anthony/dotfiles

git/.gitconfig

@@ -22,6 +22,6 @@
 [include]
     path = ~/.git_aliases
 [include]
-    path = ~/.git_aliases.extra
+    path = ~/.git_aliases.local
 [include]
-    path = ~/.gitconfig.extra ; use this file to store other personal settings and aliases
+    path = ~/.gitconfig.local ; use this file to store other personal settings and aliases

git/.gitignore

@@ -7,4 +7,10 @@ nbproject/
 *.log
 *.bak
 *.rdb
+.env
+*.env
+.env.*
 
+!.env.example
+!.env.default
+!/**/*.gitkeep

shell/.bash_aliases

@@ -2,7 +2,6 @@
 
 alias bashrc='source ~/.bashrc'
 alias zshrc='source ~/.zshrc'
-# alias aliases='cat ~/.bash_aliases' # use 'alias' instead (without args)
 alias realias='source ~/.bash_aliases'
 alias stow="stow -v"
 alias unstow="stow -D"
@@ -10,6 +9,7 @@ alias restow="stow -R"
 alias reload='exec ${SHELL} -l'
 alias sudo='sudo ' # enable aliases to be sudo'ed
 alias g='git'
+alias c='composer'
 alias hosts="sudo nano /etc/hosts"
 alias shrug="echo '¯\_(ツ)_/¯' | xclip -selection c"
 
@@ -39,7 +39,6 @@ alias psg='ps aux | grep -v grep | grep -i -e VSZ -e'
 alias wine='LANG=ru_RU.utf8 wine'
 alias wine64='LANG=ru_RU.utf8 wine64'
 
-alias untargz='tar -czf'
 alias ports='netstat -tulpan'
 
 # alias pubkey="more ~/.ssh/id_ed25519.pub | xclip -selection clipboard | echo '=> Public key copied to pasteboard.'"
@@ -50,105 +49,3 @@ alias gpg.list='gpg --list-keys --keyid-format SHORT'
 
 # https://obsproject.com/forum/threads/how-to-start-virtual-camera-without-sudo-privileges.139783/
 # alias obscam="sudo modprobe v4l2loopback video_nr=2 card_label='OBS Virtual Camera'"
-
-# Download music from Youtube or Youtube Music
-# and save as top quality flac file without video
-# Playlist and video/track URLs are supported
-# Usage:     $ ytm https://www.youtube.com/watch\?v=dQw4w9WgXcQ
-# More info: https://github.com/ytdl-org/youtube-dl
-ytm() {
-    youtube-dl \
-        --extract-audio \
-        --audio-format flac \
-        --audio-quality 0 \
-        --format bestaudio \
-        --write-info-json \
-        --output "${HOME}/Музыка/ytm/%(playlist_title)s/%(channel)s - %(title)s.%(ext)s" \
-        "$@"
-}
-
-docker.ip() {
-    if [ "$1" ]; then
-        if [ "$1" = "-a" ]; then
-            docker ps -aq \
-            | xargs -n 1 docker inspect --format '{{.Name}}{{range .NetworkSettings.Networks}} {{.IPAddress}}{{end}}' \
-            | sed -e 's#^/##' \
-            | column -t
-        elif [ "$1" = "-c" ]; then
-            docker compose ps -q \
-            | xargs -n 1 docker inspect --format '{{.Name}}{{range .NetworkSettings.Networks}} {{.IPAddress}}{{end}}' \
-            | sed -e 's#^/##' \
-            | column -t
-        else
-            docker inspect --format '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' "$1"
-            docker port "$1"
-        fi
-    else
-        docker ps -q \
-        | xargs -n 1 docker inspect --format '{{.Name}}{{range .NetworkSettings.Networks}} {{.IPAddress}}{{end}}' \
-        | sed -e 's#^/##' \
-        | column -t
-    fi
-}
-
-
-#################################################################################
-
-# $1 -- file/dir path
-# $2 -- permissions (0644, 0755, etc)
-# own() { #TODO refactor
-#     [ "$1" ] && PATH="${1/#\~/$HOME}" || {
-#         echo "Error (1): path not provided"
-#     }
-#     echo $PATH
-
-#     [ "$2" ] && PERM="$2" || {
-#         if [ -d $PATH ]; then
-#             PERM="0755"
-#         elif [ -f $PATH ]; then
-#             PERM="0644"
-#         else
-#             echo "Error (2): path not exists"
-#         fi;
-#     }
-#     echo $PERM
-
-#     sudo chmod $PERM -R --preserve-root $PATH
-#     sudo chown $USER. -R --preserve-root $PATH
-# }
-
-# function extract {
-#  if [ -z "$1" ]; then
-#     # display usage if no parameters given
-#     echo "Usage: extract <path/file_name>.<zip|rar|bz2|gz|tar|tbz2|tgz|Z|7z|xz|ex|tar.bz2|tar.gz|tar.xz>"
-#     echo "       extract <path/file_name_1.ext> [path/file_name_2.ext] [path/file_name_3.ext]"
-#     return 1
-#  else
-#     for n in $@
-#     do
-#       if [ -f "$n" ] ; then
-#           case "${n%,}" in
-#             *.tar.bz2|*.tar.gz|*.tar.xz|*.tbz2|*.tgz|*.txz|*.tar)
-#                          tar xvf "$n"       ;;
-#             *.lzma)      unlzma ./"$n"      ;;
-#             *.bz2)       bunzip2 ./"$n"     ;;
-#             *.rar)       unrar x -ad ./"$n" ;;
-#             *.gz)        gunzip ./"$n"      ;;
-#             *.zip)       unzip ./"$n"       ;;
-#             *.z)         uncompress ./"$n"  ;;
-#             *.7z|*.arj|*.cab|*.chm|*.deb|*.dmg|*.iso|*.lzh|*.msi|*.rpm|*.udf|*.wim|*.xar)
-#                          7z x ./"$n"        ;;
-#             *.xz)        unxz ./"$n"        ;;
-#             *.exe)       cabextract ./"$n"  ;;
-#             *)
-#                          echo "extract: '$n' - unknown archive method"
-#                          return 1
-#                          ;;
-#           esac
-#       else
-#           echo "'$n' - file does not exist"
-#           return 1
-#       fi
-#     done
-# fi
-# }

shell/.bashrc

@@ -97,5 +97,5 @@ if ! shopt -oq posix; then
 fi
 
 [[ -f ~/.bash_aliases ]] && source ~/.bash_aliases
-[[ -f ~/.bashrc.extra ]] && source ~/.bashrc.extra
+[[ -f ~/.bashrc.local ]] && source ~/.bashrc.local
 [[ -f ~/.profile ]] && source ~/.profile

shell/.profile

@@ -16,6 +16,7 @@ fi
 
 ### AAA ##########################################
 
+export EDITOR="nano"
 export JAVA_HOME="/usr/bin/"
 export PATH="$PATH:/opt/nvim/bin/"
 export PATH="$PATH:$HOME/.local/bin/"
@@ -40,8 +41,8 @@ export GOPATH="$HOME/.go"
 
 # nvm
 export NVM_DIR="$HOME/.nvm"
-[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"  # This loads nvm
+[ -s "$NVM_DIR/nvm.sh" ] && source "$NVM_DIR/nvm.sh"  # This loads nvm
-[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"  # This loads nvm bash_completion
+[ -s "$NVM_DIR/bash_completion" ] && source "$NVM_DIR/bash_completion"  # This loads nvm bash_completion
 
 # The next line updates PATH for Yandex Cloud CLI.
 [ -f "$HOME/yandex-cloud/path.bash.inc" ] && source "$HOME/yandex-cloud/path.bash.inc"
@@ -50,4 +51,4 @@ export NVM_DIR="$HOME/.nvm"
 [ -f "$HOME/yandex-cloud/completion.zsh.inc" ] && source "$HOME/yandex-cloud/completion.zsh.inc"
 
 # misc
-[[ -f $HOME/.profile.extra ]] && source $HOME/.profile.extra
+[[ -f $HOME/.profile.local ]] && source $HOME/.profile.local

shell/.zshrc

@@ -85,5 +85,5 @@ source $ZSH/oh-my-zsh.sh
 [[ -f ~/.p10k.zsh ]] && source ~/.p10k.zsh
 
 [[ -f ~/.bash_aliases ]] && source ~/.bash_aliases
-[[ -f ~/.bashrc.extra ]] && source ~/.bashrc.extra
+# [[ -f ~/.bashrc.local ]] && source ~/.bashrc.local
 [[ -f ~/.profile ]] && source ~/.profile

utils/.local/bin/docker-ips

@@ -0,0 +1,27 @@
+#!/usr/bin/env bash
+set -eo pipefail
+
+# TODO not ready yet
+exit
+
+if [ "$1" ]; then
+    if [ "$1" = "-a" ]; then
+        docker ps -aq \
+        | xargs -n 1 docker inspect --format '{{.Name}}{{range .NetworkSettings.Networks}} {{.IPAddress}}{{end}}' \
+        | sed -e 's#^/##' \
+        | column -t
+    elif [ "$1" = "-c" ]; then
+        docker compose ps -q \
+        | xargs -n 1 docker inspect --format '{{.Name}}{{range .NetworkSettings.Networks}} {{.IPAddress}}{{end}}' \
+        | sed -e 's#^/##' \
+        | column -t
+    else
+        docker inspect --format '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' "$1"
+        docker port "$1"
+    fi
+else
+    docker ps -q \
+    | xargs -n 1 docker inspect --format '{{.Name}}{{range .NetworkSettings.Networks}} {{.IPAddress}}{{end}}' \
+    | sed -e 's#^/##' \
+    | column -t
+fi

utils/.local/bin/extract

@@ -1,25 +1,39 @@
 #!/usr/bin/env bash
 set -eo pipefail
 
-if [ -f "$1" ]; then
+if [ -z "$1" ]; then
-    case "$1" in
+    echo "Usage: extract <path/file_name>.<zip|rar|bz2|gz|tar|tbz2|tgz|Z|7z|xz|ex|tar.bz2|tar.gz|tar.xz>"
-        *.tar.bz2)  tar -jxvf "$1"                        ;;
+    echo "       extract <path/file_name_1.ext> [path/file_name_2.ext] [path/file_name_3.ext]"
-        *.tar.gz)   tar -zxvf "$1"                        ;;
+    exit 1
-        *.tar.xz)   tar -Jxvf "$1"                        ;;
+fi
-        *.bz2)      bunzip2 "$1"                          ;;
+
-        *.dmg)      hdiutil mount "$1"                    ;;
+for n in "$@"; do
-        *.gz)       gunzip "$1"                           ;;
+    if [ ! -f "$n" ] ; then
-        *.tar)      tar -xvf "$1"                         ;;
+        echo "File does not exist, skipping: '$n'"
-        *.tbz2)     tar -jxvf "$1"                        ;;
+        continue
-        *.tgz)      tar -zxvf "$1"                        ;;
+    fi
-        *.zip)      unzip "$1"                            ;;
+
-        *.ZIP)      unzip "$1"                            ;;
+    case "${n%,}" in
+        # *.tar)      tar -xvf "$1"                         ;;
+        # *.tbz2)     tar -jxvf "$1"                        ;;
+        # *.tar.bz2)  tar -jxvf "$1"                        ;;
+        # *.tgz)      tar -zxvf "$1"                        ;;
+        # *.tar.gz)   tar -zxvf "$1"                        ;;
+        # *.tar.xz)   tar -Jxvf "$1"                        ;;
+        *.tar.bz2|*.tar.gz|*.tar.xz|*.tbz2|*.tgz|*.txz|*.tar)
+                    tar xvf "$n"                      ;;
+        *.7z|*.arj|*.cab|*.chm|*.deb|*.dmg|*.iso|*.lzh|*.msi|*.rpm|*.udf|*.wim|*.xar)
+                    7z x ./"$n"                       ;;
+        *.lzma)     unlzma ./"$n"                     ;;
+        *.bz2)      bunzip2 ./"$n"                    ;;
+        *.rar)      unrar x -ad ./"$n"                ;;
+        *.gz)       gunzip ./"$n"                     ;;
+        *.zip)      unzip ./"$n"                      ;;
+        *.z)        uncompress ./"$n"                 ;;
+        *.xz)       unxz ./"$n"                       ;;
+        *.exe)      cabextract ./"$n"                 ;;
         *.pax)      cat "$1" | pax -r                 ;;
         *.pax.Z)    uncompress "$1" --stdout | pax -r ;;
-        *.rar)      unrar x "$1"                          ;;
+        *)          echo "extract: '$n' - unknown archive method" ;;
-        *.Z)        uncompress "$1"                       ;;
-        *)          echo "'$1' cannot be extracted/mounted via extract()" ;;
     esac
-else
+done
-    echo "'$1' is not a valid file"
-fi

utils/.local/bin/own

@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+set -eo pipefail
+
+sudo chown "$(whoami)". -R --changes --preserve-root "$@"

utils/.local/bin/ytmusic

@@ -0,0 +1,19 @@
+#!/usr/bin/env bash
+
+# Download music from Youtube or Youtube Music
+# and save as top quality flac file without video
+# Playlist and video/track URLs are supported
+# Usage:     $ ytmusic https://www.youtube.com/watch?v=dQw4w9WgXcQ
+# More info: https://github.com/ytdl-org/youtube-dl
+
+DEST_PATH="${HOME}/ytmusic"
+mkdir -p "${DEST_PATH}"
+
+youtube-dl \
+    --extract-audio \
+    --audio-format flac \
+    --audio-quality 0 \
+    --format bestaudio \
+    --write-info-json \
+    --output "${DEST_PATH}/%(playlist_title)s/%(channel)s - %(title)s.%(ext)s" \
+    "$@"