harmonisation des headers pour public/

public/app-awesome.nix

@@ -5,7 +5,9 @@ let
   cfg = config.r6d.config-generator;
   computers = config.r6d.computers;
   profiles = config.r6d.profiles;
-in mkIf cfg.awesome {
+in
+
+mkIf cfg.awesome {
 
   environment.variables = {
     # Export the current path for the awesome derivation, useful for users rc.lua

public/app-docker.nix

@@ -5,8 +5,9 @@ let
   cfg = config.r6d.config-generator;
   computers = config.r6d.computers;
   profiles = config.r6d.profiles;
+in
 
-in mkIf cfg.docker {
+mkIf cfg.docker {
 
   environment.systemPackages = with pkgs; [
     # Ecosystème Docker

public/app-jeux.nix

@@ -5,8 +5,9 @@ let
   cfg = config.r6d.config-generator;
   computers = config.r6d.computers;
   profiles = config.r6d.profiles;
+in
 
-in mkIf cfg.jeux {
+mkIf cfg.jeux {
 
   environment.systemPackages = with pkgs; [
     # Jeux

public/app-virtualbox.nix

@@ -5,8 +5,9 @@ let
   cfg = config.r6d.config-generator;
   computers = config.r6d.computers;
   profiles = config.r6d.profiles;
+in
 
-in mkIf cfg.virtualbox {
+mkIf cfg.virtualbox {
 
   environment.systemPackages = with pkgs; [
     linuxPackages.virtualbox

public/auto-upgrade.nix

@@ -1,12 +1,15 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
-
-with pkgs.lib;
 
 let
+  inherit (lib) mkIf;
   cfg = config.r6d.config-generator;
-in {
+  computers = config.r6d.computers;
+  profiles = config.r6d.profiles;
+in
+
+mkIf cfg.auto-upgrade {
   # Automatic update & automatic clean
 
-  system.autoUpgrade.enable = cfg.auto-upgrade;
+  system.autoUpgrade.enable = true;
-  nix.gc.automatic = cfg.auto-upgrade;
+  nix.gc.automatic = true;
 }

public/laptop.nix

@@ -1,10 +1,14 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
-
-with pkgs.lib;
 
 let
+  inherit (lib) mkIf;
   cfg = config.r6d.config-generator;
-in {
+  computers = config.r6d.computers;
+  profiles = config.r6d.profiles;
+in
+
+mkIf cfg.laptop {
+
   # Gestion spécifique pour PC portable
-  powerManagement.cpuFreqGovernor = mkIf cfg.laptop "powersave";
+  powerManagement.cpuFreqGovernor = "powersave";
 }

public/locate.nix

@@ -1,15 +1,16 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
-
-with pkgs.lib;
 
 let
+  inherit (lib) mkIf;
   cfg = config.r6d.config-generator;
-in {
+  computers = config.r6d.computers;
-  imports = [
+  profiles = config.r6d.profiles;
-  ];
+in
+
+mkIf cfg.locate {
 
   services.locate = {
-    enable = cfg.locate;
+    enable = true;
     interval = "hourly";
   };
 }

public/print.nix

@@ -1,12 +1,15 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
-
-with pkgs.lib;
 
 let
+  inherit (lib) mkIf;
   cfg = config.r6d.config-generator;
-in {
+  computers = config.r6d.computers;
+  profiles = config.r6d.profiles;
+in
+
+mkIf cfg.print {
   # Enable CUPS to print documents.
-  services.printing = mkIf cfg.print {
+  services.printing = {
     enable = true;
     drivers = [
       pkgs.samsung-unified-linux-driver

public/swap.nix

@@ -1,14 +1,17 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
-
-with pkgs.lib;
 
 let
+  inherit (lib) mkIf;
   cfg = config.r6d.config-generator;
-in {
+  computers = config.r6d.computers;
+  profiles = config.r6d.profiles;
+in
+
+mkIf cfg.swap {
   # Gestion du swap
   
   # https://en.wikipedia.org/wiki/Swappiness
-  boot.kernel.sysctl = mkIf cfg.swap {
+  boot.kernel.sysctl = {
     # le swap est activé (!= 0)
     # le swap est utilisé lorsque (100 - x) % de la mémoire est déja allouée
     "vm.swappiness" = 10;