From 4b64dfc9faf3489637706e3a2f550611ada48d68 Mon Sep 17 00:00:00 2001 From: Sridhar Ratnakumar Date: Mon, 27 Mar 2023 14:07:31 -0400 Subject: [PATCH] Trim down flake.nix --- flake.nix | 11 ++--------- nixos/cache-server.nix | 2 +- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/flake.nix b/flake.nix index 2add81f..83ea531 100644 --- a/flake.nix +++ b/flake.nix @@ -9,14 +9,13 @@ nix-darwin.inputs.nixpkgs.follows = "nixpkgs"; home-manager.url = "github:nix-community/home-manager"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; - sops-nix.url = "github:Mic92/sops-nix"; nixos-hardware.url = "github:NixOS/nixos-hardware"; nixos-flake.url = "github:srid/nixos-flake"; # nixos-flake.url = "path:/Users/srid/code/nixos-flake"; - jenkins-nix-ci.url = "github:juspay/jenkins-nix-ci"; - # CI server + sops-nix.url = "github:Mic92/sops-nix"; + jenkins-nix-ci.url = "github:juspay/jenkins-nix-ci"; hci.url = "github:hercules-ci/hercules-ci-agent"; nix-serve-ng.url = "github:aristanetworks/nix-serve-ng"; @@ -61,12 +60,6 @@ ./nixos/server/harden.nix ./nixos/docker.nix ./nixos/jenkins.nix - # ./nixos/hercules.nix - # I host a Nix cache - # (import ./nixos/cache-server.nix { - # keyName = "cache-priv-key"; - # domain = "cache.srid.ca"; - # }) ]; sops.defaultSopsFile = ./secrets.yaml; }; diff --git a/nixos/cache-server.nix b/nixos/cache-server.nix index e11ded1..d20ea18 100644 --- a/nixos/cache-server.nix +++ b/nixos/cache-server.nix @@ -1,4 +1,4 @@ -{ keyName, domain }: +{ domain }: { pkgs, lib, config, flake, ... }: {