From da7a0d3ec6988aeb644e1dcb22fc1c784e11e5c0 Mon Sep 17 00:00:00 2001
From: notgne2 <gen2@gen2.space>
Date: Sat, 5 Nov 2022 19:07:03 -0700
Subject: [PATCH] remove fish shell init thing

---
 common.nix              | 12 ++++++------
 home-manager/common.nix |  9 +--------
 2 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/common.nix b/common.nix
index e8f72c2..794424c 100644
--- a/common.nix
+++ b/common.nix
@@ -40,12 +40,12 @@
       daemonCPUSchedPolicy = lib.mkDefault "idle";
       trustedUsers = ["root" "builder" "@wheel"];
 
-      extraOptions = ''
-        builders-use-substitutes = true
-        experimental-features = nix-command flakes
-        keep-outputs = true
-        keep-derivations = true
-      '';
+      settings = {
+        builders-use-substitutes = true;
+        experimental-features = ["nix-command" "flakes" "repl-flake"];
+        keep-outputs = true;
+        keep-derivations = true;
+      };
     };
 
     # make nginx have good logging and defaults
diff --git a/home-manager/common.nix b/home-manager/common.nix
index 3630281..443f0ab 100644
--- a/home-manager/common.nix
+++ b/home-manager/common.nix
@@ -79,15 +79,8 @@ inputs: {
         src = inputs.done;
       }
     ];
-    shellInit = ''
-      if not set -q NIX_PATH
-        set --prepend fish_function_path ${pkgs.fishPlugins.foreign-env}/share/fish/vendor_functions.d
-        fenv source $HOME/.nix-profile/etc/profile.d/nix.sh
-        set -e fish_function_path[1]
-      end
-    '';
     interactiveShellInit = ''
-      set -U __done_min_cmd_duration 2000
+      set -U __done_min_cmd_duration 4000
 
       set -U fish_key_bindings fish_default_key_bindings