Use more of zellij's defaults
Some checks failed
/ check (push) Failing after 3m31s

This commit is contained in:
Daniel Flanagan 2024-11-05 09:08:59 -06:00
parent c5b0de57c4
commit f735072e34

View file

@ -1395,467 +1395,467 @@
# enableFishIntegration = true; # enableFishIntegration = true;
settings = { settings = {
pane_frames = false; pane_frames = false;
simplified_ui = true; # simplified_ui = true;
default_mode = "locked"; default_mode = "locked";
mouse_mode = true; mouse_mode = true;
copy_clipboard = "primary"; copy_clipboard = "primary";
copy_on_select = true; copy_on_select = true;
mirror_session = false; mirror_session = false;
keybinds = with builtins; let # keybinds = with builtins; let
binder = bind: let # binder = bind: let
keys = elemAt bind 0; # keys = elemAt bind 0;
action = elemAt bind 1; # action = elemAt bind 1;
argKeys = map (k: "\"${k}\"") (lib.lists.flatten [keys]); # argKeys = map (k: "\"${k}\"") (lib.lists.flatten [keys]);
in { # in {
name = "bind ${concatStringsSep " " argKeys}"; # name = "bind ${concatStringsSep " " argKeys}";
value = action; # value = action;
}; # };
layer = binds: (listToAttrs (map binder binds)); # layer = binds: (listToAttrs (map binder binds));
in { # in {
# _props = {clear-defaults = true;}; # # _props = {clear-defaults = true;};
normal = {}; # normal = {};
locked = layer [ # locked = layer [
[["Ctrl g"] {SwitchToMode = "Normal";}] # [["Ctrl g"] {SwitchToMode = "Normal";}]
[["Ctrl L"] {NewPane = "Right";}] # [["Ctrl L"] {NewPane = "Right";}]
[["Ctrl Z"] {NewPane = "Right";}] # [["Ctrl Z"] {NewPane = "Right";}]
[["Ctrl J"] {NewPane = "Down";}] # [["Ctrl J"] {NewPane = "Down";}]
[["Ctrl h"] {MoveFocus = "Left";}] # [["Ctrl h"] {MoveFocus = "Left";}]
[["Ctrl l"] {MoveFocus = "Right";}] # [["Ctrl l"] {MoveFocus = "Right";}]
[["Ctrl j"] {MoveFocus = "Down";}] # [["Ctrl j"] {MoveFocus = "Down";}]
[["Ctrl k"] {MoveFocus = "Up";}] # [["Ctrl k"] {MoveFocus = "Up";}]
]; # ];
resize = layer [ # resize = layer [
[["Ctrl n"] {SwitchToMode = "Normal";}] # [["Ctrl n"] {SwitchToMode = "Normal";}]
[["h" "Left"] {Resize = "Increase Left";}] # [["h" "Left"] {Resize = "Increase Left";}]
[["j" "Down"] {Resize = "Increase Down";}] # [["j" "Down"] {Resize = "Increase Down";}]
[["k" "Up"] {Resize = "Increase Up";}] # [["k" "Up"] {Resize = "Increase Up";}]
[["l" "Right"] {Resize = "Increase Right";}] # [["l" "Right"] {Resize = "Increase Right";}]
[["H"] {Resize = "Decrease Left";}] # [["H"] {Resize = "Decrease Left";}]
[["J"] {Resize = "Decrease Down";}] # [["J"] {Resize = "Decrease Down";}]
[["K"] {Resize = "Decrease Up";}] # [["K"] {Resize = "Decrease Up";}]
[["L"] {Resize = "Decrease Right";}] # [["L"] {Resize = "Decrease Right";}]
[["=" "+"] {Resize = "Increase";}] # [["=" "+"] {Resize = "Increase";}]
[["-"] {Resize = "Decrease";}] # [["-"] {Resize = "Decrease";}]
]; # ];
pane = layer [ # pane = layer [
[["Ctrl p"] {SwitchToMode = "Normal";}] # [["Ctrl p"] {SwitchToMode = "Normal";}]
[["h" "Left"] {MoveFocus = "Left";}] # [["h" "Left"] {MoveFocus = "Left";}]
[["l" "Right"] {MoveFocus = "Right";}] # [["l" "Right"] {MoveFocus = "Right";}]
[["j" "Down"] {MoveFocus = "Down";}] # [["j" "Down"] {MoveFocus = "Down";}]
[["k" "Up"] {MoveFocus = "Up";}] # [["k" "Up"] {MoveFocus = "Up";}]
[["p"] {SwitchFocus = [];}] # [["p"] {SwitchFocus = [];}]
[ # [
["n"] # ["n"]
{ # {
NewPane = []; # NewPane = [];
SwitchToMode = "Normal"; # SwitchToMode = "Normal";
} # }
] # ]
[ # [
["d"] # ["d"]
{ # {
NewPane = "Down"; # NewPane = "Down";
SwitchToMode = "Normal"; # SwitchToMode = "Normal";
} # }
] # ]
[ # [
["r"] # ["r"]
{ # {
NewPane = "Right"; # NewPane = "Right";
SwitchToMode = "Normal"; # SwitchToMode = "Normal";
} # }
] # ]
[ # [
["x"] # ["x"]
{ # {
CloseFocus = []; # CloseFocus = [];
SwitchToMode = "Normal"; # SwitchToMode = "Normal";
} # }
] # ]
[ # [
["f"] # ["f"]
{ # {
ToggleFocusFullscreen = []; # ToggleFocusFullscreen = [];
SwitchToMode = "Normal"; # SwitchToMode = "Normal";
} # }
] # ]
[ # [
["z"] # ["z"]
{ # {
TogglePaneFrames = []; # TogglePaneFrames = [];
SwitchToMode = "Normal"; # SwitchToMode = "Normal";
} # }
] # ]
[ # [
["w"] # ["w"]
{ # {
ToggleFloatingPanes = []; # ToggleFloatingPanes = [];
SwitchToMode = "Normal"; # SwitchToMode = "Normal";
} # }
] # ]
[ # [
["e"] # ["e"]
{ # {
TogglePaneEmbedOrFloating = []; # TogglePaneEmbedOrFloating = [];
SwitchToMode = "Normal"; # SwitchToMode = "Normal";
} # }
] # ]
[ # [
["c"] # ["c"]
{ # {
SwitchToMode = "RenamePane"; # SwitchToMode = "RenamePane";
PaneNameInput = 0; # PaneNameInput = 0;
} # }
] # ]
]; # ];
move = layer [ # move = layer [
[["Ctrl h"] {SwitchToMode = "Normal";}] # [["Ctrl h"] {SwitchToMode = "Normal";}]
[["n" "Tab"] {MovePane = [];}] # [["n" "Tab"] {MovePane = [];}]
[["p"] {MovePaneBackwards = [];}] # [["p"] {MovePaneBackwards = [];}]
[["h" "Left"] {MovePane = "Left";}] # [["h" "Left"] {MovePane = "Left";}]
[["j" "Down"] {MovePane = "Down";}] # [["j" "Down"] {MovePane = "Down";}]
[["k" "Up"] {MovePane = "Up";}] # [["k" "Up"] {MovePane = "Up";}]
[["l" "Right"] {MovePane = "Right";}] # [["l" "Right"] {MovePane = "Right";}]
]; # ];
tab = layer [ # tab = layer [
[["Ctrl t"] {SwitchToMode = "Normal";}] # [["Ctrl t"] {SwitchToMode = "Normal";}]
[ # [
["r"] # ["r"]
{ # {
SwitchToMode = "RenameTab"; # SwitchToMode = "RenameTab";
TabNameInput = 0; # TabNameInput = 0;
} # }
] # ]
[["h" "Left" "Up" "k"] {GoToPreviousTab = [];}] # [["h" "Left" "Up" "k"] {GoToPreviousTab = [];}]
[["l" "Right" "Down" "j"] {GoToNextTab = [];}] # [["l" "Right" "Down" "j"] {GoToNextTab = [];}]
[ # [
["n"] # ["n"]
{ # {
NewTab = []; # NewTab = [];
SwitchToMode = "Normal"; # SwitchToMode = "Normal";
} # }
] # ]
[ # [
["x"] # ["x"]
{ # {
CloseTab = []; # CloseTab = [];
SwitchToMode = "Normal"; # SwitchToMode = "Normal";
} # }
] # ]
[ # [
["s"] # ["s"]
{ # {
ToggleActiveSyncTab = []; # ToggleActiveSyncTab = [];
SwitchToMode = "Normal"; # SwitchToMode = "Normal";
} # }
] # ]
[ # [
["1"] # ["1"]
{ # {
GoToTab = 1; # GoToTab = 1;
SwitchToMode = "Normal"; # SwitchToMode = "Normal";
} # }
] # ]
[ # [
["2"] # ["2"]
{ # {
GoToTab = 2; # GoToTab = 2;
SwitchToMode = "Normal"; # SwitchToMode = "Normal";
} # }
] # ]
[ # [
["3"] # ["3"]
{ # {
GoToTab = 3; # GoToTab = 3;
SwitchToMode = "Normal"; # SwitchToMode = "Normal";
} # }
] # ]
[ # [
["4"] # ["4"]
{ # {
GoToTab = 4; # GoToTab = 4;
SwitchToMode = "Normal"; # SwitchToMode = "Normal";
} # }
] # ]
[ # [
["5"] # ["5"]
{ # {
GoToTab = 5; # GoToTab = 5;
SwitchToMode = "Normal"; # SwitchToMode = "Normal";
} # }
] # ]
[ # [
["6"] # ["6"]
{ # {
GoToTab = 6; # GoToTab = 6;
SwitchToMode = "Normal"; # SwitchToMode = "Normal";
} # }
] # ]
[ # [
["7"] # ["7"]
{ # {
GoToTab = 7; # GoToTab = 7;
SwitchToMode = "Normal"; # SwitchToMode = "Normal";
} # }
] # ]
[ # [
["8"] # ["8"]
{ # {
GoToTab = 8; # GoToTab = 8;
SwitchToMode = "Normal"; # SwitchToMode = "Normal";
} # }
] # ]
[ # [
["9"] # ["9"]
{ # {
GoToTab = 9; # GoToTab = 9;
SwitchToMode = "Normal"; # SwitchToMode = "Normal";
} # }
] # ]
[["Tab"] {ToggleTab = [];}] # [["Tab"] {ToggleTab = [];}]
]; # ];
scroll = layer [ # scroll = layer [
[["Ctrl s"] {SwitchToMode = "Normal";}] # [["Ctrl s"] {SwitchToMode = "Normal";}]
[ # [
["e"] # ["e"]
{ # {
EditScrollback = []; # EditScrollback = [];
SwitchToMode = "Normal"; # SwitchToMode = "Normal";
} # }
] # ]
[ # [
["s"] # ["s"]
{ # {
SwitchToMode = "EnterSearch"; # SwitchToMode = "EnterSearch";
SearchInput = 0; # SearchInput = 0;
} # }
] # ]
[ # [
["Ctrl c"] # ["Ctrl c"]
{ # {
ScrollToBottom = []; # ScrollToBottom = [];
SwitchToMode = "Normal"; # SwitchToMode = "Normal";
} # }
] # ]
[["j" "Down"] {ScrollDown = [];}] # [["j" "Down"] {ScrollDown = [];}]
[["k" "Up"] {ScrollUp = [];}] # [["k" "Up"] {ScrollUp = [];}]
[["Ctrl f" "PageDown" "Right" "l"] {PageScrollDown = [];}] # [["Ctrl f" "PageDown" "Right" "l"] {PageScrollDown = [];}]
[["Ctrl b" "PageUp" "Left" "h"] {PageScrollUp = [];}] # [["Ctrl b" "PageUp" "Left" "h"] {PageScrollUp = [];}]
[["d"] {HalfPageScrollDown = [];}] # [["d"] {HalfPageScrollDown = [];}]
[["u"] {HalfPageScrollUp = [];}] # [["u"] {HalfPageScrollUp = [];}]
# uncomment this and adjust key if using copy_on_select=false # # uncomment this and adjust key if using copy_on_select=false
# bind "Alt c" { Copy; } # # bind "Alt c" { Copy; }
]; # ];
search = layer [ # search = layer [
[["Ctrl s"] {SwitchToMode = "Normal";}] # [["Ctrl s"] {SwitchToMode = "Normal";}]
[ # [
["Ctrl c"] # ["Ctrl c"]
{ # {
ScrollToBottom = []; # ScrollToBottom = [];
SwitchToMode = "Normal"; # SwitchToMode = "Normal";
} # }
] # ]
[["j" "Down"] {ScrollDown = [];}] # [["j" "Down"] {ScrollDown = [];}]
[["k" "Up"] {ScrollUp = [];}] # [["k" "Up"] {ScrollUp = [];}]
[["Ctrl f" "PageDown" "Right" "l"] {PageScrollDown = [];}] # [["Ctrl f" "PageDown" "Right" "l"] {PageScrollDown = [];}]
[["Ctrl b" "PageUp" "Left" "h"] {PageScrollUp = [];}] # [["Ctrl b" "PageUp" "Left" "h"] {PageScrollUp = [];}]
[["d"] {HalfPageScrollDown = [];}] # [["d"] {HalfPageScrollDown = [];}]
[["u"] {HalfPageScrollUp = [];}] # [["u"] {HalfPageScrollUp = [];}]
[["n"] {Search = "down";}] # [["n"] {Search = "down";}]
[["p"] {Search = "up";}] # [["p"] {Search = "up";}]
[["c"] {SearchToggleOption = "CaseSensitivity";}] # [["c"] {SearchToggleOption = "CaseSensitivity";}]
[["w"] {SearchToggleOption = "Wrap";}] # [["w"] {SearchToggleOption = "Wrap";}]
[["o"] {SearchToggleOption = "WholeWord";}] # [["o"] {SearchToggleOption = "WholeWord";}]
]; # ];
entersearch = layer [ # entersearch = layer [
[["Ctrl c" "Esc"] {SwitchToMode = "Scroll";}] # [["Ctrl c" "Esc"] {SwitchToMode = "Scroll";}]
[["Enter"] {SwitchToMode = "Search";}] # [["Enter"] {SwitchToMode = "Search";}]
]; # ];
renametab = layer [ # renametab = layer [
[["Ctrl c"] {SwitchToMode = "Normal";}] # [["Ctrl c"] {SwitchToMode = "Normal";}]
[ # [
["Esc"] # ["Esc"]
{ # {
UndoRenameTab = []; # UndoRenameTab = [];
SwitchToMode = "Tab"; # SwitchToMode = "Tab";
} # }
] # ]
]; # ];
renamepane = layer [ # renamepane = layer [
[["Ctrl c"] {SwitchToMode = "Normal";}] # [["Ctrl c"] {SwitchToMode = "Normal";}]
[ # [
["Esc"] # ["Esc"]
{ # {
UndoRenamePane = []; # UndoRenamePane = [];
SwitchToMode = "Pane"; # SwitchToMode = "Pane";
} # }
] # ]
]; # ];
session = layer [ # session = layer [
[["Ctrl o"] {SwitchToMode = "Normal";}] # [["Ctrl o"] {SwitchToMode = "Normal";}]
[["Ctrl s"] {SwitchToMode = "Scroll";}] # [["Ctrl s"] {SwitchToMode = "Scroll";}]
[["d"] {Detach = [];}] # [["d"] {Detach = [];}]
]; # ];
tmux = layer [ # tmux = layer [
[["["] {SwitchToMode = "Scroll";}] # [["["] {SwitchToMode = "Scroll";}]
[ # [
["Ctrl b"] # ["Ctrl b"]
{ # {
Write = 2; # Write = 2;
SwitchToMode = "Normal"; # SwitchToMode = "Normal";
} # }
] # ]
[ # [
["\\\""] # ["\\\""]
{ # {
NewPane = "Down"; # NewPane = "Down";
SwitchToMode = "Normal"; # SwitchToMode = "Normal";
} # }
] # ]
[ # [
["%"] # ["%"]
{ # {
NewPane = "Right"; # NewPane = "Right";
SwitchToMode = "Normal"; # SwitchToMode = "Normal";
} # }
] # ]
[ # [
["z"] # ["z"]
{ # {
ToggleFocusFullscreen = []; # ToggleFocusFullscreen = [];
SwitchToMode = "Normal"; # SwitchToMode = "Normal";
} # }
] # ]
[ # [
["c"] # ["c"]
{ # {
NewTab = []; # NewTab = [];
SwitchToMode = "Normal"; # SwitchToMode = "Normal";
} # }
] # ]
[[","] {SwitchToMode = "RenameTab";}] # [[","] {SwitchToMode = "RenameTab";}]
[ # [
["p"] # ["p"]
{ # {
GoToPreviousTab = []; # GoToPreviousTab = [];
SwitchToMode = "Normal"; # SwitchToMode = "Normal";
} # }
] # ]
[ # [
["n"] # ["n"]
{ # {
GoToNextTab = []; # GoToNextTab = [];
SwitchToMode = "Normal"; # SwitchToMode = "Normal";
} # }
] # ]
[ # [
["Left"] # ["Left"]
{ # {
MoveFocus = "Left"; # MoveFocus = "Left";
SwitchToMode = "Normal"; # SwitchToMode = "Normal";
} # }
] # ]
[ # [
["Right"] # ["Right"]
{ # {
MoveFocus = "Right"; # MoveFocus = "Right";
SwitchToMode = "Normal"; # SwitchToMode = "Normal";
} # }
] # ]
[ # [
["Down"] # ["Down"]
{ # {
MoveFocus = "Down"; # MoveFocus = "Down";
SwitchToMode = "Normal"; # SwitchToMode = "Normal";
} # }
] # ]
[ # [
["Up"] # ["Up"]
{ # {
MoveFocus = "Up"; # MoveFocus = "Up";
SwitchToMode = "Normal"; # SwitchToMode = "Normal";
} # }
] # ]
[ # [
["h"] # ["h"]
{ # {
MoveFocus = "Left"; # MoveFocus = "Left";
SwitchToMode = "Normal"; # SwitchToMode = "Normal";
} # }
] # ]
[ # [
["l"] # ["l"]
{ # {
MoveFocus = "Right"; # MoveFocus = "Right";
SwitchToMode = "Normal"; # SwitchToMode = "Normal";
} # }
] # ]
[ # [
["j"] # ["j"]
{ # {
MoveFocus = "Down"; # MoveFocus = "Down";
SwitchToMode = "Normal"; # SwitchToMode = "Normal";
} # }
] # ]
[ # [
["k"] # ["k"]
{ # {
MoveFocus = "Up"; # MoveFocus = "Up";
SwitchToMode = "Normal"; # SwitchToMode = "Normal";
} # }
] # ]
[["o"] {FocusNextPane = [];}] # [["o"] {FocusNextPane = [];}]
[["d"] {Detach = [];}] # [["d"] {Detach = [];}]
[["Space"] {NextSwapLayout = [];}] # [["Space"] {NextSwapLayout = [];}]
[ # [
["x"] # ["x"]
{ # {
CloseFocus = []; # CloseFocus = [];
SwitchToMode = "Normal"; # SwitchToMode = "Normal";
} # }
] # ]
]; # ];
"shared_except \"locked\"" = layer [ # "shared_except \"locked\"" = layer [
[["Ctrl g"] {SwitchToMode = "Locked";}] # [["Ctrl g"] {SwitchToMode = "Locked";}]
[["Ctrl q"] {Quit = [];}] # [["Ctrl q"] {Quit = [];}]
[["Alt n"] {NewPane = [];}] # [["Alt n"] {NewPane = [];}]
[["Alt h" "Alt Left"] {MoveFocusOrTab = "Left";}] # [["Alt h" "Alt Left"] {MoveFocusOrTab = "Left";}]
[["Alt l" "Alt Right"] {MoveFocusOrTab = "Right";}] # [["Alt l" "Alt Right"] {MoveFocusOrTab = "Right";}]
[["Alt j" "Alt Down"] {MoveFocus = "Down";}] # [["Alt j" "Alt Down"] {MoveFocus = "Down";}]
[["Alt k" "Alt Up"] {MoveFocus = "Up";}] # [["Alt k" "Alt Up"] {MoveFocus = "Up";}]
[["Alt ]" "Alt +"] {Resize = "Increase";}] # [["Alt ]" "Alt +"] {Resize = "Increase";}]
[["Alt -"] {Resize = "Decrease";}] # [["Alt -"] {Resize = "Decrease";}]
[["Alt ["] {PreviousSwapLayout = [];}] # [["Alt ["] {PreviousSwapLayout = [];}]
[["Alt ]"] {NextSwapLayout = [];}] # [["Alt ]"] {NextSwapLayout = [];}]
]; # ];
"shared_except \"normal\" \"locked\"" = layer [ # "shared_except \"normal\" \"locked\"" = layer [
[["Enter" "Esc"] {SwitchToMode = "Normal";}] # [["Enter" "Esc"] {SwitchToMode = "Normal";}]
]; # ];
"shared_except \"pane\" \"locked\"" = layer [ # "shared_except \"pane\" \"locked\"" = layer [
[["Ctrl p"] {SwitchToMode = "Pane";}] # [["Ctrl p"] {SwitchToMode = "Pane";}]
]; # ];
"shared_except \"resize\" \"locked\"" = layer [ # "shared_except \"resize\" \"locked\"" = layer [
[["Ctrl n"] {SwitchToMode = "Resize";}] # [["Ctrl n"] {SwitchToMode = "Resize";}]
]; # ];
"shared_except \"scroll\" \"locked\"" = layer [ # "shared_except \"scroll\" \"locked\"" = layer [
[["Ctrl s"] {SwitchToMode = "Scroll";}] # [["Ctrl s"] {SwitchToMode = "Scroll";}]
]; # ];
"shared_except \"session\" \"locked\"" = layer [ # "shared_except \"session\" \"locked\"" = layer [
[["Ctrl o"] {SwitchToMode = "Session";}] # [["Ctrl o"] {SwitchToMode = "Session";}]
]; # ];
"shared_except \"tab\" \"locked\"" = layer [ # "shared_except \"tab\" \"locked\"" = layer [
[["Ctrl t"] {SwitchToMode = "Tab";}] # [["Ctrl t"] {SwitchToMode = "Tab";}]
]; # ];
"shared_except \"move\" \"locked\"" = layer [ # "shared_except \"move\" \"locked\"" = layer [
[["Ctrl h"] {SwitchToMode = "Move";}] # [["Ctrl h"] {SwitchToMode = "Move";}]
]; # ];
"shared_except \"tmux\" \"locked\"" = layer [ # "shared_except \"tmux\" \"locked\"" = layer [
[["Ctrl b"] {SwitchToMode = "Tmux";}] # [["Ctrl b"] {SwitchToMode = "Tmux";}]
]; # ];
}; # };
default_layout = "compact"; # default_layout = "compact";
theme = "match"; theme = "match";
themes = { themes = {
@ -1877,13 +1877,6 @@
}; };
# TODO: port config # TODO: port config
plugins = {
/*
tab-bar = {path = "tab-bar";};
compact-bar = {path = "compact-bar";};
*/
};
ui = { ui = {
pane_frames = { pane_frames = {
rounded_corners = true; rounded_corners = true;