4 files changed, 12 insertions, 11 deletions
diff --git a/tv/2configs/default.nix b/tv/2configs/default.nix
index f3ce2da4..c9047023 100644
--- a/tv/2configs/default.nix
+++ b/tv/2configs/default.nix
@@ -46,14 +46,15 @@ with import <stockholm/lib>;
     }
 
     {
-      # TODO check if both are required:
-      nix.sandboxPaths = [ "/etc/protocols" pkgs.iana-etc.outPath ];
-
-      nix.requireSignedBinaryCaches = true;
-
-      nix.binaryCaches = ["https://cache.nixos.org"];
+      nix.extraOptions = ''
+        auto-optimise-store = true
+      '';
 
-      nix.useSandbox = true;
+      # TODO check if both are required:
+      nix.settings.extra-sandbox-paths = [
+        "/etc/protocols"
+        pkgs.iana-etc.outPath
+      ];
     }
     {
       nixpkgs.config.allowUnfree = false;
diff --git a/tv/2configs/gitrepos.nix b/tv/2configs/gitrepos.nix
index 50444c1e..4fba5fe7 100644
--- a/tv/2configs/gitrepos.nix
+++ b/tv/2configs/gitrepos.nix
@@ -134,7 +134,6 @@ let {
     web-routes-wai-custom = {};
     xintmap = {};
     xmonad-aeson = {};
-    xmonad-stockholm = {};
     xmonad-web = {};
   } // mapAttrs (_: recursiveUpdate { cgit.section = "4. museum"; }) {
     cac-api = {
@@ -165,6 +164,7 @@ let {
     soundcloud = {
       cgit.desc = "SoundCloud command line interface";
     };
+    xmonad-stockholm = {};
   });
 
   restricted-repos = mapAttrs make-restricted-repo (
diff --git a/tv/2configs/hw/x220.nix b/tv/2configs/hw/x220.nix
index 8c68cdef..25e2effb 100644
--- a/tv/2configs/hw/x220.nix
+++ b/tv/2configs/hw/x220.nix
@@ -28,8 +28,8 @@ in
     }
 
     {
-      nix.buildCores = 2;
-      nix.maxJobs = 2;
+      nix.settings.cores = 2;
+      nix.settings.max-jobs = 2;
     }
     (if lib.versionAtLeast (lib.versions.majorMinor lib.version) "21.11" then {
       nix.daemonCPUSchedPolicy = "batch";
diff --git a/tv/2configs/vim.nix b/tv/2configs/vim.nix
index fed74c92..e296a0c8 100644
--- a/tv/2configs/vim.nix
+++ b/tv/2configs/vim.nix
@@ -13,7 +13,7 @@ let {
     environment.variables.VIMINIT = ":so /etc/vimrc";
   };
 
-  extra-runtimepath = concatMapStringsSep "," (pkg: "${pkg.rtp}") [
+  extra-runtimepath = pkgs.tv.vim.makeRuntimePath [
     pkgs.tv.vimPlugins.elixir
     pkgs.tv.vimPlugins.file-line
     pkgs.tv.vimPlugins.fzf