merge: work

.config/awesome/rc.lua

@@ -635,6 +635,7 @@ apps = {
     "xset dpms 300 15", -- dim screen after 5 min and lock 15 sec after
     "xss-lock --  " .. lock,
     "picom",
+    "redshift",
     "nm-applet",
     "numlockx",
     "killall cbatticon",

.config/nvim/init.lua

@@ -35,6 +35,8 @@ vim.o.lazyredraw     = true
 
 vim.o.complete       = vim.o.complete .. ",i"
 
+vim.o.mousemodel     = extend
+
 --------------------
 ----- packages -----
 --------------------
@@ -57,6 +59,3 @@ require"pack-which-key"
 -- remove trailing whitespaces
 vim.keymap.set("n", "<Leader>e", "<cmd>exe getline(line('.'))<CR>")
 vim.keymap.set("n", "<Leader>f", "<cmd>%s/\\s\\+$//e<CR>")
-vim.keymap.set("n", "s",         '"_d')
-vim.keymap.set("n", "ss",        '"_dd')
-vim.keymap.set("n", "S",         '"_D')

.config/nvim/pack/plugins/opt/black

@@ -1 +1 @@
-Subproject commit 2704dc796b49b4c5d348c92ba14ef1cfd908e7f1
+Subproject commit d97b7898b34b67eb3c6839998920e17ac8c77908

.config/nvim/pack/plugins/opt/lspconfig

@@ -1 +1 @@
-Subproject commit 5f4b1fa83c80f43e434c1fb227967dac9ad8f44c
+Subproject commit 2b802ab1e94d595ca5cc7c55f9d1fb9b17f9754c

.config/nvim/pack/plugins/opt/telescope

@@ -1 +1 @@
-Subproject commit 4bd4205028d6588cf2e0a1346687a6039b0f0a7c
+Subproject commit 7a4ffef931769c3fe7544214ed7ffde5852653f6

.config/nvim/pack/plugins/opt/treesitter

@@ -1 +1 @@
-Subproject commit 58f61e563fadd1788052586f4d6869a99022df3c
+Subproject commit 2072692aaa4b6da7c354e66c2caf4b0a8f736858

.config/zsh/.docker_aliases

@@ -1,85 +1,101 @@
 if ! [ -w '/var/run/docker.sock' ]; then
-    local DOCKER='sudo docker'
-else
-    local DOCKER='docker'
+    alias docker='sudo docker'
+    alias docker-compose='sudo docker-compose'
 fi
 
-alias dk="$DOCKER"
+# docker
+alias dk='docker'
 
-# containers
-alias dkcc="$DOCKER container create"
-alias dkci="$DOCKER container inspect"
-alias dkcls="$DOCKER container ls"
-alias dkclsa="$DOCKER container ls -a"
-alias dkclsaq="$DOCKER container ls -a -q"
-alias dkclsq="$DOCKER container ls -q"
-alias dkcp="$DOCKER container prune"
-alias dkcpf="$DOCKER container prune -f"
-alias dkcrm="$DOCKER container rm"
-alias dkcrmf="$DOCKER container rm -f"
-alias dkcsp="$DOCKER container stop"
-alias dkcst="$DOCKER container start"
-alias dkex="$DOCKER container exec -i -t"
-alias dklo="$DOCKER logs -f"
-alias dkr="$DOCKER run -i -t"
+## container
+alias dkcc='docker container create'
+alias dkci='docker container inspect'
+alias dkcls='docker container ls'
+alias dkclsa='docker container ls -a'
+alias dkclsaq='docker container ls -a -q'
+alias dkclsq='docker container ls -q'
+alias dkcp='docker container prune'
+alias dkcp!='docker container prune -f'
+alias dkcrm='docker container rm'
+alias dkcrm!='docker container rm -f'
+alias dkcsp='docker container stop'
+alias dkcst='docker container restart'
+alias dkex='docker container exec -i -t'
+alias dklo='docker logs -f'
+alias dkr='docker run -i -t'
 
-# images
-alias dkb="$DOCKER build ."
-alias dki="$DOCKER image"
-alias dkic="$DOCKER image create"
-alias dkii="$DOCKER image inspect"
-alias dkil="$DOCKER pull"
-alias dkila="$DOCKER image ls | grep -v none | awk '{print \"$DOCKER pull \" \$1 \":\" \$2}' | $SHELL"
-alias dkils="$DOCKER image ls"
-alias dkilsa="$DOCKER image ls -a"
-alias dkilsaq="$DOCKER image ls -a -q"
-alias dkilsq="$DOCKER image ls -q"
-alias dkip="$DOCKER image prune"
-alias dkip="$DOCKER image push"
-alias dkipf="$DOCKER image prune -f"
-alias dkirm="$DOCKER image rm"
-alias dkirmf="$DOCKER image rm -f"
-alias dkis="$DOCKER image save"
-alias dkit="$DOCKER image tag"
+## image
+alias dkb='docker build .'
+alias dki='docker image'
+alias dkic='docker image create'
+alias dkii='docker image inspect'
+alias dkil='docker pull'
+alias dkila="docker image ls | grep -v none | awk '{print \"docker pull \" \$1 \":\" \$2}' | $SHELL"
+alias dkils='docker image ls'
+alias dkilsa='docker image ls -a'
+alias dkilsaq='docker image ls -a -q'
+alias dkilsq='docker image ls -q'
+alias dkip='docker image prune'
+alias dkip='docker image push'
+alias dkip!='docker image prune -f'
+alias dkirm='docker image rm'
+alias dkirm!='docker image rm -f'
+alias dkis='docker image save'
+alias dkit='docker image tag'
 
-# volumes
-alias dkv="$DOCKER volume"
-alias dkvc="$DOCKER volume create"
-alias dkvi="$DOCKER volume inspect"
-alias dkvls="$DOCKER volume ls"
-alias dkvlsq="$DOCKER volume ls -q"
-alias dkvp="$DOCKER volume prune"
-alias dkvpf="$DOCKER volume prune -f"
-alias dkvrm="$DOCKER volume rm"
-alias dkvrmf="$DOCKER volume rm -f"
+## volume
+alias dkv='docker volume'
+alias dkvc='docker volume create'
+alias dkvi='docker volume inspect'
+alias dkvls='docker volume ls'
+alias dkvlsq='docker volume ls -q'
+alias dkvp='docker volume prune'
+alias dkvp!='docker volume prune -f'
+alias dkvrm='docker volume rm'
+alias dkvrm!='docker volume rm -f'
 
-# networks
-alias dkn="$DOCKER network"
-alias dknc="$DOCKER network create"
-alias dkni="$DOCKER network inspect"
-alias dknls="$DOCKER network ls"
-alias dknlsq="$DOCKER network ls -q"
-alias dknp="$DOCKER network prune"
-alias dknpf="$DOCKER network prune -f"
-alias dknrm="$DOCKER network rm"
-alias dknrmf="$DOCKER network rm -f"
+## network
+alias dkn='docker network'
+alias dknc='docker network create'
+alias dkni='docker network inspect'
+alias dknls='docker network ls'
+alias dknlsq='docker network ls -q'
+alias dknp='docker network prune'
+alias dknpf='docker network prune -f'
+alias dknrm='docker network rm'
+alias dknrm!='docker network rm -f'
 
-# system
-alias dks="$DOCKER system"
-alias dksdf="$DOCKER system df"
-alias dksp="$DOCKER system prune"
-alias dkspa="$DOCKER system prune -a"
-alias dkspaf="$DOCKER system prune -af"
-alias dkspf="$DOCKER system prune -f"
-alias dkspv="$DOCKER system prune --volumes"
-alias dkspva="$DOCKER system prune --volumes -a"
-alias dkspvaf="$DOCKER system prune --volumes -af"
-alias dkspvf="$DOCKER system prune --volumes -f"
+## system
+alias dks='docker system'
+alias dksdf='docker system df'
+alias dksp!='docker system prune -f'
+alias dksp='docker system prune'
+alias dkspa='docker system prune -a'
+alias dkspaf='docker system prune -a -f'
+alias dkspv!='docker system prune --volumes -f'
+alias dkspv='docker system prune --volumes'
+alias dkspva='docker system prune --volumes -a'
+alias dkspvaf='docker system prune --volumes -a -f'
 
 # docker-compose
-alias dc="$DOCKER-compose"
-alias dcd="$DOCKER-compose down"
-alias dcup="$DOCKER-compose up -d"
-alias dcupb="$DOCKER-compose up -d --build"
+alias dc='docker-compose'
+alias dcd='docker-compose down'
+alias dcup='docker-compose up -d'
+alias dcupb='docker-compose up -d --build'
 
-unset DOCKER
+## container
+alias dccls='docker-compose ps'
+alias dcclsq='docker-compose ps -q'
+alias dcex='docker-compose exec'
+alias dcr='docker-compose run --rm'
+alias dcrd='docker-compose run -d --rm'
+alias dcrm!='docker-compose rm -f'
+alias dcrm='docker-compose rm'
+alias dcrmv!='docker-compose rm -v -f'
+alias dcrmv='docker-compose rm -v'
+alias dcsp='docker-compose stop'
+alias dcst='docker-compose restart'
+
+## image
+alias dcb!='docker-compose build --no-cache'
+alias dcb='docker-compose build'
+alias dcl='docker-compose pull'

.config/zsh/.zsh_aliases

@@ -18,6 +18,7 @@ function fnalias() {
     $1 $(sed 's/--color=.\+/--color=force/' <<< "${@:2}")
 }
 
+alias man='man '
 alias sudo='sudo '
 alias watch='fnalias watch -c '
 alias xargs='xargs '

.config/zsh/.zshrc

@@ -99,6 +99,6 @@ plugins=(git vi-mode colored-man-pages gitignore)
 [[ ! -f "$ZDOTDIR"/.p10k.zsh ]] || . "$ZDOTDIR"/.p10k.zsh
 
 eval "$(pyenv init -)"
-. "$ZDOTDIR"/.zsh_aliases
-. "$ZDOTDIR"/.kubectl_aliases
 . "$ZDOTDIR"/.docker_aliases
+. "$ZDOTDIR"/.kubectl_aliases
+. "$ZDOTDIR"/.zsh_aliases

.config/zsh/ohmyzsh

@@ -1 +1 @@
-Subproject commit b3b336b0f95644ceda7758871191cdf040b897b2
+Subproject commit fb66b67d683935cd0e4a5282064947a28087a91b

.local/bin/dkprune

@@ -30,12 +30,12 @@ function add_opt() {
     echo "$RESULT"
 }
 
-if ! [ -w "/var/run/docker.sock" ] && [ "$EUID" != 0 ]; then
+if ! [ -w '/var/run/docker.sock' ] && [ "$EUID" != 0 ]; then
     exec sudo -- "$0" "$@"
 fi
 
 c=1
-C=2
+# C=2
 v=4
 i=8
 # I=16
@@ -52,7 +52,8 @@ while getopts hcCviIna o; do
             CLEAN="$(add_opt "$CLEAN" "$c")"
             ;;
         C)
-            CLEAN="$(add_opt "$CLEAN" "$C")"
+            CLEAN="$(add_opt "$CLEAN" "$c")"
+            CON_OPT="-f"
             ;;
         v)
             CLEAN="$(add_opt "$CLEAN" "$v")"
@@ -62,14 +63,15 @@ while getopts hcCviIna o; do
             ;;
         I)
             CLEAN="$(add_opt "$CLEAN" "$i")"
-            IMG_OPT="-a"
+            IMG_OPT='-a'
             ;;
         n)
             CLEAN="$(add_opt "$CLEAN" "$n")"
             ;;
         a)
-            CLEAN="$(add_opt "$CLEAN" "$c" "$C" "$v" "$i" "$n")"
-            IMG_OPT="-a"
+            CLEAN="$(add_opt "$CLEAN" "$c" "$v" "$i" "$n")"
+            CON_OPT="-f"
+            IMG_OPT='-a'
             ;;
         *)
             exit 1
@@ -78,32 +80,30 @@ while getopts hcCviIna o; do
 done
 
 if [ "$CLEAN" == 0 ]; then
-    CLEAN="$((C + v + n))"
+    CLEAN="$((c + v + n))"
+    CON_OPT="-f"
 fi
 
 VALUES=(
     "$((c + i + v + n))"
     "$((c + i + n))"
-    "$c"
     "$v"
     "$i"
     "$n"
 )
 
-CON="container"
-PRUNE="prune -f"
+CON='container'
+PRUNE='prune -f'
 COMMANDS=(
     "docker system  $PRUNE $IMG_OPT --volumes"
     "docker system  $PRUNE $IMG_OPT"
-    "docker $CON    $PRUNE"
     "docker volume  $PRUNE"
     "docker image   $PRUNE $IMG_OPT"
     "docker network $PRUNE"
 )
 
-if [ "$((CLEAN & "$C"))" == "$C" ]; then
-    docker "$CON" ls -aq | xargs docker "$CON" stop 2> /dev/null
-    CLEAN="$(add_opt "$CLEAN" "$c")"
+if [ "$((CLEAN & "$c"))" == "$c" ]; then
+    docker "$CON" ls -aq | xargs docker "$CON" rm "$CON_OPT" 2> /dev/null
 fi
 
 for idx in "${!VALUES[@]}"; do

.pyenv

@@ -1 +1 @@
-Subproject commit ad6a950734a56c62cccdb3a005f4ec5cddbd453f
+Subproject commit c162dcd932368c41938f286f4639f514a4c550f8

.zshenv

@@ -1,6 +1,6 @@
 export PYENV_ROOT="$HOME/.pyenv"
 
-path=(~/bin ~/.local/bin "$PYENV_ROOT/bin" $path)
+path=(~/.local/bin "$PYENV_ROOT/bin" $path)
 
 export XDG_CACHE_HOME="$HOME"/.cache
 export XDG_CONFIG_HOME="$HOME"/.config