diff --git a/home-manager/home.nix b/home-manager/home.nix
index d879a14..4e7be68 100644
--- a/home-manager/home.nix
+++ b/home-manager/home.nix
@@ -58,19 +58,28 @@
   # Let Home Manager install and manage itself.
   programs.home-manager.enable = true;
 
+  # Shell configurations
   programs.fish = {
       enable = true;
+      loginShellInit = ''
+        set -x XDG_DATA_DIRS $HOME/.nix-profile/share:$XDG_DATA_DIRS
+      '';
       interactiveShellInit = ''
         set fish_greeting
       '';
     };
 
+  programs.rtx = {
+      enable = true;
+      enableFishIntegration = true;
+    };
+
   programs.starship = {
       enable = true;
       enableFishIntegration = true;
     };
 
-  programs.rtx = {
+  programs.yazi = {
       enable = true;
       enableFishIntegration = true;
     };
@@ -80,6 +89,7 @@
       enableFishIntegration = true;
     };
 
+  # Programming configurations
   programs.git = {
       enable = true;
       userName = "Roman Godmaire";
@@ -108,9 +118,4 @@
       enable = true;
       defaultEditor = true;
     };
-
-  programs.yazi = {
-      enable = true;
-      enableFishIntegration = true;
-    };
 }