From a5b9a0c98764a4621183fbd922d66a8a38af182f Mon Sep 17 00:00:00 2001 From: Cian Hughes Date: Tue, 15 Apr 2025 11:38:00 +0100 Subject: [PATCH] Moved yazi config to home-manager and fixed plugins --- .gitmodules | 22 +++++++-- home-manager/core/programs.nix | 3 ++ home-manager/core/programs/yazi.nix | 49 +++++++++++++++++++ .../programs/yazi/flavors/tokyo-night.yazi | 0 .../core/programs/yazi/init.lua | 0 .../core/programs/yazi/keymap.toml | 0 home-manager/core/programs/yazi/plugins/core | 1 + .../core/programs/yazi/plugins/glow.yazi | 1 + .../core/programs/yazi/plugins/hexyl.yazi | 1 + .../core/programs/yazi/plugins/ouch.yazi | 1 + .../core/programs/yazi/plugins/starship.yazi | 1 + .../core/programs/yazi/plugins/sudo.yazi | 1 + .../core/programs/yazi/theme.toml | 0 .../core/programs/yazi/yazi.toml | 0 nixos/core/programs.nix | 1 - nixos/core/programs/yazi.nix | 33 ------------- nixos/core/programs/yazi/plugins/hexyl.yazi | 1 - .../programs/yazi/plugins/max-preview.yazi | 1 - 18 files changed, 75 insertions(+), 41 deletions(-) create mode 100644 home-manager/core/programs/yazi.nix rename {nixos => home-manager}/core/programs/yazi/flavors/tokyo-night.yazi (100%) rename {nixos => home-manager}/core/programs/yazi/init.lua (100%) rename {nixos => home-manager}/core/programs/yazi/keymap.toml (100%) create mode 160000 home-manager/core/programs/yazi/plugins/core create mode 160000 home-manager/core/programs/yazi/plugins/glow.yazi create mode 160000 home-manager/core/programs/yazi/plugins/hexyl.yazi create mode 160000 home-manager/core/programs/yazi/plugins/ouch.yazi create mode 160000 home-manager/core/programs/yazi/plugins/starship.yazi create mode 160000 home-manager/core/programs/yazi/plugins/sudo.yazi rename {nixos => home-manager}/core/programs/yazi/theme.toml (100%) rename {nixos => home-manager}/core/programs/yazi/yazi.toml (100%) delete mode 100644 nixos/core/programs/yazi.nix delete mode 160000 nixos/core/programs/yazi/plugins/hexyl.yazi delete mode 160000 nixos/core/programs/yazi/plugins/max-preview.yazi diff --git a/.gitmodules b/.gitmodules index 4e1c36c..d9d69eb 100644 --- a/.gitmodules +++ b/.gitmodules @@ -2,11 +2,23 @@ path = home-manager/core/dotfiles url = https://github.com/Cian-H/dotfiles.git [submodule "nixos/core/programs/yazi/plugins/hexyl.yazi"] - path = nixos/core/programs/yazi/plugins/hexyl.yazi + path = home-manager/core/programs/yazi/plugins/hexyl.yazi url = https://github.com/Reledia/hexyl.yazi -[submodule "nixos/core/programs/yazi/plugins/max-preview.yazi"] - path = nixos/core/programs/yazi/plugins/max-preview.yazi - url = https://github.com/SUSTech-data/max-preview.yazi [submodule "nixos/core/programs/yazi/flavors/tokyo-night.yazi"] - path = nixos/core/programs/yazi/flavors/tokyo-night.yazi + path = home-manager/core/programs/yazi/flavors/tokyo-night.yazi url = https://github.com/BennyOe/tokyo-night.yazi.git +[submodule "home-manager/core/programs/yazi/plugins/sudo.yazi"] + path = home-manager/core/programs/yazi/plugins/sudo.yazi + url = https://github.com/TD-Sky/sudo.yazi +[submodule "home-manager/core/programs/yazi/plugins/core"] + path = home-manager/core/programs/yazi/plugins/core + url = https://github.com/yazi-rs/plugins +[submodule "home-manager/core/programs/yazi/plugins/ouch"] + path = home-manager/core/programs/yazi/plugins/ouch.yazi + url = https://github.com/ndtoan96/ouch.yazi +[submodule "home-manager/core/programs/yazi/plugins/starship.yazi"] + path = home-manager/core/programs/yazi/plugins/starship.yazi + url = https://github.com/Rolv-Apneseth/starship.yazi +[submodule "home-manager/core/programs/yazi/plugins/glow.yazi"] + path = home-manager/core/programs/yazi/plugins/glow.yazi + url = https://github.com/Reledia/glow.yazi diff --git a/home-manager/core/programs.nix b/home-manager/core/programs.nix index 9479e60..c4a3248 100644 --- a/home-manager/core/programs.nix +++ b/home-manager/core/programs.nix @@ -7,6 +7,9 @@ unstablePkgs, ... }: { + imports = [ + ./programs/yazi.nix + ]; programs = { home-manager.enable = true; git.enable = true; diff --git a/home-manager/core/programs/yazi.nix b/home-manager/core/programs/yazi.nix new file mode 100644 index 0000000..d73951f --- /dev/null +++ b/home-manager/core/programs/yazi.nix @@ -0,0 +1,49 @@ +{ + inputs, + lib, + config, + pkgs, + unstablePkgs, + ... +}: { + programs.yazi = { + enable = true; + package = unstablePkgs.yazi; + initLua = ./yazi/init.lua; + # plugins = { + # sudo = ./yazi/plugins/sudo.yazi; + # chmod = ./yazi/plugins/core/chmod.yazi; + # mime-ext = ./yazi/plugins/core/mime-ext.yazi; + # git = ./yazi/plugins/core/git.yazi; + # ouch = ./yazi/plugins/ouch.yazi; + # starship = ./yazi/plugins/starship.yazi; + # full-border = ./yazi/plugins/core/full-border.yazi; + # glow = ./yazi/plugins/glow.yazi; + # hexyl = ./yazi/plugins/hexyl.yazi; + # max-preview = ./yazi/plugins/core/max-preview.yazi; + # }; + # flavors = { + # tokyo-night = ./yazi/flavors/tokyo-night.yazi; + # }; + settings = { + keymap = builtins.fromTOML (builtins.readFile ./yazi/keymap.toml); + theme = builtins.fromTOML (builtins.readFile ./yazi/theme.toml); + yazi = builtins.fromTOML (builtins.readFile ./yazi/yazi.toml); + }; + }; + + # Manually place plugins for now, until home-manager updates for newer yazi versions + xdg.configFile = { + "yazi/plugins/sudo.yazi".source = ./yazi/plugins/sudo.yazi; + "yazi/plugins/chmod.yazi".source = ./yazi/plugins/core/chmod.yazi; + "yazi/plugins/mime-ext.yazi".source = ./yazi/plugins/core/mime-ext.yazi; + "yazi/plugins/git.yazi".source = ./yazi/plugins/core/git.yazi; + "yazi/plugins/ouch.yazi".source = ./yazi/plugins/ouch.yazi; + "yazi/plugins/starship.yazi".source = ./yazi/plugins/starship.yazi; + "yazi/plugins/full-border.yazi".source = ./yazi/plugins/core/full-border.yazi; + "yazi/plugins/glow.yazi".source = ./yazi/plugins/glow.yazi; + "yazi/plugins/hexyl.yazi".source = ./yazi/plugins/hexyl.yazi; + "yazi/plugins/max-preview.yazi".source = ./yazi/plugins/core/max-preview.yazi; + "yazi/flavors/tokyo-night.yazi".source = ./yazi/flavors/tokyo-night.yazi; + }; +} diff --git a/nixos/core/programs/yazi/flavors/tokyo-night.yazi b/home-manager/core/programs/yazi/flavors/tokyo-night.yazi similarity index 100% rename from nixos/core/programs/yazi/flavors/tokyo-night.yazi rename to home-manager/core/programs/yazi/flavors/tokyo-night.yazi diff --git a/nixos/core/programs/yazi/init.lua b/home-manager/core/programs/yazi/init.lua similarity index 100% rename from nixos/core/programs/yazi/init.lua rename to home-manager/core/programs/yazi/init.lua diff --git a/nixos/core/programs/yazi/keymap.toml b/home-manager/core/programs/yazi/keymap.toml similarity index 100% rename from nixos/core/programs/yazi/keymap.toml rename to home-manager/core/programs/yazi/keymap.toml diff --git a/home-manager/core/programs/yazi/plugins/core b/home-manager/core/programs/yazi/plugins/core new file mode 160000 index 0000000..b12a9ab --- /dev/null +++ b/home-manager/core/programs/yazi/plugins/core @@ -0,0 +1 @@ +Subproject commit b12a9ab085a8c2fe2b921e1547ee667b714185f9 diff --git a/home-manager/core/programs/yazi/plugins/glow.yazi b/home-manager/core/programs/yazi/plugins/glow.yazi new file mode 160000 index 0000000..0883738 --- /dev/null +++ b/home-manager/core/programs/yazi/plugins/glow.yazi @@ -0,0 +1 @@ +Subproject commit 0883738bd82e95a71e0749a855546ba86bee383c diff --git a/home-manager/core/programs/yazi/plugins/hexyl.yazi b/home-manager/core/programs/yazi/plugins/hexyl.yazi new file mode 160000 index 0000000..016a09b --- /dev/null +++ b/home-manager/core/programs/yazi/plugins/hexyl.yazi @@ -0,0 +1 @@ +Subproject commit 016a09bcc249dd3ce06267d54cc039e73de9c647 diff --git a/home-manager/core/programs/yazi/plugins/ouch.yazi b/home-manager/core/programs/yazi/plugins/ouch.yazi new file mode 160000 index 0000000..2496cd9 --- /dev/null +++ b/home-manager/core/programs/yazi/plugins/ouch.yazi @@ -0,0 +1 @@ +Subproject commit 2496cd9ac2d1fb52597b22ae84f3af06c826a86d diff --git a/home-manager/core/programs/yazi/plugins/starship.yazi b/home-manager/core/programs/yazi/plugins/starship.yazi new file mode 160000 index 0000000..c070754 --- /dev/null +++ b/home-manager/core/programs/yazi/plugins/starship.yazi @@ -0,0 +1 @@ +Subproject commit c0707544f1d526f704dab2da15f379ec90d613c2 diff --git a/home-manager/core/programs/yazi/plugins/sudo.yazi b/home-manager/core/programs/yazi/plugins/sudo.yazi new file mode 160000 index 0000000..af70636 --- /dev/null +++ b/home-manager/core/programs/yazi/plugins/sudo.yazi @@ -0,0 +1 @@ +Subproject commit af70636fbcf30ef17f77c5ffcfcbf1342c554be1 diff --git a/nixos/core/programs/yazi/theme.toml b/home-manager/core/programs/yazi/theme.toml similarity index 100% rename from nixos/core/programs/yazi/theme.toml rename to home-manager/core/programs/yazi/theme.toml diff --git a/nixos/core/programs/yazi/yazi.toml b/home-manager/core/programs/yazi/yazi.toml similarity index 100% rename from nixos/core/programs/yazi/yazi.toml rename to home-manager/core/programs/yazi/yazi.toml diff --git a/nixos/core/programs.nix b/nixos/core/programs.nix index a23849c..812486a 100644 --- a/nixos/core/programs.nix +++ b/nixos/core/programs.nix @@ -7,7 +7,6 @@ ... }: { imports = [ - ./programs/yazi.nix ./programs/neovim.nix ]; } diff --git a/nixos/core/programs/yazi.nix b/nixos/core/programs/yazi.nix deleted file mode 100644 index 8bbdfae..0000000 --- a/nixos/core/programs/yazi.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ - inputs, - lib, - config, - pkgs, - unstablePkgs, - ... -}: { - programs.yazi = { - enable = true; - initLua = ./yazi/init.lua; - plugins = { - sudo = unstablePkgs.yaziPlugins.sudo; - chmod = unstablePkgs.yaziPlugins.chmod; - mime-ext = unstablePkgs.yaziPlugins.mime-ext; - git = unstablePkgs.yaziPlugins.git; - ouch = unstablePkgs.yaziPlugins.ouch; - starship = unstablePkgs.yaziPlugins.starship; - full-border = unstablePkgs.yaziPlugins.full-border; - glow = unstablePkgs.yaziPlugins.glow; - hexyl = ./yazi/plugins/hexyl.yazi; - max-preview = ./yazi/plugins/max-preview.yazi; - }; - flavors = { - tokyo-night = ./yazi/flavors/tokyo-night.yazi; - }; - settings = { - keymap = builtins.fromTOML (builtins.readFile ./yazi/keymap.toml); - theme = builtins.fromTOML (builtins.readFile ./yazi/theme.toml); - yazi = builtins.fromTOML (builtins.readFile ./yazi/yazi.toml); - }; - }; -} diff --git a/nixos/core/programs/yazi/plugins/hexyl.yazi b/nixos/core/programs/yazi/plugins/hexyl.yazi deleted file mode 160000 index 228a9ef..0000000 --- a/nixos/core/programs/yazi/plugins/hexyl.yazi +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 228a9ef2c509f43d8da1847463535adc5fd88794 diff --git a/nixos/core/programs/yazi/plugins/max-preview.yazi b/nixos/core/programs/yazi/plugins/max-preview.yazi deleted file mode 160000 index b65aafa..0000000 --- a/nixos/core/programs/yazi/plugins/max-preview.yazi +++ /dev/null @@ -1 +0,0 @@ -Subproject commit b65aafa4045adb7b1257aceee2e37db1456ae3d3