Wed Jun 5 08:05:34 PM CEST 2024

This commit is contained in:
Thomas Avé 2024-06-05 20:05:34 +02:00
parent 31389aa08f
commit 4253ae326c
4 changed files with 15 additions and 13 deletions

View File

@ -62,7 +62,10 @@ in {
indicator = true; indicator = true;
}; };
home.packages = with pkgs; [ wl-clipboard ]; home.packages = [
pkgs.wl-clipboard
pkgs.jq
];
services.cliphist = { enable = true; }; services.cliphist = { enable = true; };
@ -217,10 +220,10 @@ in {
"$mainMod,XF86AudioLowerVolume, exec, ${playerctl} previous" "$mainMod,XF86AudioLowerVolume, exec, ${playerctl} previous"
'', Print, exec, grim -g "$(slurp -d)" - | wl-copy'' '', Print, exec, grim -g "$(slurp -d)" - | wl-copy''
"$mainMod, H, exec, ${./files/vim-hypr-nav.sh} l" "$mainMod, H, exec, ${./files/vim-hypr-nav.sh} l 2>> ~/error >> ~/output"
"$mainMod, L, exec, ${./files/vim-hypr-nav.sh} r" "$mainMod, L, exec, ${./files/vim-hypr-nav.sh} r 2>> ~/error >> ~/output"
"$mainMod, K, exec, ${./files/vim-hypr-nav.sh} u" "$mainMod, K, exec, ${./files/vim-hypr-nav.sh} u 2>> ~/error >> ~/output"
"$mainMod, J, exec, ${./files/vim-hypr-nav.sh} d" "$mainMod, J, exec, ${./files/vim-hypr-nav.sh} d 2>> ~/error >> ~/output"
"$mainMod CONTROL_L, H, swapwindow, l" "$mainMod CONTROL_L, H, swapwindow, l"
"$mainMod CONTROL_L, L, swapwindow, r" "$mainMod CONTROL_L, L, swapwindow, r"
"$mainMod CONTROL_L, K, swapwindow, u" "$mainMod CONTROL_L, K, swapwindow, u"

View File

@ -1,5 +1,5 @@
#!/bin/sh #!/bin/sh
#
# vim-hypr-nav - Use the same bindings to move focus between hyprland windows # vim-hypr-nav - Use the same bindings to move focus between hyprland windows
# and vim splits. Requires the accompanying vim plugin and jq. # and vim splits. Requires the accompanying vim plugin and jq.
@ -42,6 +42,7 @@ get_descendant_vim_pid() {
if focused_pid="$(hyprctl activewindow -j | jq -e '.pid')"; then if focused_pid="$(hyprctl activewindow -j | jq -e '.pid')"; then
terms="$(find /dev/pts -type c -not -name ptmx | sed s#^/dev/## | tr '\n' ,)" terms="$(find /dev/pts -type c -not -name ptmx | sed s#^/dev/## | tr '\n' ,)"
if vim_pid="$(get_descendant_vim_pid "$focused_pid" "$terms")"; then if vim_pid="$(get_descendant_vim_pid "$focused_pid" "$terms")"; then
echo $terms $focused_pid $vim_pid
servername_file="${XDG_RUNTIME_DIR:-/tmp}/vim-hypr-nav.$vim_pid.servername" servername_file="${XDG_RUNTIME_DIR:-/tmp}/vim-hypr-nav.$vim_pid.servername"
read -r program servername <"$servername_file" read -r program servername <"$servername_file"

View File

@ -14,6 +14,7 @@
unzip unzip
dotnet-sdk_8 dotnet-sdk_8
cargo cargo
neovim-unwrapped
]; ];
home.file."${config.xdg.configHome}/nvim" = { home.file."${config.xdg.configHome}/nvim" = {
@ -49,11 +50,7 @@
HeaderFilterRegex: ''' HeaderFilterRegex: '''
FormatStyle: none FormatStyle: none
''; '';
home.sessionVariables = {
programs.neovim = { EDITOR = "nvim";
enable = true;
viAlias = true;
vimAlias = true;
defaultEditor = true;
}; };
} }

View File

@ -74,6 +74,7 @@
compress = "tar --use-compress-program = lbzip2 -cvf"; compress = "tar --use-compress-program = lbzip2 -cvf";
wget = ''wget --hsts-file = "$XDG_DATA_HOME/wget-hsts"''; wget = ''wget --hsts-file = "$XDG_DATA_HOME/wget-hsts"'';
python = "python3"; python = "python3";
vim = "nvim";
v = '' v = ''
nvim -c ':lua require("oil").open()' && cd "$(cat /tmp/oil_dir 2> /dev/null || pwd)"''; nvim -c ':lua require("oil").open()' && cd "$(cat /tmp/oil_dir 2> /dev/null || pwd)"'';
cpr = cpr =