diff --git a/hosts/dunamis/users/user/programs.nix b/hosts/dunamis/users/user/programs.nix index e5744c8..639a49c 100644 --- a/hosts/dunamis/users/user/programs.nix +++ b/hosts/dunamis/users/user/programs.nix @@ -1,5 +1,5 @@ {pkgs, ...}: { - console.joshuto.enable = true; + console.yazi.enable = true; editor.helix.enable = true; shell = { fish.enable = true; diff --git a/modules/home/programs/console/yazi.nix b/modules/home/programs/console/yazi.nix index 8487a4b..01a2173 100644 --- a/modules/home/programs/console/yazi.nix +++ b/modules/home/programs/console/yazi.nix @@ -3,8 +3,8 @@ config, lib, ... -}: -with lib; let +}: let + inherit (lib) mkIf mkEnableOption getExe; cfg = config.console.yazi; in { options = { @@ -15,6 +15,7 @@ in { programs.yazi = { enable = true; # file manager in rust enableNushellIntegration = true; + shellWrapperName = "y"; settings = { opener = { open = [ @@ -33,7 +34,7 @@ in { ]; dragdrop = [ { - run = "${pkgs.ripdrag}/bin/ripdrag \"$@\""; + run = "${getExe pkgs.ripdrag} -ab \"$@\""; desc = "Drag'n'drop"; orphan = true; for = "unix"; @@ -45,10 +46,46 @@ in { mime = "text/*"; use = ["edit" "open" "dragdrop"]; } + { + name = "*.json"; + use = ["edit" "open" "dragdrop"]; + } + { + name = "*.yaml"; + use = ["edit" "open" "dragdrop"]; + } + { + name = "*.yml"; + use = ["edit" "open" "dragdrop"]; + } { name = "*.toml"; use = ["edit" "open" "dragdrop"]; } + { + name = "*.sh"; + use = ["edit" "open" "dragdrop"]; + } + { + name = "*.ini"; + use = ["edit" "open" "dragdrop"]; + } + { + name = "*.conf"; + use = ["edit" "open" "dragdrop"]; + } + { + name = "*.csv"; + use = ["edit" "open" "dragdrop"]; + } + { + name = "*.go"; + use = ["edit" "open" "dragdrop"]; + } + { + name = "*.html"; + use = ["edit" "open" "dragdrop"]; + } { name = "*.c"; use = ["edit" "open" "dragdrop"]; @@ -62,11 +99,11 @@ in { use = ["edit" "open" "dragdrop"]; } { - name = "*.py"; + name = "*.nix"; use = ["edit" "open" "dragdrop"]; } { - name = "*.json"; + name = "*.py"; use = ["edit" "open" "dragdrop"]; } { @@ -75,14 +112,6 @@ in { } ]; }; - keymap = { - manager.append_keymap = [ - { - on = [""]; - run = ''shell '${pkgs.ripdrag}/bin/ripdrag -x "$@"' --confirm''; - } - ]; - }; }; }; }