From 8b0d618672d536a13180f5860c8918121a9fdc4f Mon Sep 17 00:00:00 2001
From: Oliver Davies <oliver@oliverdavies.dev>
Date: Mon, 23 Sep 2024 08:49:12 +0100
Subject: [PATCH] Move NixOS modules

---
 lib/nixos/configuration.nix                 | 5 +----
 modules/nixos/default.nix                   | 1 +
 modules/nixos/desktop/default.nix           | 6 ++++++
 modules/{mixins => nixos/desktop}/fonts.nix | 2 +-
 modules/{mixins => nixos}/docker.nix        | 0
 5 files changed, 9 insertions(+), 5 deletions(-)
 create mode 100644 modules/nixos/default.nix
 create mode 100644 modules/nixos/desktop/default.nix
 rename modules/{mixins => nixos/desktop}/fonts.nix (89%)
 rename modules/{mixins => nixos}/docker.nix (100%)

diff --git a/lib/nixos/configuration.nix b/lib/nixos/configuration.nix
index 70ed52a..14c2e26 100644
--- a/lib/nixos/configuration.nix
+++ b/lib/nixos/configuration.nix
@@ -9,10 +9,7 @@ let
   username = "opdavies";
 in
 {
-  imports = [
-    ../../modules/mixins/docker.nix
-    ../../modules/mixins/fonts.nix
-  ];
+  imports = [ ../../modules/nixos/desktop ];
 
   nixpkgs.config = {
     allowUnfree = true;
diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix
new file mode 100644
index 0000000..b982d10
--- /dev/null
+++ b/modules/nixos/default.nix
@@ -0,0 +1 @@
+{ imports = [ ./docker.nix ]; }
diff --git a/modules/nixos/desktop/default.nix b/modules/nixos/desktop/default.nix
new file mode 100644
index 0000000..771466d
--- /dev/null
+++ b/modules/nixos/desktop/default.nix
@@ -0,0 +1,6 @@
+{
+  imports = [
+    ../.
+    ./fonts.nix
+  ];
+}
diff --git a/modules/mixins/fonts.nix b/modules/nixos/desktop/fonts.nix
similarity index 89%
rename from modules/mixins/fonts.nix
rename to modules/nixos/desktop/fonts.nix
index b4ed19e..e523846 100644
--- a/modules/mixins/fonts.nix
+++ b/modules/nixos/desktop/fonts.nix
@@ -1,7 +1,7 @@
 { pkgs, ... }:
 
 let
-  theme = import ../../lib/theme { inherit pkgs; };
+  theme = import ../../../lib/theme { inherit pkgs; };
 in
 {
   fonts = {
diff --git a/modules/mixins/docker.nix b/modules/nixos/docker.nix
similarity index 100%
rename from modules/mixins/docker.nix
rename to modules/nixos/docker.nix