diff options
| -rw-r--r-- | nvim/.config/nvim/lua/tobyvin/filetype.lua | 1 | ||||
| -rw-r--r-- | zsh/.config/zsh/.zshrc | 2 | ||||
| -rw-r--r-- | zsh/.config/zsh/.zshrc.d/20-zsh_vi_mode.zsh | 56 |
3 files changed, 56 insertions, 3 deletions
diff --git a/nvim/.config/nvim/lua/tobyvin/filetype.lua b/nvim/.config/nvim/lua/tobyvin/filetype.lua index 6fcb185..83e2f3e 100644 --- a/nvim/.config/nvim/lua/tobyvin/filetype.lua +++ b/nvim/.config/nvim/lua/tobyvin/filetype.lua @@ -7,7 +7,6 @@ vim.filetype.add({ nft = "nftables", ron = "ron", service = "systemd", - zsh = "sh", }, filename = { tridactylrc = "trytactylrc", diff --git a/zsh/.config/zsh/.zshrc b/zsh/.config/zsh/.zshrc index d6ddf41..cc2cd5e 100644 --- a/zsh/.config/zsh/.zshrc +++ b/zsh/.config/zsh/.zshrc @@ -1,4 +1,4 @@ -#!/bin/zsh +#!/usr/bin/zsh HISTFILE="${XDG_STATE_HOME}/zsh/history" HISTSIZE=10000 diff --git a/zsh/.config/zsh/.zshrc.d/20-zsh_vi_mode.zsh b/zsh/.config/zsh/.zshrc.d/20-zsh_vi_mode.zsh index e3d6411..f1728b8 100644 --- a/zsh/.config/zsh/.zshrc.d/20-zsh_vi_mode.zsh +++ b/zsh/.config/zsh/.zshrc.d/20-zsh_vi_mode.zsh @@ -1,6 +1,60 @@ #!/usr/bin/zsh -function zvm_config() { +zvm_config() { ZVM_VI_HIGHLIGHT_FOREGROUND=black ZVM_VI_HIGHLIGHT_BACKGROUND=white } + +function zvm_after_init() { + functions -c zvm_vi_yank _zvm_vi_yank + unfunction zvm_vi_yank + zvm_vi_yank() { + _zvm_vi_yank + echo -en "${CUTBUFFER}" | wl-copy + } + + functions -c zvm_vi_delete _zvm_vi_delete + unfunction zvm_vi_delete + zvm_vi_delete() { + _zvm_vi_delete + echo -en "${CUTBUFFER}" | wl-copy + } + + functions -c zvm_vi_change _zvm_vi_change + unfunction zvm_vi_change + zvm_vi_change() { + _zvm_vi_change + echo -en "${CUTBUFFER}" | wl-copy + } + + functions -c zvm_vi_change_eol _zvm_vi_change_eol + unfunction zvm_vi_change_eol + zvm_vi_change_eol() { + _zvm_vi_change_eol + echo -en "${CUTBUFFER}" | wl-copy + } + + functions -c zvm_vi_put_after _zvm_vi_put_after + unfunction zvm_vi_put_after + zvm_vi_put_after() { + CUTBUFFER=$(wl-paste) + _zvm_vi_put_after + zvm_highlight clear # zvm_vi_put_after introduces weird highlighting + } + + functions -c zvm_vi_put_before _zvm_vi_put_before + unfunction zvm_vi_put_before + zvm_vi_put_before() { + CUTBUFFER=$(wl-paste) + _zvm_vi_put_before + zvm_highlight clear # zvm_vi_put_before introduces weird highlighting + } + + functions -c zvm_vi_replace_selection _zvm_vi_replace_selection + unfunction zvm_vi_replace_selection + zvm_vi_replace_selection() { + CUTBUFFER=$(pbpaste) + _zvm_vi_replace_selection + echo -en "${CUTBUFFER}" | wl_copy + } +} |