merge: work

.config/awesome/rc.lua

@@ -647,6 +647,7 @@ apps = {
     "killall cbatticon",
     "cbatticon BAT0 -i symbolic",
     "numlockx",
+    "flameshot",
 }
 
 for _, app in ipairs(apps) do

.config/nvim/ftplugin/dockerfile.lua

@@ -1,8 +1,8 @@
 -- packages
-require'lspconfig'.dockerls.setup {}
+require'lspconfig'.dockerls.setup {
+    on_attach = require'lspbinds',
+}
 
 -- variables
-vim.o.shiftwidth = 2
-vim.o.tabstop = 2
 
 -- keybindings

.config/nvim/ftplugin/python.lua

@@ -1,5 +1,7 @@
 -- packages
-require'lspconfig'.pyright.setup {}
+require'lspconfig'.pyright.setup {
+    on_attach = require'lspbinds',
+}
 
 -- variables
 vim.cmd("let g:black_linelength=79")

.config/nvim/ftplugin/sh.lua

@@ -1,5 +1,7 @@
 -- packages
-require'lspconfig'.bashls.setup{}
+require'lspconfig'.bashls.setup{
+    on_attach = require'lspbinds',
+}
 
 -- variables
 

.config/nvim/ftplugin/yaml.lua

@@ -1,5 +1,7 @@
 -- packages
-require'lspconfig'.yamlls.setup {}
+require'lspconfig'.yamlls.setup {
+    on_attach = require'lspbinds',
+}
 
 -- variables
 vim.o.shiftwidth = 2

.config/nvim/init.lua

@@ -32,6 +32,8 @@ vim.o.foldlevel      = 99
 vim.o.grepprg        = "grep -rn $*"
 vim.wo.cc            = "80"
 
+vim.cmd("au BufWrite * :%s/\\s\\+$//e")
+
 -- keybindings
 vim.keymap.set("t", "<Esc>", "<C-\\><C-n>")
 
@@ -41,5 +43,3 @@ vim.keymap.set("n", "<C-k>", "<C-w>k"     )
 vim.keymap.set("n", "<C-l>", "<C-w>l"     )
 
 vim.keymap.set("n", "gf",    "gF"         )
-
-vim.keymap.set('n', 'K', vim.lsp.buf.hover, bufopts)

.config/nvim/lua/lspbinds.lua

@@ -6,9 +6,7 @@ vim.keymap.set('n', '[d', vim.diagnostic.goto_prev, opts)
 vim.keymap.set('n', ']d', vim.diagnostic.goto_next, opts)
 vim.keymap.set('n', '<space>q', vim.diagnostic.setloclist, opts)
 
--- Use an on_attach function to only map the following keys
--- after the language server attaches to the current buffer
-local on_attach = function(client, bufnr)
+return function(client, bufnr)
     -- Enable completion triggered by <c-x><c-o>
     vim.api.nvim_buf_set_option(bufnr, 'omnifunc', 'v:lua.vim.lsp.omnifunc')
 
@@ -31,24 +29,3 @@ local on_attach = function(client, bufnr)
     vim.keymap.set('n', 'gr', vim.lsp.buf.references, bufopts)
     vim.keymap.set('n', '<space>f', vim.lsp.buf.formatting, bufopts)
 end
-
-local lsp_flags = {
-    -- This is the default in Nvim 0.7+
-    debounce_text_changes = 150,
-}
-require('lspconfig')['pyright'].setup{
-    on_attach = on_attach,
-    flags = lsp_flags,
-}
-require('lspconfig')['tsserver'].setup{
-    on_attach = on_attach,
-    flags = lsp_flags,
-}
-require('lspconfig')['rust_analyzer'].setup{
-    on_attach = on_attach,
-    flags = lsp_flags,
-    -- Server-specific settings...
-    settings = {
-        ["rust-analyzer"] = {}
-    }
-}

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

@@ -1 +1 @@
-Subproject commit 507234c47d39f5b1d8289cdd49994e03dd97bcb4
+Subproject commit 6064a435453cdba47c43d71f3d0ea1aa19a29206

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

@@ -1 +1 @@
-Subproject commit e7b5e92d46355919e96e78f596bd5297c9ef77dd
+Subproject commit 9b3f1275018b7cac15ef07af880e1f010a959963

.config/zsh/.docker_aliases

@@ -1,31 +1,40 @@
-# docker
 alias dk='docker'
+
+# containers
+alias dkca='docker container ls -a'
+alias dkcaq='docker container ls -a -q'
+alias dkci='docker container inspect'
+alias dkcls='docker container ls'
+alias dkcq='docker container ls -q'
+alias dkcrm='docker container rm'
+alias dkcrmf='docker container rm -f'
+alias dkex='docker container exec -i -t'
+alias dklo='docker container logs -f'
+alias dkr='docker container run -i -t'
+
+# images
 alias dkb='docker build .'
-alias dkc='docker create'
-alias dkex='docker exec -it'
 alias dki='docker image'
 alias dkic='docker image create'
+alias dkii='docker image inspect'
 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 dkirm='docker image rm'
+alias dkirmf='docker image rm -f'
 alias dkl='docker pull'
-alias dklo='docker logs -f'
 alias dkp='docker push'
-alias dkps='docker ps'
-alias dkpsa='docker ps -a'
-alias dkrm='docker rm'
 alias dkt='docker 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 dkvrm='docker volume rm'
-
-function dkpurge() {
-    PS="$(docker ps -aq)"
-
-    echo "$PS" | xargs docker stop
-    echo "$PS" | xargs docker rm
-    docker image prune -f
-}
+alias dkvrmf='docker volume rm -f'
 
 # docker-compose
 alias dc='docker-compose'

.config/zsh/ohmyzsh

@@ -1 +1 @@
-Subproject commit 97134d1eed19b72a9c4bf90a2effa847221608bf
+Subproject commit 835a0a5d17765243cabee782acb5905a9aab33c3

.zshenv

@@ -2,16 +2,17 @@ export PYENV_ROOT="$HOME/.pyenv"
 
 path=(~/bin ~/.local/bin "$PYENV_ROOT"/bin $path)
 
-export XDG_CACHE_HOME="$HOME/.cache"
-export XDG_CONFIG_HOME="$HOME/.config"
-export XDG_DATA_HOME="$HOME/.local/share"
-export XDG_STATE_HOME="$HOME/.local/state"
-export XDG_CONFIG_DIRS="/etc/xdg"
-export XDG_DATA_DIRS="/usr/local/share/:/usr/share/"
+export XDG_CACHE_HOME="$HOME"/.cache
+export XDG_CONFIG_HOME="$HOME"/.config
+export XDG_DATA_HOME="$HOME"/.local/share
+export XDG_STATE_HOME="$HOME"/.local/state
+export XDG_CONFIG_DIRS=/etc/xdg
+export XDG_DATA_DIRS='/usr/local/share/:/usr/share/'
 
 export ZDOTDIR="$HOME"/.config/zsh
 export HISTFILE="$XDG_STATE_HOME"/zsh/history
 
 export MOZ_ENABLE_WAYLAND=1
+export LESSHISTFILE='-'
 
-export EDITOR="nvim"
+export EDITOR='nvim'

bin/dkpurge

@@ -0,0 +1,63 @@
+#!/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
+    sudo -- "$0" "$@"
+    exit
+fi
+
+VOL="$(docker volume ls -q 2> /dev/null)"
+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] "
+    read -r ANS
+    case "${ANS,,}" in
+        'y'|'yes'|'')
+            echo "$PS" | xargs docker rm 2> /dev/null
+            ;;
+        'a'|'all')
+            echo "$PS" | xargs docker rm -f
+            ;;
+    esac
+fi
+
+if [ -n "$VOL" ]; then
+    $ECHO "${BOLD}${RED}VOLUMES${NORMAL}"
+    docker volume ls
+
+    $ECHO -n "Prune Volumes? [Y/n] "
+    read -r ANS
+    case "${ANS,,}" in
+        'y'|'yes'|'')
+            echo "$VOL" | xargs docker volume rm -f 2> /dev/null
+            ;;
+    esac
+fi
+
+if [ -n "$IMG" ]; then
+    $ECHO "${BOLD}${RED}IMAGES${NORMAL}"
+    docker images
+
+    $ECHO -n "Prune Images? [Y/n/a] "
+    read -r ANS
+    case "${ANS,,}" in
+        'y'|'yes'|'')
+            docker image prune -f
+            ;;
+        'a'|'all')
+            echo "$IMG" | xargs docker image rm -f 2> /dev/null
+            ;;
+    esac
+fi