muon/flake
1
0
Fork 0
mirror of https://codeberg.org/muon/home.git synced 2025-12-06 08:07:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update layout

Browse source
This commit is contained in:
muon 2025-09-27 09:54:25 +00:00
parent fe2c22214e
commit c859f074e5
5 changed files with 56 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

21
modules/home/terminal/development.nix
View file

@ -4,7 +4,11 @@
config,
inputs,
...
}: {
}: let
zellij-muon = pkgs.zellij.overrideAttrs (previousAttrs: {
patches = previousAttrs.patches ++ [./zellij/floating_fix.patch];
});
in {
options.mods.terminal.development.enable =
lib.mkEnableOption "enables cli editor";
@ -40,7 +44,7 @@
show_release_notes._args = [false];
};
extraConfig = builtins.readFile ./zellij.kdl;
extraConfig = builtins.readFile ./zellij/config.kdl;
layouts = {
dev = {
@ -61,7 +65,7 @@
{"children" = {};}
{
pane = {
size = 2;
size = 1;
borderless = true;
plugin = {
location = "zellij:status-bar";
@ -74,13 +78,14 @@
{
tab = {
_props = {
name = "Project";
name = "project";
focus = true;
};
_children = [
{
pane = {
command = "nvim";
command = "zsh";
args = ["-c" "nvim"];
};
}
];
@ -89,7 +94,7 @@
{
tab = {
_props = {
name = "Run";
name = "test";
};
_children = [
{
@ -103,12 +108,12 @@
{
tab = {
_props = {
name = "Test";
name = "git";
};
_children = [
{
pane = {
command = "zsh";
command = "lazygit";
};
}
];

0
modules/home/terminal/zellij.kdl → modules/home/terminal/zellij/config.kdl
View file

32
modules/home/terminal/zellij/floating_fix.patch Normal file
View file

@ -0,0 +1,32 @@
diff --git a/zellij-utils/src/kdl/kdl_layout_parser.rs b/zellij-utils/src/kdl/kdl_layout_parser.rs
index c38c0146..d44440a7 100644
--- a/zellij-utils/src/kdl/kdl_layout_parser.rs
+++ b/zellij-utils/src/kdl/kdl_layout_parser.rs
@@ -1607,6 +1607,10 @@ impl<'a> KdlLayoutParser<'a> {
floating_pane.add_cwd_to_layout(&cwd_prefix);
}
}
+ // hide_floating_panes on the tab_layout takes precedence over the hide_floating_panes on the tab_template
+ tab_layout.hide_floating_panes =
+ kdl_get_bool_property_or_child_value!(kdl_node, "hide_floating_panes")
+ .unwrap_or(tab_layout.hide_floating_panes);
tab_layout.external_children_index = None;
Ok((
is_focused,
@@ -1671,6 +1675,8 @@ impl<'a> KdlLayoutParser<'a> {
let mut tab_floating_children = vec![];
let mut external_children_index = None;
let mut children_index_offset = 0;
+ let hide_floating_panes =
+ kdl_get_bool_property_or_child_value!(kdl_node, "hide_floating_panes").unwrap_or(false);
let is_part_of_stack = false;
if let Some(children) = kdl_children_nodes!(kdl_node) {
for (i, child) in children.iter().enumerate() {
@@ -1721,6 +1727,7 @@ impl<'a> KdlLayoutParser<'a> {
children_split_direction,
children: tab_children,
external_children_index,
+ hide_floating_panes,
..Default::default()
},
tab_floating_children,