merge hakyllHEADmaster

1 files changed, 11 insertions, 7 deletions

diff --git a/modules/xnet/default.nix b/modules/xnet/default.nix
index 28edf60..020accb 100644
--- a/modules/xnet/default.nix
+++ b/modules/xnet/default.nix
@@ -2,8 +2,6 @@
   pkgs,
   lib,
   config,
-  flake,
-  inputs,
   ...
 }:
 let
@@ -47,14 +45,15 @@ in
     time.timeZone = mkDefault "US/Pacific";
 
     nix = {
-      nixPath = mkForce [ "nixpkgs=${inputs.nixpkgs}" ];
       settings = {
         auto-optimise-store = true;
+        nix-path = mkForce [ "nixpkgs=${pkgs.path}" ];
         experimental-features = [
           "nix-command"
           "flakes"
           "pipe-operators"
         ];
+
         warn-dirty = false;
 
         # timeout fast from binary cache
@@ -64,10 +63,7 @@ in
         automatic = true;
         options = mkDefault "--delete-older-than 30d";
       };
-      registry = {
-        nixpkgs.flake = inputs.nixpkgs;
-        depot.flake = flake;
-      };
+      registry.nixpkgs.flake.outPath = pkgs.path;
     };
 
     documentation = {
@@ -104,6 +100,9 @@ in
           "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFmWInQNT6EoU1NtUYzTs5jtpfbO/m6yvCckOiEGjvDc";
       };
       extraConfig = ''
+        Host *
+          SetEnv TERM=xterm-256color
+
         Host github
           HostName github.com
           User git
@@ -122,6 +121,11 @@ in
         Host ee
           HostName pascal.ee.ryerson.ca
           User kbujari
+
+        Host src
+          HostName src.web.4kb.net
+          User git
+          PreferredAuthentications publickey
       '';
     };