diff --git a/darwin-modules/nix.nix b/darwin-modules/nix.nix
index 90e9e65..8d17e9f 100644
--- a/darwin-modules/nix.nix
+++ b/darwin-modules/nix.nix
@@ -22,6 +22,11 @@
       ];
     };
 
+    optimise = {
+      automatic = true;
+      interval = [{ Weekday = 7; Hour = 4; Minute = 15; }];
+    };
+
     gc = {
       automatic = true;
       options = "--delete-older-than 7d";
diff --git a/home-modules/fish-shell.nix b/home-modules/fish-shell.nix
index f8e78c4..2e897e2 100644
--- a/home-modules/fish-shell.nix
+++ b/home-modules/fish-shell.nix
@@ -16,8 +16,4 @@
       nix-direnv.enable = true;
     };
   };
-
-  home.sessionVariables = {
-    EDITOR = "code --wait";
-  };
 }
diff --git a/home-modules/neovim.nix b/home-modules/neovim.nix
index 796156e..f745c6a 100755
--- a/home-modules/neovim.nix
+++ b/home-modules/neovim.nix
@@ -8,6 +8,7 @@ in
 
   programs.nixvim = {
     enable = true;
+    defaultEditor = true;
 
     nixpkgs.pkgs = unstable-pkgs;
 
@@ -43,7 +44,6 @@ in
       neo-tree.enable = true;
 
       noice.enable = true;
-      lazy.enable = true;
 
       lsp = {
         enable = true;
diff --git a/nixos-modules/nix.nix b/nixos-modules/nix.nix
index 0e10297..215e696 100644
--- a/nixos-modules/nix.nix
+++ b/nixos-modules/nix.nix
@@ -10,6 +10,11 @@
 
     registry.nixpkgs.flake = inputs.nixpkgs;
 
+    optimise = {
+      automatic = true;
+      dates = [ "03:45" ];
+    };
+
     nixPath = [
       "nixpkgs=${inputs.nixpkgs}"
     ];