Skip to content

Commit 32f69a2

Browse files
refactor(home/file-manager): rm lib.mkMerge
1 parent f826cc8 commit 32f69a2

File tree

1 file changed

+31
-39
lines changed

1 file changed

+31
-39
lines changed

modules/home/file-manager.nix

Lines changed: 31 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -25,50 +25,42 @@ in
2525
];
2626
};
2727

28-
programs.yazi = lib.mkMerge [
29-
{
30-
enable = true;
31-
package = pkgs.yazi.override {
32-
optionalDeps = [ pkgs.p7zip ];
33-
};
28+
programs.yazi = {
29+
enable = true;
30+
shellWrapperName = "y";
31+
package = pkgs.yazi.override {
32+
optionalDeps = [ pkgs.p7zip ] ++ (lib.lists.optional my.gui.enable pkgs.ripdrag);
33+
};
3434

35-
shellWrapperName = "y";
35+
settings = {
36+
mgr.linemode = "mtime";
3637

37-
settings = {
38-
mgr.linemode = "mtime";
39-
40-
opener.edit = [
41-
{
42-
run = ''${config.my.programs.editor.command} "$@"'';
43-
block = true;
44-
}
45-
];
46-
47-
open.prepend_rules = [
48-
{
49-
mime = "{audio,video}/*";
50-
use = [
51-
"open"
52-
"reveal"
53-
];
54-
}
55-
];
56-
};
57-
}
38+
opener.edit = [
39+
{
40+
run = ''${config.my.programs.editor.command} "$@"'';
41+
block = true;
42+
}
43+
];
5844

59-
(lib.mkIf my.gui.enable {
60-
extraPackages = [ pkgs.ripdrag ];
61-
keymap.mgr.prepend_keymap = [
45+
open.prepend_rules = [
6246
{
63-
on = "<C-n>";
64-
run = # sh
65-
''
66-
shell 'ripdrag "$@" -x 2>/dev/null &' --confirm
67-
'';
68-
desc = "Drag and drop using ripdrag";
47+
mime = "{audio,video}/*";
48+
use = [
49+
"open"
50+
"reveal"
51+
];
6952
}
7053
];
71-
})
72-
];
54+
};
55+
56+
keymap.mgr.prepend_keymap = lib.lists.optional my.gui.enable {
57+
on = "<C-n>";
58+
run = # sh
59+
''
60+
shell 'ripdrag "$@" -x 2>/dev/null &' --confirm
61+
'';
62+
desc = "Drag and drop using ripdrag";
63+
};
64+
};
7365
};
7466
}

0 commit comments

Comments
 (0)