From 98a47d867ea49d7b0a99b3d3e46fc30eb3933cb8 Mon Sep 17 00:00:00 2001
From: Oliver Davies <oliver@oliverdavies.uk>
Date: Wed, 22 Mar 2023 23:47:48 +0000
Subject: [PATCH] refactor: change `configuration` to `system`

---
 configuration/pop-os/default.nix              | 22 -------------------
 configuration/wsl2/default.nix                | 11 ----------
 flake.nix                                     |  6 ++---
 .../nixos}/apollo/configuration.nix           |  0
 {nixos => system/nixos}/apollo/default.nix    |  0
 .../nixos}/apollo/hardware-configuration.nix  |  0
 system/pop-os.nix                             | 22 +++++++++++++++++++
 {configuration => system}/shared/nixpkgs.nix  |  0
 {configuration => system}/shared/overlays.nix |  0
 system/wsl2.nix                               | 11 ++++++++++
 10 files changed, 36 insertions(+), 36 deletions(-)
 delete mode 100644 configuration/pop-os/default.nix
 delete mode 100644 configuration/wsl2/default.nix
 rename {nixos => system/nixos}/apollo/configuration.nix (100%)
 rename {nixos => system/nixos}/apollo/default.nix (100%)
 rename {nixos => system/nixos}/apollo/hardware-configuration.nix (100%)
 create mode 100644 system/pop-os.nix
 rename {configuration => system}/shared/nixpkgs.nix (100%)
 rename {configuration => system}/shared/overlays.nix (100%)
 create mode 100644 system/wsl2.nix

diff --git a/configuration/pop-os/default.nix b/configuration/pop-os/default.nix
deleted file mode 100644
index 7b49010..0000000
--- a/configuration/pop-os/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ pkgs, ... }:
-
-let
-  nixpkgs = import ../shared/nixpkgs.nix { };
-in
-{
-  imports = [
-    ../../home-manager/modules/common.nix
-    ../../home-manager/modules/git.nix
-    ../../home-manager/modules/home-manager.nix
-    ../../home-manager/modules/tmux.nix
-    ../../home-manager/modules/zsh.nix
-  ];
-
-  nixpkgs = nixpkgs;
-
-  fonts.fontconfig.enable = true;
-
-  home.packages = with pkgs; [
-    jetbrains-mono
-  ];
-}
diff --git a/configuration/wsl2/default.nix b/configuration/wsl2/default.nix
deleted file mode 100644
index de6afe3..0000000
--- a/configuration/wsl2/default.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-{
-  imports = [
-    ../../home-manager/modules/common.nix
-    ../../home-manager/modules/git.nix
-    ../../home-manager/modules/home-manager.nix
-    ../../home-manager/modules/tmux.nix
-    ../../home-manager/modules/zsh.nix
-  ];
-}
diff --git a/flake.nix b/flake.nix
index 34fa244..d01e2ac 100644
--- a/flake.nix
+++ b/flake.nix
@@ -19,7 +19,7 @@
       apollo = nixpkgs.lib.nixosSystem {
         system = "x86_64-linux";
         modules = [
-          ./nixos/apollo/configuration.nix
+          ./system/nixos/apollo/configuration.nix
           { nixpkgs.overlays = overlays; }
           home-manager.nixosModules.home-manager {
             home-manager.useGlobalPkgs = true;
@@ -34,7 +34,7 @@
       pop-os = home-manager.lib.homeManagerConfiguration {
         modules = [     
           { nixpkgs.overlays = overlays; }
-          ./configuration/pop-os
+          ./system/pop-os.nix
         ];
         pkgs = nixpkgs.legacyPackages.x86_64-linux;
       };
@@ -42,7 +42,7 @@
       wsl2 = home-manager.lib.homeManagerConfiguration {
         modules = [     
           { nixpkgs.overlays = overlays; }
-          ./configuration/wsl2
+          ./system/wsl2.nix
         ];
         pkgs = nixpkgs.legacyPackages.x86_64-linux;
       };
diff --git a/nixos/apollo/configuration.nix b/system/nixos/apollo/configuration.nix
similarity index 100%
rename from nixos/apollo/configuration.nix
rename to system/nixos/apollo/configuration.nix
diff --git a/nixos/apollo/default.nix b/system/nixos/apollo/default.nix
similarity index 100%
rename from nixos/apollo/default.nix
rename to system/nixos/apollo/default.nix
diff --git a/nixos/apollo/hardware-configuration.nix b/system/nixos/apollo/hardware-configuration.nix
similarity index 100%
rename from nixos/apollo/hardware-configuration.nix
rename to system/nixos/apollo/hardware-configuration.nix
diff --git a/system/pop-os.nix b/system/pop-os.nix
new file mode 100644
index 0000000..c264a92
--- /dev/null
+++ b/system/pop-os.nix
@@ -0,0 +1,22 @@
+{ pkgs, ... }:
+
+let
+  nixpkgs = import ./shared/nixpkgs.nix { };
+in
+{
+  imports = [
+    ../home-manager/modules/common.nix
+    ../home-manager/modules/git.nix
+    ../home-manager/modules/home-manager.nix
+    ../home-manager/modules/tmux.nix
+    ../home-manager/modules/zsh.nix
+  ];
+
+  nixpkgs = nixpkgs;
+
+  fonts.fontconfig.enable = true;
+
+  home.packages = with pkgs; [
+    jetbrains-mono
+  ];
+}
diff --git a/configuration/shared/nixpkgs.nix b/system/shared/nixpkgs.nix
similarity index 100%
rename from configuration/shared/nixpkgs.nix
rename to system/shared/nixpkgs.nix
diff --git a/configuration/shared/overlays.nix b/system/shared/overlays.nix
similarity index 100%
rename from configuration/shared/overlays.nix
rename to system/shared/overlays.nix
diff --git a/system/wsl2.nix b/system/wsl2.nix
new file mode 100644
index 0000000..ff8cddc
--- /dev/null
+++ b/system/wsl2.nix
@@ -0,0 +1,11 @@
+{ config, lib, pkgs, ... }:
+
+{
+  imports = [
+    ../home-manager/modules/common.nix
+    ../home-manager/modules/git.nix
+    ../home-manager/modules/home-manager.nix
+    ../home-manager/modules/tmux.nix
+    ../home-manager/modules/zsh.nix
+  ];
+}