This commit is contained in:
Leon Schwarzäugl 2025-11-18 17:08:23 +01:00 committed by Leon Schwarzäugl
parent 6abf5ce39b
commit 46f2ec8b96
4 changed files with 124 additions and 358 deletions

View file

@ -7346,21 +7346,18 @@ lspci -k -d 14c3:0616
];
services = {
unlock-luks = {
description = "Unlock LUKS encrypted root device";
wantedBy = [ "initrd.target" ];
after = [ "network-online.target" ];
before = [ "sysroot.mount" ];
after = [ "network.target" ];
before = [ "systemd-cryptsetup@cryptroot.service" ];
path = [ "/bin" ];
# Configure how the service behaves
serviceConfig = {
Type = "oneshot";
RemainAfterExit = true;
};
# The actual commands to unlock the drive
script = ''
echo "systemctl default >> /root/.profile"
echo "systemctl default" >> /root/.profile
'';
};
};
@ -13684,24 +13681,12 @@ Currently I only use it as before with =initExtra= though.
status-bar.path = "status-bar";
strider.path = "strider";
compact-bar.path = "compact-bar";
# configuration.path = "configuration";
# filepicker.path = "strider";
# plugin-manager.path = "plugin-manager";
# session-manager.path = "session-manager";
# welcome-screen.path = "session-manager";
};
# configuration = {
# _props.location = "zellij:configuration";
# };
# filepicker = {
# _props.location = "zellij:strider";
# cwd = "/";
# };
# plugin-manager = {
# _props.location = "zellij:plugin-manager";
# };
# session-manager = {
# _props.location = "zellij:session-manager";
# };
# welcome-screen = {
# _props.location = "zellij:session-manager";
# welcome_screen = true;
# };
};
};
@ -13739,6 +13724,12 @@ Currently I only use it as before with =initExtra= though.
pane = {
_children = [
{
bind = {
_args = [ "Ctrl p" ];
_children = [{ SwitchToMode._args = [ "normal" ]; }];
};
}
{
bind = {
_args = [ "left" ];
@ -13765,11 +13756,26 @@ Currently I only use it as before with =initExtra= though.
}
{
bind = {
_args = [ "c" ];
_children = [
{ SwitchToMode._args = [ "renamepane" ]; }
{ PaneNameInput._args = [ 0 ]; }
];
_args = [ "h" ];
_children = [{ MoveFocus._args = [ "left" ]; }];
};
}
{
bind = {
_args = [ "j" ];
_children = [{ MoveFocus._args = [ "down" ]; }];
};
}
{
bind = {
_args = [ "k" ];
_children = [{ MoveFocus._args = [ "up" ]; }];
};
}
{
bind = {
_args = [ "l" ];
_children = [{ MoveFocus._args = [ "right" ]; }];
};
}
{
@ -13799,30 +13805,6 @@ Currently I only use it as before with =initExtra= though.
];
};
}
{
bind = {
_args = [ "h" ];
_children = [{ MoveFocus._args = [ "left" ]; }];
};
}
{
bind = {
_args = [ "j" ];
_children = [{ MoveFocus._args = [ "down" ]; }];
};
}
{
bind = {
_args = [ "k" ];
_children = [{ MoveFocus._args = [ "up" ]; }];
};
}
{
bind = {
_args = [ "l" ];
_children = [{ MoveFocus._args = [ "right" ]; }];
};
}
{
bind = {
_args = [ "n" ];
@ -13840,42 +13822,24 @@ Currently I only use it as before with =initExtra= though.
}
{
bind = {
_args = [ "Ctrl p" ];
_children = [{ SwitchToMode._args = [ "normal" ]; }];
};
}
{
bind = {
_args = [ "r" ];
_children = [
{ NewPane._args = [ "right" ]; }
{ SwitchToMode._args = [ "normal" ]; }
];
};
}
{
bind = {
_args = [ "w" ];
_args = [ "f12" ];
_children = [
{ ToggleFloatingPanes = { }; }
{ SwitchToMode._args = [ "normal" ]; }
];
};
}
{
bind = {
_args = [ "z" ];
_children = [
{ TogglePaneFrames = { }; }
{ SwitchToMode._args = [ "normal" ]; }
];
};
}
];
};
tab = {
_children = [
{
bind = {
_args = [ "Ctrl t" ];
_children = [{ SwitchToMode._args = [ "normal" ]; }];
};
}
{
bind = {
_args = [ "left" ];
@ -13981,33 +13945,6 @@ Currently I only use it as before with =initExtra= though.
];
};
}
{
bind = {
_args = [ "[" ];
_children = [
{ BreakPaneLeft = { }; }
{ SwitchToMode._args = [ "normal" ]; }
];
};
}
{
bind = {
_args = [ "]" ];
_children = [
{ BreakPaneRight = { }; }
{ SwitchToMode._args = [ "normal" ]; }
];
};
}
{
bind = {
_args = [ "b" ];
_children = [
{ BreakPane = { }; }
{ SwitchToMode._args = [ "normal" ]; }
];
};
}
{
bind = {
_args = [ "h" ];
@ -14059,12 +13996,6 @@ Currently I only use it as before with =initExtra= though.
];
};
}
{
bind = {
_args = [ "Ctrl t" ];
_children = [{ SwitchToMode._args = [ "normal" ]; }];
};
}
{
bind = {
_args = [ "x" ];
@ -14074,17 +14005,17 @@ Currently I only use it as before with =initExtra= though.
];
};
}
{
bind = {
_args = [ "tab" ];
_children = [{ ToggleTab = { }; }];
};
}
];
};
resize = {
_children = [
{
bind = {
_args = [ "Ctrl n" ];
_children = [{ SwitchToMode._args = [ "normal" ]; }];
};
}
{
bind = {
_args = [ "left" ];
@ -14175,17 +14106,17 @@ Currently I only use it as before with =initExtra= though.
_children = [{ Resize._args = [ "Increase right" ]; }];
};
}
{
bind = {
_args = [ "Ctrl n" ];
_children = [{ SwitchToMode._args = [ "normal" ]; }];
};
}
];
};
move = {
_children = [
{
bind = {
_args = [ "Ctrl h" ];
_children = [{ SwitchToMode._args = [ "normal" ]; }];
};
}
{
bind = {
_args = [ "left" ];
@ -14216,12 +14147,6 @@ Currently I only use it as before with =initExtra= though.
_children = [{ MovePane._args = [ "left" ]; }];
};
}
{
bind = {
_args = [ "Ctrl h" ];
_children = [{ SwitchToMode._args = [ "normal" ]; }];
};
}
{
bind = {
_args = [ "j" ];
@ -14240,24 +14165,6 @@ Currently I only use it as before with =initExtra= though.
_children = [{ MovePane._args = [ "right" ]; }];
};
}
{
bind = {
_args = [ "n" ];
_children = [{ MovePane = { }; }];
};
}
{
bind = {
_args = [ "p" ];
_children = [{ MovePaneBackwards = { }; }];
};
}
{
bind = {
_args = [ "tab" ];
_children = [{ MovePane = { }; }];
};
}
];
};
@ -14321,6 +14228,12 @@ Currently I only use it as before with =initExtra= though.
session = {
_children = [
{
bind = {
_args = [ "Ctrl o" ];
_children = [{ SwitchToMode._args = [ "normal" ]; }];
};
}
{
bind = {
_args = [ "c" ];
@ -14336,12 +14249,6 @@ Currently I only use it as before with =initExtra= though.
];
};
}
{
bind = {
_args = [ "Ctrl o" ];
_children = [{ SwitchToMode._args = [ "normal" ]; }];
};
}
{
bind = {
_args = [ "p" ];
@ -14419,18 +14326,6 @@ Currently I only use it as before with =initExtra= though.
_children = [{ Resize._args = [ "Increase" ]; }];
};
}
{
bind = {
_args = [ "Alt [" ];
_children = [{ PreviousSwapLayout = { }; }];
};
}
{
bind = {
_args = [ "Alt ]" ];
_children = [{ NextSwapLayout = { }; }];
};
}
{
bind = {
_args = [ "Alt f" ];
@ -14469,26 +14364,14 @@ Currently I only use it as before with =initExtra= though.
}
{
bind = {
_args = [ "Alt l" ];
_children = [{ MoveFocusOrTab._args = [ "right" ]; }];
};
}
{
bind = {
_args = [ "Alt n" ];
_args = [ "Alt p" ];
_children = [{ NewPane = { }; }];
};
}
{
bind = {
_args = [ "Alt o" ];
_children = [{ MoveTab._args = [ "right" ]; }];
};
}
{
bind = {
_args = [ "Ctrl q" ];
_children = [{ Quit = { }; }];
_args = [ "Alt n" ];
_children = [{ NewTab = { }; }];
};
}
];

View file

@ -18,6 +18,12 @@
pane = {
_children = [
{
bind = {
_args = [ "Ctrl p" ];
_children = [{ SwitchToMode._args = [ "normal" ]; }];
};
}
{
bind = {
_args = [ "left" ];
@ -44,11 +50,26 @@
}
{
bind = {
_args = [ "c" ];
_children = [
{ SwitchToMode._args = [ "renamepane" ]; }
{ PaneNameInput._args = [ 0 ]; }
];
_args = [ "h" ];
_children = [{ MoveFocus._args = [ "left" ]; }];
};
}
{
bind = {
_args = [ "j" ];
_children = [{ MoveFocus._args = [ "down" ]; }];
};
}
{
bind = {
_args = [ "k" ];
_children = [{ MoveFocus._args = [ "up" ]; }];
};
}
{
bind = {
_args = [ "l" ];
_children = [{ MoveFocus._args = [ "right" ]; }];
};
}
{
@ -78,30 +99,6 @@
];
};
}
{
bind = {
_args = [ "h" ];
_children = [{ MoveFocus._args = [ "left" ]; }];
};
}
{
bind = {
_args = [ "j" ];
_children = [{ MoveFocus._args = [ "down" ]; }];
};
}
{
bind = {
_args = [ "k" ];
_children = [{ MoveFocus._args = [ "up" ]; }];
};
}
{
bind = {
_args = [ "l" ];
_children = [{ MoveFocus._args = [ "right" ]; }];
};
}
{
bind = {
_args = [ "n" ];
@ -119,42 +116,24 @@
}
{
bind = {
_args = [ "Ctrl p" ];
_children = [{ SwitchToMode._args = [ "normal" ]; }];
};
}
{
bind = {
_args = [ "r" ];
_children = [
{ NewPane._args = [ "right" ]; }
{ SwitchToMode._args = [ "normal" ]; }
];
};
}
{
bind = {
_args = [ "w" ];
_args = [ "f12" ];
_children = [
{ ToggleFloatingPanes = { }; }
{ SwitchToMode._args = [ "normal" ]; }
];
};
}
{
bind = {
_args = [ "z" ];
_children = [
{ TogglePaneFrames = { }; }
{ SwitchToMode._args = [ "normal" ]; }
];
};
}
];
};
tab = {
_children = [
{
bind = {
_args = [ "Ctrl t" ];
_children = [{ SwitchToMode._args = [ "normal" ]; }];
};
}
{
bind = {
_args = [ "left" ];
@ -260,33 +239,6 @@
];
};
}
{
bind = {
_args = [ "[" ];
_children = [
{ BreakPaneLeft = { }; }
{ SwitchToMode._args = [ "normal" ]; }
];
};
}
{
bind = {
_args = [ "]" ];
_children = [
{ BreakPaneRight = { }; }
{ SwitchToMode._args = [ "normal" ]; }
];
};
}
{
bind = {
_args = [ "b" ];
_children = [
{ BreakPane = { }; }
{ SwitchToMode._args = [ "normal" ]; }
];
};
}
{
bind = {
_args = [ "h" ];
@ -338,12 +290,6 @@
];
};
}
{
bind = {
_args = [ "Ctrl t" ];
_children = [{ SwitchToMode._args = [ "normal" ]; }];
};
}
{
bind = {
_args = [ "x" ];
@ -353,17 +299,17 @@
];
};
}
{
bind = {
_args = [ "tab" ];
_children = [{ ToggleTab = { }; }];
};
}
];
};
resize = {
_children = [
{
bind = {
_args = [ "Ctrl n" ];
_children = [{ SwitchToMode._args = [ "normal" ]; }];
};
}
{
bind = {
_args = [ "left" ];
@ -454,17 +400,17 @@
_children = [{ Resize._args = [ "Increase right" ]; }];
};
}
{
bind = {
_args = [ "Ctrl n" ];
_children = [{ SwitchToMode._args = [ "normal" ]; }];
};
}
];
};
move = {
_children = [
{
bind = {
_args = [ "Ctrl h" ];
_children = [{ SwitchToMode._args = [ "normal" ]; }];
};
}
{
bind = {
_args = [ "left" ];
@ -495,12 +441,6 @@
_children = [{ MovePane._args = [ "left" ]; }];
};
}
{
bind = {
_args = [ "Ctrl h" ];
_children = [{ SwitchToMode._args = [ "normal" ]; }];
};
}
{
bind = {
_args = [ "j" ];
@ -519,24 +459,6 @@
_children = [{ MovePane._args = [ "right" ]; }];
};
}
{
bind = {
_args = [ "n" ];
_children = [{ MovePane = { }; }];
};
}
{
bind = {
_args = [ "p" ];
_children = [{ MovePaneBackwards = { }; }];
};
}
{
bind = {
_args = [ "tab" ];
_children = [{ MovePane = { }; }];
};
}
];
};
@ -600,6 +522,12 @@
session = {
_children = [
{
bind = {
_args = [ "Ctrl o" ];
_children = [{ SwitchToMode._args = [ "normal" ]; }];
};
}
{
bind = {
_args = [ "c" ];
@ -615,12 +543,6 @@
];
};
}
{
bind = {
_args = [ "Ctrl o" ];
_children = [{ SwitchToMode._args = [ "normal" ]; }];
};
}
{
bind = {
_args = [ "p" ];
@ -698,18 +620,6 @@
_children = [{ Resize._args = [ "Increase" ]; }];
};
}
{
bind = {
_args = [ "Alt [" ];
_children = [{ PreviousSwapLayout = { }; }];
};
}
{
bind = {
_args = [ "Alt ]" ];
_children = [{ NextSwapLayout = { }; }];
};
}
{
bind = {
_args = [ "Alt f" ];
@ -748,26 +658,14 @@
}
{
bind = {
_args = [ "Alt l" ];
_children = [{ MoveFocusOrTab._args = [ "right" ]; }];
};
}
{
bind = {
_args = [ "Alt n" ];
_args = [ "Alt p" ];
_children = [{ NewPane = { }; }];
};
}
{
bind = {
_args = [ "Alt o" ];
_children = [{ MoveTab._args = [ "right" ]; }];
};
}
{
bind = {
_args = [ "Ctrl q" ];
_children = [{ Quit = { }; }];
_args = [ "Alt n" ];
_children = [{ NewTab = { }; }];
};
}
];

View file

@ -35,24 +35,12 @@
status-bar.path = "status-bar";
strider.path = "strider";
compact-bar.path = "compact-bar";
# configuration.path = "configuration";
# filepicker.path = "strider";
# plugin-manager.path = "plugin-manager";
# session-manager.path = "session-manager";
# welcome-screen.path = "session-manager";
};
# configuration = {
# _props.location = "zellij:configuration";
# };
# filepicker = {
# _props.location = "zellij:strider";
# cwd = "/";
# };
# plugin-manager = {
# _props.location = "zellij:plugin-manager";
# };
# session-manager = {
# _props.location = "zellij:session-manager";
# };
# welcome-screen = {
# _props.location = "zellij:session-manager";
# welcome_screen = true;
# };
};
};

View file

@ -54,21 +54,18 @@ in
];
services = {
unlock-luks = {
description = "Unlock LUKS encrypted root device";
wantedBy = [ "initrd.target" ];
after = [ "network-online.target" ];
before = [ "sysroot.mount" ];
after = [ "network.target" ];
before = [ "systemd-cryptsetup@cryptroot.service" ];
path = [ "/bin" ];
# Configure how the service behaves
serviceConfig = {
Type = "oneshot";
RemainAfterExit = true;
};
# The actual commands to unlock the drive
script = ''
echo "systemctl default >> /root/.profile"
echo "systemctl default" >> /root/.profile
'';
};
};