From 0ecb71b9bd6ec8289250da0b96f377522f4a2e79 Mon Sep 17 00:00:00 2001 From: AngeD Date: Mon, 29 Aug 2022 21:30:46 +0200 Subject: [PATCH 1/6] feat: new ws naming and sway sway workspace shortcuts --- .config/Trolltech.conf | 2 +- .config/awesome/rc.lua | 2 +- .config/nvim/pack/plugins/opt/black | 2 +- .config/nvim/pack/plugins/opt/nvim-lspconfig | 2 +- .config/nvim/pack/plugins/opt/nvim-treesitter | 2 +- .config/sway/config.d/10-variables.conf | 4 ++-- .config/sway/config.d/40-hotkeys.conf | 4 ++++ 7 files changed, 11 insertions(+), 7 deletions(-) diff --git a/.config/Trolltech.conf b/.config/Trolltech.conf index 1467c9f..48af022 100644 --- a/.config/Trolltech.conf +++ b/.config/Trolltech.conf @@ -1,2 +1,2 @@ [Qt] -style = Materia-dark +style=Materia-dark diff --git a/.config/awesome/rc.lua b/.config/awesome/rc.lua index b533b7c..07c2926 100644 --- a/.config/awesome/rc.lua +++ b/.config/awesome/rc.lua @@ -136,7 +136,7 @@ awful.screen.connect_for_each_screen( -- Each screen has its own tag table. awful.tag( - {"TTY", "WEB", "DEV", "SBX", "GAM", "DOC", "GFX", "SRV", "ETC"}, + {"TTY", "WEB", "DEV", "SBX", "GAM", "MED", "SYS", "SRV", "ETC"}, s, awful.layout.layouts[1] ) diff --git a/.config/nvim/pack/plugins/opt/black b/.config/nvim/pack/plugins/opt/black index 21218b6..c0cc19b 160000 --- a/.config/nvim/pack/plugins/opt/black +++ b/.config/nvim/pack/plugins/opt/black @@ -1 +1 @@ -Subproject commit 21218b666aeafd1c089cbe998e730f97605d25b2 +Subproject commit c0cc19b5b3371842d696875897bebefebd5e1596 diff --git a/.config/nvim/pack/plugins/opt/nvim-lspconfig b/.config/nvim/pack/plugins/opt/nvim-lspconfig index 520c609..636ce36 160000 --- a/.config/nvim/pack/plugins/opt/nvim-lspconfig +++ b/.config/nvim/pack/plugins/opt/nvim-lspconfig @@ -1 +1 @@ -Subproject commit 520c609210029e901b433c49e7c1e00dd247b47a +Subproject commit 636ce36c30725391486377850bf8460dc0723ae2 diff --git a/.config/nvim/pack/plugins/opt/nvim-treesitter b/.config/nvim/pack/plugins/opt/nvim-treesitter index 840994d..f3c53d2 160000 --- a/.config/nvim/pack/plugins/opt/nvim-treesitter +++ b/.config/nvim/pack/plugins/opt/nvim-treesitter @@ -1 +1 @@ -Subproject commit 840994db95313b97328f33b772cc18081baf461f +Subproject commit f3c53d225ada93a99bfd818e1c40012400e2dc55 diff --git a/.config/sway/config.d/10-variables.conf b/.config/sway/config.d/10-variables.conf index 0b3c453..144a928 100644 --- a/.config/sway/config.d/10-variables.conf +++ b/.config/sway/config.d/10-variables.conf @@ -24,8 +24,8 @@ set $ws3 3:DEV set $ws4 4:SBX set $ws5 5:GAM set $ws6 6:MED -set $ws7 7:DOC -set $ws8 8:GFX +set $ws7 7:SYS +set $ws8 8:SRV set $ws9 9:ETC # border background text indicator child_border diff --git a/.config/sway/config.d/40-hotkeys.conf b/.config/sway/config.d/40-hotkeys.conf index 90832af..f8b55e1 100644 --- a/.config/sway/config.d/40-hotkeys.conf +++ b/.config/sway/config.d/40-hotkeys.conf @@ -47,6 +47,10 @@ bindsym $mod+Shift+$up move up bindsym $mod+Shift+$right move right + # Move the focused workspace with the same, but add Control + bindsym $mod+Control+$down move workspace to left + bindsym $mod+Control+$up move workspace to right + ## Workspaces: # Switch to workspace bindsym $mod+1 workspace $ws1 From 8ae1d868175d6f09ffdd995000622e49048aeb19 Mon Sep 17 00:00:00 2001 From: AngeD Date: Mon, 29 Aug 2022 21:35:27 +0200 Subject: [PATCH 2/6] fix: submodule order --- .gitmodules | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index 9add383..214ae82 100644 --- a/.gitmodules +++ b/.gitmodules @@ -13,12 +13,12 @@ [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/nvim/pack/plugins/opt/vim-easy-align"] + path = .config/nvim/pack/plugins/opt/vim-easy-align + url = https://github.com/junegunn/vim-easy-align.git [submodule ".config/zsh/ohmyzsh"] path = .config/zsh/ohmyzsh url = https://github.com/ohmyzsh/ohmyzsh.git [submodule ".pyenv"] path = .pyenv url = https://github.com/pyenv/pyenv.git -[submodule ".config/nvim/pack/plugins/opt/vim-easy-align"] - path = .config/nvim/pack/plugins/opt/vim-easy-align - url = https://github.com/junegunn/vim-easy-align.git From dabb11eb273cb8dd56515cd1f8b1d6a17b206a98 Mon Sep 17 00:00:00 2001 From: AngeD Date: Tue, 30 Aug 2022 09:49:06 +0200 Subject: [PATCH 3/6] merge: work --- .config/kitty/kitty.conf | 8 ------ .config/nvim/init.lua | 27 +++++++++++-------- .config/nvim/pack/plugins/opt/nvim-treesitter | 2 +- 3 files changed, 17 insertions(+), 20 deletions(-) delete mode 100644 .config/kitty/kitty.conf diff --git a/.config/kitty/kitty.conf b/.config/kitty/kitty.conf deleted file mode 100644 index d4922b2..0000000 --- a/.config/kitty/kitty.conf +++ /dev/null @@ -1,8 +0,0 @@ -update_check_interval 0 - -font_family DejaVuSansMono Nerd Font Mono -font_size 14.0 - -background_opacity 0.8 - -enable_audio_bell no diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua index 2cf280b..23143a6 100644 --- a/.config/nvim/init.lua +++ b/.config/nvim/init.lua @@ -3,7 +3,6 @@ vim.cmd("packadd nvim-treesitter") require'nvim-treesitter.configs'.setup { auto_install = true, highlight = {enable = true}, - indent = {enable = true}, } vim.cmd("packadd black") @@ -19,10 +18,11 @@ vim.cmd("packadd nvim-lspconfig") vim.cmd("packadd vim-dirdiff") vim.cmd("packadd vim-easy-align") -vim.keymap.set("n", "ga", "(EasyAlign)") +vim.keymap.set("n", "ga", "(EasyAlign)") vim.keymap.set("x", "ga", "(EasyAlign)") -- variables +vim.g.mapleader = " " vim.o.path = vim.o.path .. ",**" vim.o.expandtab = true vim.o.smartindent = true @@ -37,17 +37,22 @@ vim.o.mouse = "a" vim.o.suffixes = vim.o.suffixes .. ",.pyc" vim.o.foldmethod = "indent" 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", "", "") +-- (mode, key, command ) -vim.keymap.set("n", "", "h" ) -vim.keymap.set("n", "", "j" ) -vim.keymap.set("n", "", "k" ) -vim.keymap.set("n", "", "l" ) +-- terminal escape key +vim.keymap.set("t", "", "" ) -vim.keymap.set("n", "gf", "gF" ) +-- movement keys +vim.keymap.set("n", "", "h" ) +vim.keymap.set("n", "", "j" ) +vim.keymap.set("n", "", "k" ) +vim.keymap.set("n", "", "l" ) + +-- go to file:line instead of just file +vim.keymap.set("n", "gf", "gF" ) + +-- remove trailing whitespaces +vim.keymap.set("n", "w", ":%s/\\s\\+$//e") diff --git a/.config/nvim/pack/plugins/opt/nvim-treesitter b/.config/nvim/pack/plugins/opt/nvim-treesitter index f3c53d2..f0c9a18 160000 --- a/.config/nvim/pack/plugins/opt/nvim-treesitter +++ b/.config/nvim/pack/plugins/opt/nvim-treesitter @@ -1 +1 @@ -Subproject commit f3c53d225ada93a99bfd818e1c40012400e2dc55 +Subproject commit f0c9a186eab06d7e4dcd78c973dcb60b702ac5d2 From 0a7a96be6a6a395510d9311bd2d1ebeaae2f3976 Mon Sep 17 00:00:00 2001 From: AngeD Date: Wed, 31 Aug 2022 22:12:35 +0200 Subject: [PATCH 4/6] feat: docker network purge --- bin/dkpurge | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/bin/dkpurge b/bin/dkpurge index 54068eb..aef68e2 100755 --- a/bin/dkpurge +++ b/bin/dkpurge @@ -7,8 +7,9 @@ if [ "$?" != 0 ] && [ "$EUID" != 0 ]; then exit fi -VOL="$(docker volume ls -q 2> /dev/null)" -IMG="$(docker images -q 2> /dev/null)" +VOL="$(docker volume ls -q 2> /dev/null)" +IMG="$(docker images -q 2> /dev/null)" +NET="$(docker network ls -q 2> /dev/null)" if [ -n "$PS" ]; then @@ -41,7 +42,7 @@ fi if [ -n "$IMG" ]; then echo - docker images + docker image ls echo -n "Prune Images? [Y/n/a] " read -r ANS @@ -54,3 +55,16 @@ if [ -n "$IMG" ]; then ;; esac fi + +if [ -n "$NET" ]; then + echo + docker network ls + + echo -n "Prune Networks? [Y/n/a] " + read -r ANS + case "${ANS,,}" in + 'y'|'yes'|'a'|'all'|'') + docker network prune -f + ;; + esac +fi From 72f347c9d12f823a40d4683b722d916d60c82f61 Mon Sep 17 00:00:00 2001 From: AngeD Date: Wed, 31 Aug 2022 22:15:04 +0200 Subject: [PATCH 5/6] feat: docker network and prune aliases --- .config/zsh/.docker_aliases | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/.config/zsh/.docker_aliases b/.config/zsh/.docker_aliases index c5dae4f..903694d 100644 --- a/.config/zsh/.docker_aliases +++ b/.config/zsh/.docker_aliases @@ -21,6 +21,8 @@ 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 dkipf='docker image prune -f' alias dkirm='docker image rm' alias dkirmf='docker image rm -f' alias dkl='docker pull' @@ -33,9 +35,22 @@ 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' +# 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' + # docker-compose alias dc='docker-compose' alias dcd='docker-compose down' From f2093ac8d37e84a699184775610e85e570732810 Mon Sep 17 00:00:00 2001 From: AngeD Date: Wed, 31 Aug 2022 23:25:17 +0200 Subject: [PATCH 6/6] style: cleanup dkpurge prompts --- bin/dkpurge | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/dkpurge b/bin/dkpurge index aef68e2..b0f23b5 100755 --- a/bin/dkpurge +++ b/bin/dkpurge @@ -60,7 +60,7 @@ if [ -n "$NET" ]; then echo docker network ls - echo -n "Prune Networks? [Y/n/a] " + echo -n "Prune Networks? [Ya/n] " read -r ANS case "${ANS,,}" in 'y'|'yes'|'a'|'all'|'')