From 53cad0277104c1e88642396f927bf8c3a1f0603c Mon Sep 17 00:00:00 2001
From: smayzy <smayzy@smayzy.ovh>
Date: Mon, 7 Jul 2025 23:58:35 +0200
Subject: [PATCH] import individuals to default.nix

---
 hosts/common/common.nix          | 10 ++--------
 hosts/desktop1/configuration.nix |  2 --
 modules/nix/audio/default.nix    |  6 ++++++
 modules/nix/base-cli/default.nix |  7 +++++++
 modules/nix/default.nix          | 13 +++++++++++++
 modules/nix/hardware/default.nix |  7 +++++++
 modules/nix/locales.nix          | 25 -------------------------
 modules/nix/virt/default.nix     |  6 ++++++
 8 files changed, 41 insertions(+), 35 deletions(-)
 create mode 100644 modules/nix/audio/default.nix
 create mode 100644 modules/nix/base-cli/default.nix
 create mode 100644 modules/nix/default.nix
 create mode 100644 modules/nix/hardware/default.nix
 delete mode 100644 modules/nix/locales.nix
 create mode 100644 modules/nix/virt/default.nix

diff --git a/hosts/common/common.nix b/hosts/common/common.nix
index 4dd7dd3..0d4ac40 100644
--- a/hosts/common/common.nix
+++ b/hosts/common/common.nix
@@ -4,19 +4,13 @@
   imports =
     [
       inputs.home-manager.nixosModules.home-manager
-      ../../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
-    ];
+      ../../modules/nix/default.nix
+   ];
 
   smayzy.virt.enable = true;
 
   smayzy.nh.enable = true;
 
-  smayzy.locales.enable = true;
-  
   smayzy.nvf.enable = true;
 
   smayzy.audio.enable = true;
diff --git a/hosts/desktop1/configuration.nix b/hosts/desktop1/configuration.nix
index caa251d..d85b934 100644
--- a/hosts/desktop1/configuration.nix
+++ b/hosts/desktop1/configuration.nix
@@ -5,8 +5,6 @@
     [
       ../common/common.nix
       ./hardware-configuration.nix
-      ../../modules/nix/hardware/nvidia.nix
-      ../../modules/nix/virt/qemu.nix
     ];
 
   smayzy.nvidia.enable = true;
diff --git a/modules/nix/audio/default.nix b/modules/nix/audio/default.nix
new file mode 100644
index 0000000..89ec360
--- /dev/null
+++ b/modules/nix/audio/default.nix
@@ -0,0 +1,6 @@
+{ lib, config, pkgs, ... }:
+{
+  imports = [
+    ./pipewire.nix
+  ];
+}
diff --git a/modules/nix/base-cli/default.nix b/modules/nix/base-cli/default.nix
new file mode 100644
index 0000000..c502b64
--- /dev/null
+++ b/modules/nix/base-cli/default.nix
@@ -0,0 +1,7 @@
+{ lib, config, pkgs, ... }:
+{
+  imports = [
+    ./nh.nix
+    ./nvf.nix
+  ];
+}
diff --git a/modules/nix/default.nix b/modules/nix/default.nix
new file mode 100644
index 0000000..8b039ae
--- /dev/null
+++ b/modules/nix/default.nix
@@ -0,0 +1,13 @@
+{ 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";
+}
diff --git a/modules/nix/hardware/default.nix b/modules/nix/hardware/default.nix
new file mode 100644
index 0000000..11c3bf5
--- /dev/null
+++ b/modules/nix/hardware/default.nix
@@ -0,0 +1,7 @@
+{ lib, config, pkgs, ... }:
+{
+  imports = [
+    ./nvidia.nix
+    ./grub.nix
+  ];
+}
diff --git a/modules/nix/locales.nix b/modules/nix/locales.nix
deleted file mode 100644
index 4c0bd96..0000000
--- a/modules/nix/locales.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ 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";
-    };
-}
diff --git a/modules/nix/virt/default.nix b/modules/nix/virt/default.nix
new file mode 100644
index 0000000..b1ba982
--- /dev/null
+++ b/modules/nix/virt/default.nix
@@ -0,0 +1,6 @@
+{ lib, config, pkgs, ... }:
+{
+  imports = [
+    ./qemu.nix
+  ];
+}