Merge remote-tracking branch 'ni/master'

1 files changed, 10 insertions, 11 deletions

diff --git a/tv/2configs/default.nix b/tv/2configs/default.nix
index 9babb92c..d1384845 100644
--- a/tv/2configs/default.nix
+++ b/tv/2configs/default.nix
@@ -16,6 +16,7 @@ with import ./lib;
     ./nets/hkw.nix
     ./networkd.nix
     ./nginx
+    ./nix.nix
     ./pki
     ./ssh.nix
     ./sshd.nix
@@ -45,20 +46,11 @@ with import ./lib;
     }
 
     {
-      nix.extraOptions = ''
-        auto-optimise-store = true
-      '';
-
-      # TODO check if both are required:
-      nix.settings.extra-sandbox-paths = [
-        "/etc/protocols"
-        pkgs.iana-etc.outPath
-      ];
-    }
-    {
       nixpkgs.config.allowUnfree = false;
     }
     {
+      environment.homeBinInPath = true;
+
       environment.profileRelativeEnvVars.PATH = mkForce [ "/bin" ];
 
       environment.systemPackages = with pkgs; [
@@ -137,4 +129,11 @@ with import ./lib;
       ];
     }
   ];
+
+  nixpkgs.overlays =
+    mkAfter (optional config.hardware.video.hidpi.enable (self: super: {
+      alacritty-tv = super.alacritty-tv.override {
+        variant = "hidpi";
+      };
+    }));
 }