merge: work

.config/nvim/init.lua

@@ -1,7 +1,13 @@
 -- packages
 vim.cmd("packadd nvim-treesitter")
 require'nvim-treesitter.configs'.setup {
+    auto_install = true,
     highlight = {enable = true},
+    indent = {enable = true},
+}
+vim.cmd("packadd nvim-treesitter-context")
+require'treesitter-context'.setup {
+    enable = true,
 }
 
 vim.cmd("packadd black")
@@ -14,6 +20,8 @@ require'indent_blankline'.setup {
 
 vim.cmd("packadd nvim-lspconfig")
 
+vim.cmd("packadd vim-dirdiff")
+
 -- variables
 vim.o.path           = vim.o.path .. ",**"
 vim.o.expandtab      = true

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

@@ -1 +1 @@
-Subproject commit a33e2323a7b2ba74cd4cd51ae063d4c1e429cb84
+Subproject commit c04189061a937d5b6bf526c68cd4fbcb1b8cf567

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

@@ -0,0 +1 @@
+Subproject commit 8e88b67d0dc386d6ba1b3d09c206f19a50bc0625

.config/nvim/pack/plugins/opt/vim-dirdiff

@@ -0,0 +1 @@
+Subproject commit 84bc8999fde4b3c2d8b228b560278ab30c7ea4c9

.gitmodules

@@ -10,6 +10,12 @@
 [submodule ".config/nvim/pack/plugins/opt/nvim-treesitter"]
 	path = .config/nvim/pack/plugins/opt/nvim-treesitter
 	url = https://github.com/nvim-treesitter/nvim-treesitter.git
+[submodule ".config/nvim/pack/plugins/opt/nvim-treesitter-context"]
+	path = .config/nvim/pack/plugins/opt/nvim-treesitter-context
+	url = https://github.com/nvim-treesitter/nvim-treesitter-context.git
+[submodule ".config/nvim/pack/plugins/opt/vim-dirdiff"]
+	path = .config/nvim/pack/plugins/opt/vim-dirdiff
+	url = https://github.com/will133/vim-dirdiff.git
 [submodule ".config/zsh/ohmyzsh"]
 	path = .config/zsh/ohmyzsh
 	url = https://github.com/ohmyzsh/ohmyzsh.git

bin/dkpurge

@@ -1,11 +1,5 @@
 #!/bin/bash
 
-NORMAL='\e[0m'
-BOLD='\e[1m'
-RED='\e[31m'
-
-ECHO='echo -e'
-
 PS="$(docker ps -aq 2> /dev/null)"
 
 if [ "$?" ] && [ "$EUID" != 0 ]; then
@@ -18,10 +12,9 @@ IMG="$(docker images    -q 2> /dev/null)"
 
 
 if [ -n "$PS" ]; then
-    $ECHO "${BOLD}${RED}CONTAINERS${NORMAL}"
     docker ps -a
 
-    $ECHO -n "Prune Containers? [Y/n/a] "
+    echo -n "Prune Containers? [Y/n/a] "
     read -r ANS
     case "${ANS,,}" in
         'y'|'yes'|'')
@@ -34,23 +27,23 @@ if [ -n "$PS" ]; then
 fi
 
 if [ -n "$VOL" ]; then
-    $ECHO "${BOLD}${RED}VOLUMES${NORMAL}"
+    echo
     docker volume ls
 
-    $ECHO -n "Prune Volumes? [Y/n] "
+    echo -n "Prune Volumes? [Ya/n] "
     read -r ANS
     case "${ANS,,}" in
-        'y'|'yes'|'')
+        'y'|'yes'|'a'|'all'|'')
             echo "$VOL" | xargs docker volume rm -f 2> /dev/null
             ;;
     esac
 fi
 
 if [ -n "$IMG" ]; then
-    $ECHO "${BOLD}${RED}IMAGES${NORMAL}"
+    echo
     docker images
 
-    $ECHO -n "Prune Images? [Y/n/a] "
+    echo -n "Prune Images? [Y/n/a] "
     read -r ANS
     case "${ANS,,}" in
         'y'|'yes'|'')