From 6933083cda46a06d295a1338a3644c84e600b0d4 Mon Sep 17 00:00:00 2001
From: Noah Masur <7386960+nmasur@users.noreply.github.com>
Date: Thu, 27 Mar 2025 13:01:53 -0400
Subject: [PATCH] adjust some zellij and helix keybinds
---
.../modules/nmasur/presets/programs/helix.nix | 39 ++++++
.../nmasur/presets/programs/zellij.nix | 116 +++++-------------
2 files changed, 71 insertions(+), 84 deletions(-)
diff --git a/platforms/home-manager/modules/nmasur/presets/programs/helix.nix b/platforms/home-manager/modules/nmasur/presets/programs/helix.nix
index c88b247..df5099f 100644
--- a/platforms/home-manager/modules/nmasur/presets/programs/helix.nix
+++ b/platforms/home-manager/modules/nmasur/presets/programs/helix.nix
@@ -35,6 +35,8 @@ in
enable = true;
+ package = pkgs.helix; # pkgs.evil-helix
+
languages = {
language-server.nixd = {
@@ -117,7 +119,44 @@ in
settings = {
theme = "base16";
+
+ keys.normal = {
+ # Enable and disable inlay hints
+ space.H = ":toggle lsp.display-inlay-hints";
+
+ # Extend selection above
+ X = "select_line_above";
+
+ # Move lines up or down
+ A-j = [
+ "extend_to_line_bounds"
+ "delete_selection"
+ "paste_after"
+ ];
+ A-k = [
+ "extend_to_line_bounds"
+ "delete_selection"
+ "move_line_up"
+ "paste_before"
+ ];
+
+ # Copy lines up or down
+ A-J = [
+ "extend_to_line_bounds"
+ "yank"
+ "paste_after"
+ ];
+
+ A-K = [
+ "extend_to_line_bounds"
+ "yank"
+ "paste_before"
+ ];
+
+ };
+
editor = {
+
# Change cursors depending on the mode
cursor-shape = {
insert = "bar";
diff --git a/platforms/home-manager/modules/nmasur/presets/programs/zellij.nix b/platforms/home-manager/modules/nmasur/presets/programs/zellij.nix
index 3bd42c0..037c5ad 100644
--- a/platforms/home-manager/modules/nmasur/presets/programs/zellij.nix
+++ b/platforms/home-manager/modules/nmasur/presets/programs/zellij.nix
@@ -18,6 +18,7 @@ in
home.packages = [ pkgs.zellij-switch ];
programs.fish = {
+ shellAbbrs.z = "zellij";
functions = {
zellij-session = {
# description = "Open a session in Zellij";
@@ -59,67 +60,42 @@ in
enableFishIntegration = true;
enableZshIntegration = true;
+ # Not yet available in unstable
+ # attachExistingSession = true;
+ # exitShellOnExit = true;
+
settings = {
# default_layout = "compact-top";
# Remove border
pane_frames = false;
# Scrollback
scrollback_editor = config.home.sessionVariables.EDITOR;
+ # plugins = {
+ # autolock = {
+ # _props = {
+ # location = "https://github.com/fresh2dev/zellij-autolock/releases/download/0.2.2/zellij-autolock.wasm";
+ # };
+ # is_enabled = {
+ # _args = [ true ];
+ # };
+ # triggers = {
+ # _args = [ "vim|nvim|hx|git|fzf|zoxide|atuin|gh" ];
+ # };
+ # reaction_seconds = {
+ # _args = [ "0.3" ];
+ # };
+ # print_to_log = {
+ # _args = [ true ];
+ # };
+ # };
+ # };
+ # load_plugins = {
+ # autolock = { };
+ # };
keybinds = {
- # _props = {
- # clear-defaults = true;
- # };
- unbind = {
- _args = [
- "Ctrl g"
- "Ctrl h"
- "Ctrl n"
- "Ctrl o"
- "Ctrl p"
- "Ctrl q"
- "Ctrl s"
- "Alt i"
- ];
- };
normal = {
- "bind \"Alt l\"" = {
- SwitchToMode = {
- _args = [ "locked" ];
- };
- };
- "bind \"Alt p\"" = {
- SwitchToMode = {
- _args = [ "pane" ];
- };
- };
- "bind \"Alt t\"" = {
- SwitchToMode = {
- _args = [ "tab" ];
- };
- };
- "bind \"Alt r\"" = {
- SwitchToMode = {
- _args = [ "resize" ];
- };
- };
- "bind \"Alt m\"" = {
- SwitchToMode = {
- _args = [ "move" ];
- };
- };
- "bind \"Alt k\"" = {
- SwitchToMode = {
- _args = [ "scroll" ];
- };
- };
- "bind \"Alt o\"" = {
- SwitchToMode = {
- _args = [ "session" ];
- };
- };
- "bind \"Alt q\"" = {
- "Quit" = { };
- };
+ };
+ shared = {
"bind \"Alt Shift p\"" = {
"Run" = {
_args = [
@@ -130,42 +106,14 @@ in
close_on_exit = true;
};
};
- "bind \"Super t\"" = {
- "NewTab" = { };
- };
"bind \"Super Shift ]\"" = {
- "GoToPreviousTab" = { };
+ "GoToNextTab" = { };
};
"bind \"Super Shift [\"" = {
- "GoToNextTab" = { };
- };
- "bind \"Ctrl Tab\"" = {
- "GoToNextTab" = { };
- };
- "bind \"Ctrl Shift Tab\"" = {
"GoToPreviousTab" = { };
};
- "bind \"Alt Shift i\"" = {
- "MoveTab" = {
- _args = [ "Left" ];
- };
- };
- "bind \"Alt Shift o\"" = {
- "MoveTab" = {
- _args = [ "Right" ];
- };
- };
- };
- locked = {
- "bind \"Alt l\"" = {
- SwitchToMode = {
- _args = [ "Normal" ];
- };
- };
- };
- session = {
- unbind = {
- _args = [ "Alt o" ];
+ "bind \"Super t\"" = {
+ "NewTab" = { };
};
};