refractor shell configurations with flake-parts

modules/shell/tools.nix

@@ -57,7 +57,7 @@ in
         };
       };
       ${shellType} = {
-        shellAliases = {
+        shellAliases = inputs.self.lib.mergeAliases inputs.self.lib.commonAliases {
           cd = "z";
           hh = "hstr";
           ls = "eza --icons --group-directories-first";
@@ -70,26 +70,17 @@ in
             uniq --count | sort -rn'';
         };
       }
-      // (
-        if shellType == "bash" then
-          {
-            initExtra = ''
-              if command -v fzf-share >/dev/null; then
-              source "$(fzf-share)/key-bindings.bash"
-              source "$(fzf-share)/completion.bash"
-              fi
-            '';
-          }
-        else
-          {
-            initContent = ''
-              if command -v fzf-share >/dev/null; then
-              source "$(fzf-share)/key-bindings.bash"
-              source "$(fzf-share)/completion.bash"
-              fi
-            '';
-          }
-      );
+      // inputs.self.lib.shellConditional shellType ''
+        if command -v fzf-share >/dev/null; then
+        source "$(fzf-share)/key-bindings.bash"
+        source "$(fzf-share)/completion.bash"
+        fi
+      '' ''
+        if command -v fzf-share >/dev/null; then
+        source "$(fzf-share)/key-bindings.bash"
+        source "$(fzf-share)/completion.bash"
+        fi
+      '';
     };
     programs = {
       starship.enable = true;