3 files changed, 16 insertions, 15 deletions
diff --git a/modules/by-name/at/atuin/module.nix b/modules/by-name/at/atuin/module.nix
index 81a97c26..d68e830c 100644
--- a/modules/by-name/at/atuin/module.nix
+++ b/modules/by-name/at/atuin/module.nix
@@ -42,19 +42,16 @@ in {
     soispha.services.unison.pathsToIgnore = [
       # Already synchronized by atuin sync server
       "~/.local/share/atuin"
+      "~/.local/share/turtle"
     ];
 
     home-manager.users.soispha = {
-      programs.atuin = {
-        enable = true;
-
-        package = externalBinaries.turtle.packages.${system}.default;
+      imports = [
+        externalBinaries.turtle.nixosModules.home-manager
+      ];
 
-        daemon.enable = true;
-
-        # We can (and have to) do this on our own.
-        enableZshIntegration = false;
-        enableFishIntegration = false;
+      programs.turtle = {
+        enable = true;
 
         settings = {
           sync = lib.mkIf cfg.enableAge {
@@ -67,7 +64,7 @@ in {
 
           logs = {
             enabled = true;
-            dir = "${config.home-manager.users.soispha.xdg.cacheHome}/atuin/logs";
+            dir = "${config.home-manager.users.soispha.xdg.cacheHome}/turtle/logs";
           };
 
           # Use the rather reasonable syntax of `skim` to search.
diff --git a/modules/by-name/fi/fish/module.nix b/modules/by-name/fi/fish/module.nix
index d3ec97df..590df8b9 100644
--- a/modules/by-name/fi/fish/module.nix
+++ b/modules/by-name/fi/fish/module.nix
@@ -10,6 +10,7 @@
 {
   config,
   lib,
+  pkgs,
   ...
 }: let
   cfg = config.soispha.programs.fish;
@@ -41,7 +42,10 @@ in {
 
   config = lib.mkIf cfg.enable {
     # Ensure that the default shell of the user is actually enabled.
-    programs.fish.enable = true;
+    programs.fish = {
+      enable = true;
+      package = pkgs.fish-patched;
+    };
 
     home-manager.users.soispha = {
       home.sessionPath = lib.mkForce [];
@@ -49,6 +53,8 @@ in {
       programs.fish = {
         enable = true;
 
+        package = config.programs.fish.package;
+
         interactiveShellInit = let
           start = lib.modules.mkBefore (
             sourceFile ./config/01_show-task.fish
diff --git a/modules/by-name/lf/lf/module.nix b/modules/by-name/lf/lf/module.nix
index a95bdb03..11708152 100644
--- a/modules/by-name/lf/lf/module.nix
+++ b/modules/by-name/lf/lf/module.nix
@@ -44,8 +44,6 @@
     attrs;
   keybindings = builtins.listToAttrs (lib.lists.flatten (process null keybindings_raw));
 
-  packages = import ./wrappers {inherit pkgs;};
-
   cfg = config.soispha.programs.lf;
 in {
   imports = [
@@ -83,11 +81,11 @@ in {
       # fish
       ''
         function ll
-          . ${./wrappers/ll.fish}
+          . ${./wrappers/ll.fish} $argv
         end
 
         function lm
-          . ${./wrappers/lm.fish}
+          . ${./wrappers/lm.fish} $argv
         end
       '';