diff --git a/flake.lock b/flake.lock
index d6f9d3c..38b312d 100644
--- a/flake.lock
+++ b/flake.lock
@@ -141,11 +141,11 @@
       },
       "locked": {
         "dir": "contrib",
-        "lastModified": 1672440083,
-        "narHash": "sha256-CsOplUdX18GGb190pRN1SuEqCqcFluUy4BoZ/W5/ou4=",
+        "lastModified": 1672499781,
+        "narHash": "sha256-YFUj+w0f6bjMI9TJI0rQOuXepzhQzngbXxYbQ0+NTLA=",
         "owner": "neovim",
         "repo": "neovim",
-        "rev": "99cf111289bfcd14981255e805da43bac5139141",
+        "rev": "6ba34e21fee2a81677e8261dfeaf24c8cd320500",
         "type": "github"
       },
       "original": {
@@ -164,11 +164,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1672474400,
-        "narHash": "sha256-RTiQ0hNZlBicV5EJB7HHiZzN79m49ML25b3VC+6pY7I=",
+        "lastModified": 1672560816,
+        "narHash": "sha256-E50oV/kxBHivHUnpP/rghnAUcSuVO6f9E2PlDTGTOfA=",
         "owner": "nix-community",
         "repo": "neovim-nightly-overlay",
-        "rev": "50be3eb7504ebe4da225e59e3b2062c42b12f69e",
+        "rev": "ce4158d859d54c8c4f948c2e01158e132c9bb908",
         "type": "github"
       },
       "original": {
diff --git a/home/config/nvim/plugins/osc52.fnl b/home/config/nvim/plugins/osc52.fnl
index 995bb61..999aa78 100644
--- a/home/config/nvim/plugins/osc52.fnl
+++ b/home/config/nvim/plugins/osc52.fnl
@@ -13,7 +13,7 @@
 
   (if (= uname.sysname :Darwin)
       (set vim.g.clipboard {:name clip-name
-                            :copy {:+ copy :* copy}
+                            :copy {:+ :pbcopy :* :pbcopy}
                             :paste {:+ :pbpaste :* :pbpaste}
                             :cache_enabled 0})
       ;; Other OS
diff --git a/home/programs/custom-nix-cache.nix b/home/programs/custom-nix-cache.nix
index c81c948..16ac294 100644
--- a/home/programs/custom-nix-cache.nix
+++ b/home/programs/custom-nix-cache.nix
@@ -50,7 +50,7 @@ in
         # Might work better once nix is CA.
         if [[ $storePath == *"-vim-pack-dir" ]] ||
            [[ $storePath == *"-vimplugin-"* ]] ||
-           [[ $storePath == *"-neovim-unwrapped-master" ]] ||
+           [[ $storePath == *"-neovim-unwrapped"* ]] ||
            [[ $storePath == *"-vim-command-check-hook" ]] ||
            [[ $storePath == *"-neovim-require-check-hook" ]] ||
            [[ $storePath == *"-neovim-master-fish-completions" ]]; then
diff --git a/home/programs/fish.nix b/home/programs/fish.nix
index 0b5470e..73cbe6a 100644
--- a/home/programs/fish.nix
+++ b/home/programs/fish.nix
@@ -164,7 +164,9 @@ in
 
       if test (uname) = "Darwin"; and test -z "$__NIX_DARWIN_SET_ENVIRONMENT_DONE"
         set __nifoc_nix_darwin_set_env (grep '-set-environment' /run/current-system/etc/bashrc | cut -d '.' -f 2)
+        set __nifoc_old_editor "$EDITOR"
         fenv source "$__nifoc_nix_darwin_set_env"
+        set -g EDITOR "$__nifoc_old_editor"
       end
 
       if test -d "$HOME/.bin"
diff --git a/home/programs/nvim/plugins.nix b/home/programs/nvim/plugins.nix
index c5107a7..c7ad815 100644
--- a/home/programs/nvim/plugins.nix
+++ b/home/programs/nvim/plugins.nix
@@ -112,12 +112,12 @@ rec {
     };
   };
   nvim-treesitter = pkgs.vimPlugins.nvim-treesitter.overrideAttrs (_: {
-    version = "2022-12-31";
+    version = "2023-01-01";
     src = pkgs.fetchFromGitHub {
       owner = "nvim-treesitter";
       repo = "nvim-treesitter";
-      rev = "168567efb8aa3874f3da8832dbcd3d1a4ff40d3b";
-      sha256 = "0iphg3vlzqicaviy8z9dmasm262c41byx31r9196zvgzvnircxqz";
+      rev = "b67822bf58b0fbf0c496ae21a177d02fa8388edf";
+      sha256 = "01l1sl39pia8fa2b7ld0rdi76yjlrnh82rlxvgfqjivppq23k0zm";
       fetchSubmodules = false;
     };
   });
@@ -500,12 +500,12 @@ rec {
   };
   nvim-surround = pkgs.vimUtils.buildVimPluginFrom2Nix {
     pname = "nvim-surround";
-    version = "2022-12-30";
+    version = "2023-01-01";
     src = pkgs.fetchFromGitHub {
       owner = "kylechui";
       repo = "nvim-surround";
-      rev = "64e21061953102b19bbb22e824fbb96054782799";
-      sha256 = "11m62i66gicv7spz6bcsxpdqshi19v0306bh69lcmbyawbwyli4a";
+      rev = "ad56e6234bf42fb7f7e4dccc7752e25abd5ec80e";
+      sha256 = "1fi5lk3iacjdbq1p4wm0bia93awwqfn7jiy019vpg4gngi41azrz";
       fetchSubmodules = false;
     };
   };
@@ -599,12 +599,12 @@ rec {
   };
   noice-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix {
     pname = "noice.nvim";
-    version = "2022-12-31";
+    version = "2023-01-01";
     src = pkgs.fetchFromGitHub {
       owner = "folke";
       repo = "noice.nvim";
-      rev = "661495acc1cc29f53d2defd1c18c87da1cc8f850";
-      sha256 = "1cbk9961j2rrshc2947idpb8dc9ypgfmbzg7a66ab7sk1wgk1a4i";
+      rev = "256ec7318e227d4a0879f3776bfbe3955f5d2eef";
+      sha256 = "1fqi4vw0q50prs2n0gxxw9kdg752hlamb4b0axkp8k067x3lpa2r";
       fetchSubmodules = false;
     };
   };
diff --git a/system/flakes/Styx.nix b/system/flakes/Styx.nix
index 3a481d5..b4a4309 100644
--- a/system/flakes/Styx.nix
+++ b/system/flakes/Styx.nix
@@ -37,6 +37,7 @@ in
       ../hosts/Styx.nix
 
       home-manager.darwinModules.home-manager
+
       {
         nixpkgs = nixpkgsConfig;
         nix.nixPath = [ "nixpkgs=${nixpkgs}" ];
diff --git a/system/flakes/sail.nix b/system/flakes/sail.nix
index 4d8b84b..5a6f4d9 100644
--- a/system/flakes/sail.nix
+++ b/system/flakes/sail.nix
@@ -20,16 +20,12 @@ in
   system = nixpkgs.lib.nixosSystem {
     system = "x86_64-linux";
     modules = [
-      ({
-        nixpkgs.overlays = nixpkgsConfig.overlays;
-        nixpkgs.config = nixpkgsConfig.config;
-      })
-
       arion.nixosModules.arion
 
       ../hosts/sail.nix
 
       home-manager.nixosModules.home-manager
+
       {
         nixpkgs = nixpkgsConfig;
         nix.nixPath = [ "nixpkgs=${nixpkgs}" ];