diff --git a/.config/nvim/ftplugin/gitcommit.lua b/.config/nvim/ftplugin/gitcommit.lua index 847519d..211859c 100644 --- a/.config/nvim/ftplugin/gitcommit.lua +++ b/.config/nvim/ftplugin/gitcommit.lua @@ -1,5 +1,3 @@ --- packages - -- variables vim.opt_local.colorcolumn = "50" diff --git a/.config/nvim/ftplugin/html.lua b/.config/nvim/ftplugin/html.lua index 317629b..7231e66 100644 --- a/.config/nvim/ftplugin/html.lua +++ b/.config/nvim/ftplugin/html.lua @@ -1,5 +1,3 @@ --- packages - -- variables vim.opt_local.shiftwidth = 2 vim.opt_local.tabstop = 2 diff --git a/.config/nvim/ftplugin/json.lua b/.config/nvim/ftplugin/json.lua index 317629b..7231e66 100644 --- a/.config/nvim/ftplugin/json.lua +++ b/.config/nvim/ftplugin/json.lua @@ -1,5 +1,3 @@ --- packages - -- variables vim.opt_local.shiftwidth = 2 vim.opt_local.tabstop = 2 diff --git a/.config/nvim/ftplugin/python.lua b/.config/nvim/ftplugin/python.lua index 970a9cb..a7cb556 100644 --- a/.config/nvim/ftplugin/python.lua +++ b/.config/nvim/ftplugin/python.lua @@ -1,7 +1,5 @@ --- packages - -- variables -vim.cmd("let g:black_linelength=79") +vim.g.black_linelength = 79 -- keybindings vim.keymap.set("n", "f", "Black", {buffer=true}) diff --git a/.config/nvim/ftplugin/tex.lua b/.config/nvim/ftplugin/tex.lua index 717fe69..fe012c7 100644 --- a/.config/nvim/ftplugin/tex.lua +++ b/.config/nvim/ftplugin/tex.lua @@ -1,5 +1,3 @@ --- packages - -- variables vim.opt_local.shiftwidth = 2 vim.opt_local.tabstop = 2 diff --git a/.config/nvim/ftplugin/yaml.lua b/.config/nvim/ftplugin/yaml.lua index 317629b..7231e66 100644 --- a/.config/nvim/ftplugin/yaml.lua +++ b/.config/nvim/ftplugin/yaml.lua @@ -1,5 +1,3 @@ --- packages - -- variables vim.opt_local.shiftwidth = 2 vim.opt_local.tabstop = 2 diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua index 63384bf..6a0bd8f 100644 --- a/.config/nvim/init.lua +++ b/.config/nvim/init.lua @@ -49,6 +49,7 @@ require"theme" require"pack-dirdiff" require"pack-easy-align" +require"pack-grammalecte" require"pack-indent-blankline" require"pack-lspconfig" require"pack-telescope" diff --git a/.config/nvim/lua/pack-grammalecte.lua b/.config/nvim/lua/pack-grammalecte.lua new file mode 100644 index 0000000..602a586 --- /dev/null +++ b/.config/nvim/lua/pack-grammalecte.lua @@ -0,0 +1,3 @@ +vim.cmd("packadd grammalecte") + +vim.g.grammalecte_cli_py = "/usr/bin/grammalecte-cli" diff --git a/.config/nvim/pack/plugins/opt/grammalecte b/.config/nvim/pack/plugins/opt/grammalecte new file mode 160000 index 0000000..a0ce51a --- /dev/null +++ b/.config/nvim/pack/plugins/opt/grammalecte @@ -0,0 +1 @@ +Subproject commit a0ce51a77e56151f62ddbfd10e7dec46000f2848 diff --git a/.config/nvim/pack/plugins/opt/impatient b/.config/nvim/pack/plugins/opt/impatient index 9f7eed8..c90e273 160000 --- a/.config/nvim/pack/plugins/opt/impatient +++ b/.config/nvim/pack/plugins/opt/impatient @@ -1 +1 @@ -Subproject commit 9f7eed8133d62457f7ad2ca250eb9b837a4adeb7 +Subproject commit c90e273f7b8c50a02f956c24ce4804a47f18162e diff --git a/.config/nvim/pack/plugins/opt/lspconfig b/.config/nvim/pack/plugins/opt/lspconfig index 42ca8ce..6b43ce5 160000 --- a/.config/nvim/pack/plugins/opt/lspconfig +++ b/.config/nvim/pack/plugins/opt/lspconfig @@ -1 +1 @@ -Subproject commit 42ca8ce0f2252be795da4789fadfa91f6c3f7464 +Subproject commit 6b43ce561d97412cc512b569db6938e44529293e diff --git a/.config/nvim/pack/plugins/opt/telescope b/.config/nvim/pack/plugins/opt/telescope index e960efa..a606bd1 160000 --- a/.config/nvim/pack/plugins/opt/telescope +++ b/.config/nvim/pack/plugins/opt/telescope @@ -1 +1 @@ -Subproject commit e960efa60e97df58e089b00270f09d60f27202c8 +Subproject commit a606bd10c79ec5989c76c49cc6f736e88b63f0da diff --git a/.config/nvim/pack/plugins/opt/treesitter b/.config/nvim/pack/plugins/opt/treesitter index fb36ed4..b019eb3 160000 --- a/.config/nvim/pack/plugins/opt/treesitter +++ b/.config/nvim/pack/plugins/opt/treesitter @@ -1 +1 @@ -Subproject commit fb36ed4c9e962d9fbfa608cd4a5d9313b1e8a8b1 +Subproject commit b019eb30323635d680aa2f32e498a1831676ebb1 diff --git a/.config/zsh/ohmyzsh b/.config/zsh/ohmyzsh index a3c579b..55e4e6c 160000 --- a/.config/zsh/ohmyzsh +++ b/.config/zsh/ohmyzsh @@ -1 +1 @@ -Subproject commit a3c579bf27b34942d4c6ad64e7cfd75788b05ea3 +Subproject commit 55e4e6c73b2bb067974c6d49ba9da2ba1ee3295c diff --git a/.gitmodules b/.gitmodules index d920f67..7ad5e41 100644 --- a/.gitmodules +++ b/.gitmodules @@ -34,3 +34,6 @@ [submodule ".config/zsh/custom/themes/powerlevel10k"] path = .config/zsh/custom/themes/powerlevel10k url = https://github.com/romkatv/powerlevel10k.git +[submodule ".config/nvim/pack/plugins/opt/grammalecte"] + path = .config/nvim/pack/plugins/opt/grammalecte + url = https://github.com/dpelle/vim-Grammalecte.git diff --git a/.zshenv b/.zshenv index c43d136..6135556 100644 --- a/.zshenv +++ b/.zshenv @@ -15,6 +15,4 @@ export ZLE_RPROMPT_INDENT=0 export LESSHISTFILE='-' -export MOZ_ENABLE_WAYLAND=1 - export EDITOR='nvim' diff --git a/bin/am b/bin/am index 82da6f3..de4e5d3 100755 --- a/bin/am +++ b/bin/am @@ -2,10 +2,10 @@ set -e # TODO -# - mount all partitions by selecting disk -# - usage -# - support for /mnt -# - colors ? +# mount all partitions by selecting disk +# usage +# support for /mnt +# error handling (fs in use...) function clear_output() { local len="$1" @@ -19,10 +19,30 @@ if ! [ -t 1 ]; then exit 1 fi -COLUMNS=1 +function umount_all() { + local disks + + disks=($(mount | grep udisks2 | cut -f1 -d' ')) + umount "${disks[@]}" + echo "unmounted ${disks[@]}" +} + +while getopts a o; do + case "$o" in + a) + umount_all + exit + ;; + *) + ;; + esac +done + while true; do + #readarray -t LSBLK <<< "$(lsblk -n --paths | grep -v snap)" readarray -t LSBLK <<< "$(lsblk -n --paths --list | grep part)" + COLUMNS=1 select dev in "${LSBLK[@]}"; do name="$(cut -f1 -d' ' <<< "$dev")"