about summary refs log tree commit diff
diff options
context:
space:
mode:
authorFlorian Klink <flokli@flokli.de>2023-10-29T17·28+0200
committerclbot <clbot@tvl.fyi>2023-10-29T17·49+0000
commit85cd7d64fec9031f5bb806e1c55038c8c4158dbe (patch)
tree23d40497e459522901b2352d0534e37107318d0a
parent48b6242313f9ecbc49a9e768f59a966348f6446c (diff)
refactor(users/flokli): drop some optional args and complexity r/6904
Change-Id: Ifdcac829ede4ec469a7ce1b608e78bae11f2766b
Reviewed-on: https://cl.tvl.fyi/c/depot/+/9834
Autosubmit: flokli <flokli@flokli.de>
Tested-by: BuildkiteCI
Reviewed-by: edef <edef@edef.eu>
-rw-r--r--users/flokli/nixos/archeology/configuration.nix12
-rw-r--r--users/flokli/nixos/archeology/hardware-configuration.nix2
-rw-r--r--users/flokli/nixos/default.nix2
3 files changed, 7 insertions, 9 deletions
diff --git a/users/flokli/nixos/archeology/configuration.nix b/users/flokli/nixos/archeology/configuration.nix
index 9f7bebdad6d5..57875de86340 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 8410df79d205..7b3d79d70a5d 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 6a182a269e5c..412a0fae346a 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
     ];