commit 3bcec9b22449e78db58ae01405d42df46c19034d
parent 44efff0ae46f7ab0ec0b5bb4d0052ecc77dabdfe
Author: Vincent Demeester <vincent@sbr.pm>
Date: Mon, 25 May 2020 13:02:31 +0200
nix: clean some unusued header args
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Diffstat:
3 files changed, 2 insertions(+), 15 deletions(-)
diff --git a/configuration.nix b/configuration.nix
@@ -1,20 +1,13 @@
# This configuration file simply determines the hostname and then import both
# the default configuration (common for all machine) and specific machine
# configuration.
-{ sources ? import ../nix/sources.nix
-, pkgs ? import sources.nixos-unstable
-, ...
-}:
let
hostName = "${builtins.readFile ./hostname}";
- sources = import ./nix/sources.nix;
in
{
- imports = with sources; [
+ imports = [
# Generated hardware configuration
./hardware-configuration.nix
- # Load home-manager nixos module
- "${home-manager}/nixos"
# Default profile with default configuration
./modules/module-list.nixos.nix
# Set the machine to nixos
diff --git a/home.nix b/home.nix
@@ -1,13 +1,12 @@
# This configuration file simply determines the hostname and then import both
# the default configuration (common for all machine) and specific machine
# configuration.
-{ sources ? import ../nix/sources.nix
+{ sources ? import ./nix/sources.nix
, pkgs ? import sources.nixpkgs { }
, ...
}:
let
hostName = "${builtins.readFile ./hostname}";
- sources = import ./nix/sources.nix;
in
{
programs = {
diff --git a/machines/wakasu.nixos.nix b/machines/wakasu.nixos.nix
@@ -1,8 +1,3 @@
-{ sources ? import ../nix/sources.nix
-, pkgs ? import sources.nixos { }
-, ...
-}:
-
with import ../assets/machines.nix; {
imports = [ ../hardware/lenovo-p50.nix ./home.nixos.nix ];
boot = {