Moved yazi config to home-manager and fixed plugins

.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

home-manager/core/programs.nix

@@ -7,6 +7,9 @@
   unstablePkgs,
   ...
 }: {
+  imports = [
+    ./programs/yazi.nix
+  ];
   programs = {
     home-manager.enable = true;
     git.enable = true;

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;
+  };
+}

nixos/core/programs.nix

@@ -7,7 +7,6 @@
   ...
 }: {
   imports = [
-    ./programs/yazi.nix
     ./programs/neovim.nix
   ];
 }

nixos/core/programs/yazi.nix

@@ -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);
-    };
-  };
-}