hosts/common/common.nix

@@ -4,13 +4,19 @@
   imports =
     [
       inputs.home-manager.nixosModules.home-manager
-      ../../modules/nix/default.nix
+      ../../modules/nix/audio/pipewire.nix
+      ../../modules/nix/locales.nix
+      ../../modules/nix/hardware/grub.nix
+      ../../modules/nix/base-cli/nvf.nix
+      ../../modules/nix/base-cli/nh.nix
     ];
 
   smayzy.virt.enable = true;
 
   smayzy.nh.enable = true;
 
+  smayzy.locales.enable = true;
+  
   smayzy.nvf.enable = true;
 
   smayzy.audio.enable = true;

hosts/desktop1/configuration.nix

@@ -5,6 +5,8 @@
     [
       ../common/common.nix
       ./hardware-configuration.nix
+      ../../modules/nix/hardware/nvidia.nix
+      ../../modules/nix/virt.nix
     ];
 
   smayzy.nvidia.enable = true;

modules/nix/audio/default.nix

@@ -1,6 +0,0 @@
-{ lib, config, pkgs, ... }:
-{
-  imports = [
-    ./pipewire.nix
-  ];
-}

modules/nix/base-cli/default.nix

@@ -1,7 +0,0 @@
-{ lib, config, pkgs, ... }:
-{
-  imports = [
-    ./nh.nix
-    ./nvf.nix
-  ];
-}

modules/nix/default.nix

@@ -1,13 +0,0 @@
-{ lib, config, pkgs, ... }:
-{
-  imports = [
-    ./audio
-    ./base-cli
-    ./hardware
-    ./virt
-  ];
-
-  # Timzone and locales (same for all machines so I put it here)
-  i18n.defaultLocale = "en_US.UTF-8";
-  time.timeZone = "Europe/Paris";
-}

modules/nix/hardware/default.nix

@@ -1,7 +0,0 @@
-{ lib, config, pkgs, ... }:
-{
-  imports = [
-    ./nvidia.nix
-    ./grub.nix
-  ];
-}

modules/nix/locales.nix

@@ -0,0 +1,25 @@
+{ config, lib, pkgs, ... }:
+let
+  inherit (lib) mkIf mkOption types;
+in
+{
+  options.smayzy.locales.enable = mkOption {
+    type = types.bool;
+    default = false;
+    description = "set my locales & TZ";
+  };
+  config = mkIf config.smayzy.locales.enable {
+    i18n.defaultLocale = "en_US.UTF-8";
+    i18n.extraLocaleSettings = {
+      LC_ADDRESS = "fr_FR.UTF-8";
+      LC_IDENTIFICATION = "fr_FR.UTF-8";
+      LC_MEASUREMENT = "fr_FR.UTF-8";
+      LC_MONETARY = "fr_FR.UTF-8";
+      LC_NAME = "fr_FR.UTF-8";
+      LC_NUMERIC = "fr_FR.UTF-8";
+      LC_PAPER = "fr_FR.UTF-8";
+      LC_TELEPHONE = "fr_FR.UTF-8";
+    };
+    time.timeZone = "Europe/Paris";
+    };
+}

modules/nix/virt/default.nix

@@ -1,6 +0,0 @@
-{ lib, config, pkgs, ... }:
-{
-  imports = [
-    ./qemu.nix
-  ];
-}