From 9db6440dab75835cbcb30a1755a32f450f29046e Mon Sep 17 00:00:00 2001 From: Jean-Pierre PRUNARET Date: Fri, 29 Jul 2016 12:04:58 +0200 Subject: [PATCH] activation des base et desktop --- base.nix | 11 +++-------- desktop/desktop.nix | 2 +- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/base.nix b/base.nix index de581ad..1af8358 100644 --- a/base.nix +++ b/base.nix @@ -1,13 +1,8 @@ -{ config, lib, pkgs, ... }: +{ ... }: -let - inherit (lib) mkIf; - cfg = config.r6d.config-generator; - computers = config.r6d.computers; - profiles = config.r6d.profiles; -in { +{ imports = [ ./base/base.nix - (mkIf (profiles.isDesktop) ./desktop/desktop.nix) + ./desktop/desktop.nix ]; } diff --git a/desktop/desktop.nix b/desktop/desktop.nix index 3f135e4..2cf04fe 100644 --- a/desktop/desktop.nix +++ b/desktop/desktop.nix @@ -1,4 +1,4 @@ -{ config, libs, pkgs, ... }: +{ config, pkgs, ... }: { imports = [ # applications :