diff --git a/.vimrc b/nix/base-system/.vimrc
similarity index 100%
rename from .vimrc
rename to nix/base-system/.vimrc
diff --git a/.zshrc b/nix/base-system/.zshrc
similarity index 100%
rename from .zshrc
rename to nix/base-system/.zshrc
diff --git a/nix/base-system/flake.nix b/nix/base-system/flake.nix
index d58d946..25d67e9 100644
--- a/nix/base-system/flake.nix
+++ b/nix/base-system/flake.nix
@@ -24,7 +24,7 @@
     systemModule = system: let
       runwhen = runwhen-flake.defaultPackage."${system}";
       durnitisp = durnitisp-flake.defaultPackage."${system}";
-      rust-overlay = rust-overlay-flake.overlay;
+      rust-overlay = rust-overlay-flake.overlays.default;
       sile = sile-flake.defaultPackage.${system};
       jj = jj-flake.packages."${system}".jujutsu;
       age = agenix-flake.packages."${system}".default;
@@ -32,6 +32,7 @@
       
       imports = [
         agenix-flake.nixosModules.default
+        ./program-neovim.nix
       ];
 
       config = {
@@ -48,7 +49,7 @@
         programs = with pkgs; {
           neovim.enable = true;
           neovim.configure = {
-            #customRC = (builtins.readFile ../.vimrc);
+            customRc = (builtins.readFile ./.vimrc);
             packages.myVimPackage = with pkgs.vimPlugins; {
               start = [
                       coc-nvim
@@ -74,7 +75,7 @@
             };
           };
           zsh.enable = true;  # default shell on catalina
-          #zsh.interactiveShellInit = (builtins.readFile ../.zshrc);
+          zsh.interactiveShellInit = (builtins.readFile ./.zshrc);
         };
         environment.systemPackages = (with pkgs; [
             nodejs
diff --git a/nix/darwin/program-neovim.nix b/nix/base-system/program-neovim.nix
similarity index 95%
rename from nix/darwin/program-neovim.nix
rename to nix/base-system/program-neovim.nix
index dc3306a..6e97ea9 100644
--- a/nix/darwin/program-neovim.nix
+++ b/nix/base-system/program-neovim.nix
@@ -61,9 +61,6 @@ in {
       default = {};
       example = literalExpression ''
         {
-          customRC = '''
-            " here your custom configuration goes!
-          ''';
           packages.myVimPackage = with pkgs.vimPlugins; {
             # loaded on launch
             start = [ fugitive ];
@@ -156,10 +153,7 @@ in {
     programs.neovim.finalPackage = pkgs.wrapNeovim cfg.package {
       inherit (cfg) viAlias vimAlias withPython3 withNodeJs withRuby;
       configure = cfg.configure // {
-
-        customRC = (cfg.configure.customRC or "") + ''
-          set runtimepath^=${runtime}/etc
-        '';
+        customRC = (cfg.configure.customRC or "");
       };
     };
   };
diff --git a/nix/darwin/darwin-configuration.nix b/nix/darwin/darwin-configuration.nix
index 093dfdd..61c63e3 100644
--- a/nix/darwin/darwin-configuration.nix
+++ b/nix/darwin/darwin-configuration.nix
@@ -3,16 +3,12 @@
 
   nix = {
     package = pkgs.nix;
-    useSandbox = true;
+    settings.sandbox = true;
     extraOptions = ''
       experimental-features = nix-command flakes
     '';
   };
 
-  imports = [
-    ./program-neovim.nix
-  ];
-
   # Right now the documentation build is broken.
   # TODO(jwall): Add this back when they work again.
   documentation.enable = false;
diff --git a/nix/darwin/flake.lock b/nix/darwin/flake.lock
index 396db54..809c471 100644
--- a/nix/darwin/flake.lock
+++ b/nix/darwin/flake.lock
@@ -32,12 +32,12 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-wsNz9Dl40+AXhNPHEuWxGtczgPQxCJ3P08iRdKu06+o=",
-        "path": "/nix/store/r8nbb698wy9pvybh7207jl7zv8fj19k6-source/nix/base-system",
+        "narHash": "sha256-FYoAPOEpojtsQR3jHFL7H1yC5hvffXWUhTNehjxiicM=",
+        "path": "/nix/store/9s2a41g96r1hgr9832cl0wbwij08s8yf-source/nix/base-system",
         "type": "path"
       },
       "original": {
-        "path": "/nix/store/r8nbb698wy9pvybh7207jl7zv8fj19k6-source/nix/base-system",
+        "path": "/nix/store/9s2a41g96r1hgr9832cl0wbwij08s8yf-source/nix/base-system",
         "type": "path"
       }
     },
@@ -69,11 +69,11 @@
         "nixpkgs": "nixpkgs_8"
       },
       "locked": {
-        "lastModified": 1648278671,
-        "narHash": "sha256-1WrR9ex+rKTjZtODNUZQhkWYUprtfOkjOyo9YWL2NMs=",
+        "lastModified": 1687691275,
+        "narHash": "sha256-VVywT8ubStvDPF5TscDBokT3T0l3zsOzCW056noh5zc=",
         "owner": "lnl7",
         "repo": "nix-darwin",
-        "rev": "4fdbb8168f61d31d3f90bb0d07f48de709c4fe79",
+        "rev": "25ae710ba3cd448c5d5678788d37f3d149378bc0",
         "type": "github"
       },
       "original": {
@@ -472,12 +472,11 @@
     },
     "nixpkgs_8": {
       "locked": {
-        "lastModified": 1687701825,
-        "narHash": "sha256-aMC9hqsf+4tJL7aJWSdEUurW2TsjxtDcJBwM9Y4FIYM=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "07059ee2fa34f1598758839b9af87eae7f7ae6ea",
-        "type": "github"
+        "lastModified": 1687274257,
+        "narHash": "sha256-TutzPriQcZ8FghDhEolnHcYU2oHIG5XWF+/SUBNnAOE=",
+        "path": "/nix/store/22qgs3skscd9bmrxv9xv4q5d4wwm5ppx-source",
+        "rev": "2c9ecd1f0400076a4d6b2193ad468ff0a7e7fdc5",
+        "type": "path"
       },
       "original": {
         "id": "nixpkgs",
diff --git a/nix/darwin/flake.nix b/nix/darwin/flake.nix
index 342f360..b026831 100644
--- a/nix/darwin/flake.nix
+++ b/nix/darwin/flake.nix
@@ -21,7 +21,6 @@
         modules = [
           (base-system.systemModule system)
           ./darwin-configuration.nix
-
         ];
       });
   in