From 85cd7d64fec9031f5bb806e1c55038c8c4158dbe Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Sun, 29 Oct 2023 19:28:07 +0200 Subject: [PATCH] refactor(users/flokli): drop some optional args and complexity Change-Id: Ifdcac829ede4ec469a7ce1b608e78bae11f2766b Reviewed-on: https://cl.tvl.fyi/c/depot/+/9834 Autosubmit: flokli Tested-by: BuildkiteCI Reviewed-by: edef --- users/flokli/nixos/archeology/configuration.nix | 12 +++++------- .../nixos/archeology/hardware-configuration.nix | 2 +- users/flokli/nixos/default.nix | 2 +- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/users/flokli/nixos/archeology/configuration.nix b/users/flokli/nixos/archeology/configuration.nix index 9f7bebdad..57875de86 100644 --- a/users/flokli/nixos/archeology/configuration.nix +++ b/users/flokli/nixos/archeology/configuration.nix @@ -1,12 +1,10 @@ -{ depot, pkgs, lib, ... }: +{ depot, pkgs, ... }: { - imports = - [ - # Include the results of the hardware scan. - # ./hardware-configuration.nix - (depot.path.origSrc + "/users/flokli/nixos/archeology/hardware-configuration.nix") - ]; + imports = [ + # Include the results of the hardware scan. + ./hardware-configuration.nix + ]; # Use the TVL binary cache tvl.cache.enable = true; diff --git a/users/flokli/nixos/archeology/hardware-configuration.nix b/users/flokli/nixos/archeology/hardware-configuration.nix index 8410df79d..7b3d79d70 100644 --- a/users/flokli/nixos/archeology/hardware-configuration.nix +++ b/users/flokli/nixos/archeology/hardware-configuration.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, modulesPath, ... }: +{ lib, modulesPath, ... }: { imports = diff --git a/users/flokli/nixos/default.nix b/users/flokli/nixos/default.nix index 6a182a269..412a0fae3 100644 --- a/users/flokli/nixos/default.nix +++ b/users/flokli/nixos/default.nix @@ -8,7 +8,7 @@ let in { - archeologySystem = (depot.ops.nixos.nixosFor ({ modulesPath, ... }: { + archeologySystem = (depot.ops.nixos.nixosFor ({ ... }: { imports = [ ./archeology/configuration.nix ];