From 9fb223704e03f2dfa8d529b2f0fedbd8a526929b Mon Sep 17 00:00:00 2001 From: Matt Nish-Lapidus Date: Mon, 5 May 2025 11:13:21 -0400 Subject: [PATCH] cleanup and fixing yazi plugins --- flake.lock | 75 +++++++------------ flake.nix | 8 +- hosts/eddie/configuration.nix | 14 ++-- modules/home/shell-conf.nix | 2 +- modules/home/waybar.nix | 2 +- modules/home/yazi.nix | 7 +- modules/home/yazi/init.lua | 4 + .../yazi/plugins/smart-paste.yazi/main.lua | 13 ---- 8 files changed, 47 insertions(+), 78 deletions(-) delete mode 100644 modules/home/yazi/plugins/smart-paste.yazi/main.lua diff --git a/flake.lock b/flake.lock index 161345c..886ad40 100644 --- a/flake.lock +++ b/flake.lock @@ -30,11 +30,11 @@ ] }, "locked": { - "lastModified": 1745812220, - "narHash": "sha256-hotBG0EJ9VmAHJYF0yhWuTVZpENHvwcJ2SxvIPrXm+g=", + "lastModified": 1746411114, + "narHash": "sha256-mLlkVX1kKbAa/Ns5u26wDYw4YW4ziMFM21fhtRmfirU=", "owner": "nix-community", "repo": "disko", - "rev": "d0c543d740fad42fe2c035b43c9d41127e073c78", + "rev": "b5d1320ebc2f34dbea4655f95167f55e2130cdb3", "type": "github" }, "original": { @@ -90,11 +90,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1746375743, - "narHash": "sha256-8Vv393fOQ4/oo7gmoAvziIMvtJqXH9oIyjMZ6Hx+P44=", + "lastModified": 1746437045, + "narHash": "sha256-eoByZKfU87P0DD6Uc0sDrfJK+tAE+CnBmZNtMmtERJE=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "a281243eaec6ac810584f2a73126e8dd48c3a15e", + "rev": "fc120cc0265ef5e255d87ae4b4408c355d79fa30", "type": "github" }, "original": { @@ -378,11 +378,11 @@ ] }, "locked": { - "lastModified": 1746369725, - "narHash": "sha256-m3ai7LLFYsymMK0uVywCceWfUhP0k3CALyFOfcJACqE=", + "lastModified": 1746413188, + "narHash": "sha256-i6BoiQP0PasExESQHszC0reQHfO6D4aI2GzOwZMOI20=", "owner": "nix-community", "repo": "home-manager", - "rev": "1a1793f6d940d22c6e49753548c5b6cb7dc5545d", + "rev": "8a318641ac13d3bc0a53651feaee9560f9b2d89a", "type": "github" }, "original": { @@ -653,26 +653,6 @@ "type": "github" } }, - "impala": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1739828115, - "narHash": "sha256-a7IgIGkXcWX81nFcoQ3Q/lbBdBpoD60EMxwuTj/JqJU=", - "owner": "pythops", - "repo": "impala", - "rev": "008b36f6b650a694f08f0d83fc8a109c33395533", - "type": "github" - }, - "original": { - "owner": "pythops", - "repo": "impala", - "type": "github" - } - }, "isd": { "inputs": { "nix-appimage": "nix-appimage", @@ -760,11 +740,11 @@ ] }, "locked": { - "lastModified": 1746032033, - "narHash": "sha256-BCD0tfDNlQHFM75THRtXM3GegMg/KbREsYllg7Az9ao=", + "lastModified": 1746442382, + "narHash": "sha256-lFUHQdnDqnXXzigQn6Kd4aVrDDjg80HAb7DfThQNC/I=", "owner": "viperML", "repo": "nh", - "rev": "894bb7ebf3adb58f76d1f7d9f6b33f58758d40f0", + "rev": "4eb1941c2e30f3dabbf24619c7ca7303c448983d", "type": "github" }, "original": { @@ -930,11 +910,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1746341346, - "narHash": "sha256-WjupK5Xpc+viJlJWiyPHp/dF4aJItp1BPuFsEdv2/fI=", + "lastModified": 1746427242, + "narHash": "sha256-KvZ6G5sdBdcrglsqcOx8BT6NpHVMVHc8wssMRhv/+1g=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "0833dc8bbc4ffa9cf9b0cbfccf1c5ec8632fc66e", + "rev": "a4bb30a9000cf0444ecc8fdca8096d072f77f9e8", "type": "github" }, "original": { @@ -988,11 +968,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1746183838, - "narHash": "sha256-kwaaguGkAqTZ1oK0yXeQ3ayYjs8u/W7eEfrFpFfIDFA=", + "lastModified": 1746301764, + "narHash": "sha256-5odz+NZszRya//Zd0P8h+sIwOnV35qJi+73f4I+iv1M=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "bf3287dac860542719fe7554e21e686108716879", + "rev": "537ee98218704e21ea465251de512ab6bbb9012e", "type": "github" }, "original": { @@ -1036,11 +1016,11 @@ }, "nixpkgs-stable_4": { "locked": { - "lastModified": 1746183838, - "narHash": "sha256-kwaaguGkAqTZ1oK0yXeQ3ayYjs8u/W7eEfrFpFfIDFA=", + "lastModified": 1746422338, + "narHash": "sha256-NTtKOTLQv6dPfRe00OGSywg37A1FYqldS6xiNmqBUYc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "bf3287dac860542719fe7554e21e686108716879", + "rev": "5b35d248e9206c1f3baf8de6a7683fee126364aa", "type": "github" }, "original": { @@ -1084,11 +1064,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1746232882, - "narHash": "sha256-MHmBH2rS8KkRRdoU/feC/dKbdlMkcNkB5mwkuipVHeQ=", + "lastModified": 1746328495, + "narHash": "sha256-uKCfuDs7ZM3QpCE/jnfubTg459CnKnJG/LwqEVEdEiw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "7a2622e2c0dbad5c4493cb268aba12896e28b008", + "rev": "979daf34c8cacebcd917d540070b52a3c2b9b16e", "type": "github" }, "original": { @@ -1193,7 +1173,6 @@ "home-manager": "home-manager", "hypridle": "hypridle", "hyprlock": "hyprlock", - "impala": "impala", "isd": "isd", "musnix": "musnix", "nh": "nh", @@ -1608,11 +1587,11 @@ "rust-overlay": "rust-overlay_3" }, "locked": { - "lastModified": 1746379089, - "narHash": "sha256-JRwPB7Ur2/jfNFyrPcdVc4hzKrdKsAPAb9hADPYgLg4=", + "lastModified": 1746432685, + "narHash": "sha256-hvdf+4gfQ3joNEx/xXhptHQVPkGDHcpBgXipun8bfbQ=", "owner": "sxyazi", "repo": "yazi", - "rev": "c53865788a5ec08e10d8785343481af16d24fb05", + "rev": "db609517835cc56e25920fde60a9f9e91a8b0648", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index c80ceb2..98ac957 100644 --- a/flake.nix +++ b/flake.nix @@ -98,10 +98,10 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - impala = { - url = "github:pythops/impala"; - inputs.nixpkgs.follows = "nixpkgs"; - }; + # impala = { + # url = "github:pythops/impala"; + # inputs.nixpkgs.follows = "nixpkgs"; + # }; # emenel-templates.url = "git+ssh://git@gt.emenel.ca/emenel/nix-flake-templates"; # nix-way-templates.url = "github:the-nix-way/dev-templates"; diff --git a/hosts/eddie/configuration.nix b/hosts/eddie/configuration.nix index d3eeb37..1222479 100644 --- a/hosts/eddie/configuration.nix +++ b/hosts/eddie/configuration.nix @@ -363,15 +363,15 @@ "2620:fe::fe" "2620:fe::9" ]; - wireless.iwd = { - enable = true; - }; + # wireless.iwd = { + # enable = true; + # }; networkmanager = { enable = true; - wifi = { - powersave = true; - backend = "iwd"; - }; + # wifi = { + # powersave = true; + # backend = "iwd"; + # }; }; }; diff --git a/modules/home/shell-conf.nix b/modules/home/shell-conf.nix index 9294b2f..ed0f64b 100644 --- a/modules/home/shell-conf.nix +++ b/modules/home/shell-conf.nix @@ -4,7 +4,7 @@ home.packages = with pkgs; [ inputs.isd.packages.x86_64-linux.default - inputs.impala.packages.x86_64-linux.default + # inputs.impala.packages.x86_64-linux.default cmake cmake-format diff --git a/modules/home/waybar.nix b/modules/home/waybar.nix index 0535af2..ff1ffad 100644 --- a/modules/home/waybar.nix +++ b/modules/home/waybar.nix @@ -105,7 +105,7 @@ in { "format-disconnected" = "󰱟"; "tooltip-format" = "{essid} {ifname}"; "max-length" = 50; - "on-click" = "$HOME/.local/bin/wezapp impala"; + "on-click" = "$HOME/.local/bin/wezlauncher nmtui"; }; "tray" = { diff --git a/modules/home/yazi.nix b/modules/home/yazi.nix index 9bb76b2..a3c4b85 100644 --- a/modules/home/yazi.nix +++ b/modules/home/yazi.nix @@ -12,14 +12,14 @@ "diff" "git" "mount" - # "toggle-pane" + "smart-paste" + "toggle-pane" ]; officialPluginsSrc = pkgs.fetchgit { url = "https://github.com/yazi-rs/plugins.git"; sparseCheckout = map (p: "${p}.yazi") officialPluginsNames; - rev = "HEAD"; - hash = "sha256-3F44uFeFBX7PNXo2/maiAzkA/OfweyN4nbDhftna+CI="; + hash = "sha256-bre666Z5qEqkt3c2wLfX5tI2+JMoeRdP4721bJeanKs="; }; officialPlugins = @@ -67,7 +67,6 @@ dir-rules = ./yazi/plugins/dir-rules.yazi; smart-tab = ./yazi/plugins/smart-tab.yazi; - smart-paste = ./yazi/plugins/smart-paste.yazi; }; keymap = { diff --git a/modules/home/yazi/init.lua b/modules/home/yazi/init.lua index 51e73e3..bb8fdf5 100644 --- a/modules/home/yazi/init.lua +++ b/modules/home/yazi/init.lua @@ -1,4 +1,8 @@ require("git"):setup() +th.git = th.git or {} +th.git.modified_sign = "M" +th.git.deleted_sign = "D" + require("dir-rules"):setup() require("restore"):setup({ diff --git a/modules/home/yazi/plugins/smart-paste.yazi/main.lua b/modules/home/yazi/plugins/smart-paste.yazi/main.lua deleted file mode 100644 index 195644c..0000000 --- a/modules/home/yazi/plugins/smart-paste.yazi/main.lua +++ /dev/null @@ -1,13 +0,0 @@ ---- @sync entry -return { - entry = function() - local h = cx.active.current.hovered - if h and h.cha.is_dir then - ya.mgr_emit("enter", {}) - ya.mgr_emit("paste", {}) - ya.mgr_emit("leave", {}) - else - ya.mgr_emit("paste", {}) - end - end, -}