Compare commits

..

No commits in common. "80b6d4eae4e7fb2f2cdd41f0398999489d77db8c" and "f99bc2ac10930b1743612b94c2f2499c5dbcdfaa" have entirely different histories.

6 changed files with 37 additions and 54 deletions

View file

@ -1,2 +0,0 @@
#!/bin/sh
echo "$dns"

View file

@ -1,27 +0,0 @@
# browser is the shell (/bin/sh) command executed once the proxy starts.
# When browser exits, the proxy exits. An extra env var PROXY is available.
#
# Here, we use a separate Chrome instance in Incognito mode, so that
# it can run (and be waited for) alongside the default one, and that
# it maintains no state across runs. To configure this browser open a
# normal window in it, settings will be preserved.
browser = """
chromium-browser \
--user-data-dir="$HOME/.chromium-captive" \
--proxy-server="socks5://$PROXY" \
--host-resolver-rules="MAP * ~NOTFOUND , EXCLUDE localhost" \
--no-first-run --new-window --incognito \
http://example.com
"""
# dhcp-dns is the shell (/bin/sh) command executed to obtain the DHCP
# DNS server address. The first match of an IPv4 regex is used.
# IPv4 only, because let's be real, it's a captive portal.
#
# `wlan0` is your network interface.
#
dhcp-dns = "doas udhcpc -i wlan0 -s ~/.config/captive-browser.dump-dns.sh"
# socks5-addr is the listen address for the SOCKS5 proxy server.
socks5-addr = "localhost:1666"

View file

@ -57,11 +57,26 @@ hook global WinSetOption filetype=go %{
# Usar Foot # Usar Foot
# ------------ # ------------
hook global KakBegin .* %{ set-option global termcmd "footclient sh -c" } eval %sh{
define-command fzf-terminal -params 1.. -shell-completion %{ # https://github.com/alexherbo2/kakoune.cr/issues/33#issuecomment-1112160325
if test -n "$TMUX"; then echo "
define-command tmux-terminal-popup -params 1.. -shell-completion -docstring '
tmux-terminal-popup <program> [<arguments>]: create a new terminal as a tmux popup
The program passed as argument will be executed in the new popup' \
%{
tmux-terminal-impl 'display-popup -E -h 75% -w 75% -d #{pane_current_path}' %arg{@}
}
alias global terminal-popup tmux-terminal-popup
"
elif test -n "$WAYLAND_DISPLAY"; then echo '
hook global KakBegin .* %{ set-option global termcmd "footclient sh -c" }
define-command terminal-popup -params 1.. -shell-completion %{
set-option global termcmd "footclient --app-id=fzf sh -c" set-option global termcmd "footclient --app-id=fzf sh -c"
wayland-terminal %arg{@} wayland-terminal %arg{@}
set-option global termcmd "footclient sh -c" set-option global termcmd "footclient sh -c"
}
'
fi
} }
# ------------ # ------------
@ -102,25 +117,18 @@ hook -group sleuth global BufOpenFile .* %{ sleuth }
hook -group sleuth global BufWritePost .* %{ sleuth } hook -group sleuth global BufWritePost .* %{ sleuth }
# ------------ # ------------
# FZF # Kakoune.cr
# ------------ # ------------
source "%val{config}/plugins/fzf.kak/rc/fzf.kak"
evaluate-commands %sh{ evaluate-commands %sh{
find -L "$kak_config/plugins/fzf.kak/rc/modules/" -type f -name '*.kak' -exec printf 'source "%s"\n' {} \; kcr init kakoune
} }
hook global ModuleLoaded fzf %{
set-option global fzf_terminal_command 'fzf-terminal kak -c %val{session} -e "%arg{@}"' map -docstring 'new client' global normal <c-t> ': new<ret>'
} map -docstring 'terminal' global normal <c-ret> ': connect terminal<ret>'
hook global ModuleLoaded fzf-file %{ map -docstring 'file picker' global normal <c-f> ': connect terminal-popup kcr fzf files -- -H<ret>'
set-option global fzf_file_command 'rg -L --hidden --files --glob !.git' map -docstring 'buffer picker' global normal <c-b> ': connect terminal-popup kcr fzf buffers<ret>'
} map -docstring 'grep picker' global normal <c-g> ': connect terminal-popup kcr fzf grep<ret>'
hook global ModuleLoaded fzf-grep %{
set-option global fzf_grep_command 'rg'
}
map -docstring 'search files' global user f ': fzf-mode<ret>f'
map -docstring 'search buffers' global user b ': fzf-mode<ret>b'
map -docstring 'grep files' global user g ': fzf-mode<ret>g'
# ------------ # ------------
# Buffer switching # Buffer switching

@ -1 +0,0 @@
Subproject commit 62a3de575cceeaf9f556b824123a418def8bea7b

3
.gitmodules vendored
View file

@ -4,9 +4,6 @@
[submodule ".config/kak/plugins/zig.kak"] [submodule ".config/kak/plugins/zig.kak"]
path = .config/kak/plugins/zig.kak path = .config/kak/plugins/zig.kak
url = https://gitea.nulo.in/Nulo/zig.kak url = https://gitea.nulo.in/Nulo/zig.kak
[submodule ".config/kak/plugins/fzf.kak"]
path = .config/kak/plugins/fzf.kak
url = https://gitea.nulo.in/Nulo/fzf.kak
[submodule ".config/kak/plugins/kakoune-buffers"] [submodule ".config/kak/plugins/kakoune-buffers"]
path = .config/kak/plugins/kakoune-buffers path = .config/kak/plugins/kakoune-buffers
url = https://github.com/Delapouite/kakoune-buffers url = https://github.com/Delapouite/kakoune-buffers

View file

@ -28,5 +28,13 @@ Probablemente incompleto.
### Alpine ### Alpine
```sh ```sh
apk add zsh zsh-vcs fzf vis apk add zsh zsh-vcs fzf kak
```
#### Para editor mejorado
(requiere tmux o Wayland+foot)
```sh
apk add kakoune-cr kakoune-cr-commands bat fd
``` ```