From 570349e80ffe18f991593e74642b738119411117 Mon Sep 17 00:00:00 2001
From: Bruno BELANYI <bruno@belanyi.fr>
Date: Thu, 9 Nov 2023 13:47:30 +0000
Subject: [PATCH] nixos: profiles: move from top-level

My profiles are actually just "special" NixOS modules in that they
orchestrate settings that usually span the NixOS/home-manager boundary,
or otherwise set up configurations from multiple modules at once.
---
 flake/nixos.nix                                            | 2 --
 modules/nixos/default.nix                                  | 1 +
 {profiles => modules/nixos/profiles}/bluetooth/default.nix | 0
 {profiles => modules/nixos/profiles}/default.nix           | 0
 {profiles => modules/nixos/profiles}/devices/default.nix   | 0
 {profiles => modules/nixos/profiles}/gtk/default.nix       | 0
 {profiles => modules/nixos/profiles}/laptop/default.nix    | 0
 {profiles => modules/nixos/profiles}/wm/default.nix        | 0
 {profiles => modules/nixos/profiles}/x/default.nix         | 0
 9 files changed, 1 insertion(+), 2 deletions(-)
 rename {profiles => modules/nixos/profiles}/bluetooth/default.nix (100%)
 rename {profiles => modules/nixos/profiles}/default.nix (100%)
 rename {profiles => modules/nixos/profiles}/devices/default.nix (100%)
 rename {profiles => modules/nixos/profiles}/gtk/default.nix (100%)
 rename {profiles => modules/nixos/profiles}/laptop/default.nix (100%)
 rename {profiles => modules/nixos/profiles}/wm/default.nix (100%)
 rename {profiles => modules/nixos/profiles}/x/default.nix (100%)

diff --git a/flake/nixos.nix b/flake/nixos.nix
index 541e658..fe124d7 100644
--- a/flake/nixos.nix
+++ b/flake/nixos.nix
@@ -14,8 +14,6 @@ let
     }
     # Include generic settings
     "${self}/modules/nixos"
-    # Include bundles of settings
-    "${self}/profiles"
   ];
 
   buildHost = name: system: lib.nixosSystem {
diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix
index 2eaa2e6..3648631 100644
--- a/modules/nixos/default.nix
+++ b/modules/nixos/default.nix
@@ -5,6 +5,7 @@
   imports = [
     ./hardware
     ./home
+    ./profiles
     ./programs
     ./secrets
     ./services
diff --git a/profiles/bluetooth/default.nix b/modules/nixos/profiles/bluetooth/default.nix
similarity index 100%
rename from profiles/bluetooth/default.nix
rename to modules/nixos/profiles/bluetooth/default.nix
diff --git a/profiles/default.nix b/modules/nixos/profiles/default.nix
similarity index 100%
rename from profiles/default.nix
rename to modules/nixos/profiles/default.nix
diff --git a/profiles/devices/default.nix b/modules/nixos/profiles/devices/default.nix
similarity index 100%
rename from profiles/devices/default.nix
rename to modules/nixos/profiles/devices/default.nix
diff --git a/profiles/gtk/default.nix b/modules/nixos/profiles/gtk/default.nix
similarity index 100%
rename from profiles/gtk/default.nix
rename to modules/nixos/profiles/gtk/default.nix
diff --git a/profiles/laptop/default.nix b/modules/nixos/profiles/laptop/default.nix
similarity index 100%
rename from profiles/laptop/default.nix
rename to modules/nixos/profiles/laptop/default.nix
diff --git a/profiles/wm/default.nix b/modules/nixos/profiles/wm/default.nix
similarity index 100%
rename from profiles/wm/default.nix
rename to modules/nixos/profiles/wm/default.nix
diff --git a/profiles/x/default.nix b/modules/nixos/profiles/x/default.nix
similarity index 100%
rename from profiles/x/default.nix
rename to modules/nixos/profiles/x/default.nix