diff --git a/instances/odin/hm.nix b/instances/odin/hm.nix index f4ebe08..39eb737 100644 --- a/instances/odin/hm.nix +++ b/instances/odin/hm.nix @@ -147,6 +147,7 @@ ../../modules/hm/webapp.nix ../../modules/hm/xidlehook.nix ../../modules/hm/xresources.nix + ../../modules/hm/yazi.nix ../../modules/hm/zathura.nix ../../modules/hm/zellij.nix ]; diff --git a/instances/thor/hm.nix b/instances/thor/hm.nix index 0f7de1e..caab83f 100644 --- a/instances/thor/hm.nix +++ b/instances/thor/hm.nix @@ -139,6 +139,7 @@ ../../modules/hm/xidlehook.nix ../../modules/hm/xresources.nix ../../modules/hm/zathura.nix + ../../modules/hm/yazi.nix ../../modules/hm/zellij.nix ]; diff --git a/modules/hm/hyprland.nix b/modules/hm/hyprland.nix index e3e4d3d..fda19ce 100644 --- a/modules/hm/hyprland.nix +++ b/modules/hm/hyprland.nix @@ -2,10 +2,10 @@ imports = [ ./kitty.nix + ./nautilus.nix ./nemo.nix ./terminator.nix ./wl_update_background.nix - ./yazi.nix ]; home.packages = builtins.attrValues { inherit (pkgs) blueman brillo gamescope grim networkmanagerapplet pamixer playerctl slurp swaylock swww way-lockscreen waybar wl-clipboard wl-clipedit wlogout wofi wofi-emoji xdg-desktop-portal-gtk; }; @@ -15,14 +15,6 @@ xdg.configFile."hypr/hyprland.conf".text = let strPalette = pkgs.lib.nix-rice.palette.toRgbaShortHex pkgs.rice.colorPalette; - ya = pkgs.writeShellScript "ya" '' - tmp="$(mktemp -t "yazi-cwd.XXXXX")" - yazi --cwd-file="$tmp" - if cwd="$(cat -- "$tmp")" && [ -n "$cwd" ] && [ "$cwd" != "$PWD" ]; then - cd -- "$cwd" - fi - rm -f -- "$tmp" - ''; in '' ######################################################################################## @@ -168,7 +160,7 @@ bind = SUPER, W, killactive, bind = SUPER, M, exec, way-lockscreen bind = SUPER_ALT_L, Q, exit, - bind = SUPER, E, exec, kitty -e bash ${ya} + bind = SUPER, E, exec, nautilus bind = SUPER_SHIFT, E, exec, nemo bind = SUPER, V, togglefloating, bind = SUPER_SHIFT, SPACE, exec, wofi --show run --allow-images -D key_expand=Tab -M=fuzzy -i