From 97c67006ac6ddfc888de854b88922838c1262276 Mon Sep 17 00:00:00 2001 From: Kleidi Bujari Date: Fri, 4 Jul 2025 13:07:33 -0400 Subject: pull desktop from xnet and fix nix cli nixpkgs pin --- modules/xnet/default.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'modules/xnet/default.nix') diff --git a/modules/xnet/default.nix b/modules/xnet/default.nix index 9d224cf..0664575 100644 --- a/modules/xnet/default.nix +++ b/modules/xnet/default.nix @@ -1,4 +1,4 @@ -{ pkgs, lib, config, ... }: +{ pkgs, lib, config, flake, inputs, ... }: let inherit (builtins) fetchurl @@ -8,6 +8,7 @@ let inherit (lib) mkDefault + mkForce mkOption types splitString @@ -27,7 +28,7 @@ in ./net ./desktop ./gitserver - ./monitoring + # ./monitoring ]; options.xnet = { @@ -45,9 +46,10 @@ in boot.binfmt.emulatedSystems = [ "aarch64-linux" ]; nix = { + nixPath = mkForce [ "nixpkgs=${inputs.nixpkgs}" ]; settings = { auto-optimise-store = true; - experimental-features = [ "nix-command" "flakes" ]; + experimental-features = [ "nix-command" "flakes" "pipe-operators" ]; warn-dirty = false; # timeout fast from binary cache @@ -57,6 +59,10 @@ in automatic = true; options = mkDefault "--delete-older-than 30d"; }; + registry = { + nixpkgs.flake = inputs.nixpkgs; + depot.flake = flake; + }; }; documentation = { -- cgit v1.3.1