From 155a84003c4f5e216d52bf28c07894315e3f55bc Mon Sep 17 00:00:00 2001
From: Aly Raffauf <alyraffauf@gmail.com>
Date: Sat, 16 Mar 2024 12:25:28 -0400
Subject: [PATCH] moved desktop configs into modules

---
 flake.nix                                      | 8 ++++----
 desktop/common.nix => modules/desktop.nix      | 0
 {desktop => modules}/gnome/default.nix         | 2 +-
 {desktop => modules}/gnome/triplebuffering.nix | 0
 {desktop => modules}/kde.nix                   | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)
 rename desktop/common.nix => modules/desktop.nix (100%)
 rename {desktop => modules}/gnome/default.nix (97%)
 rename {desktop => modules}/gnome/triplebuffering.nix (100%)
 rename {desktop => modules}/kde.nix (97%)

diff --git a/flake.nix b/flake.nix
index 5170864b..004fc985 100644
--- a/flake.nix
+++ b/flake.nix
@@ -38,7 +38,7 @@
           nixos-hardware.nixosModules.framework-13-7040-amd
           home-manager-unstable.nixosModules.home-manager
           ./hosts/lavaridge
-          ./desktop/gnome
+          ./modules/gnome
           ./modules/homelab/virtualization.nix
         ];
       };
@@ -50,7 +50,7 @@
           nixos-hardware.nixosModules.lenovo-thinkpad-t440p
           home-manager-unstable.nixosModules.home-manager
           ./hosts/rustboro
-          ./desktop/kde.nix
+          ./modules/kde.nix
         ];
       };
 
@@ -62,7 +62,7 @@
           nixos-hardware.nixosModules.common-cpu-intel
           home-manager-unstable.nixosModules.home-manager
           ./hosts/petalburg
-          ./desktop/gnome
+          ./modules/gnome
         ];
       };
 
@@ -73,7 +73,7 @@
           home-manager-unstable.nixosModules.home-manager
           ./hosts/mauville
           ./modules/homelab
-          ./desktop/gnome
+          ./modules/gnome
           ./modules/steam.nix
         ];
       };
diff --git a/desktop/common.nix b/modules/desktop.nix
similarity index 100%
rename from desktop/common.nix
rename to modules/desktop.nix
diff --git a/desktop/gnome/default.nix b/modules/gnome/default.nix
similarity index 97%
rename from desktop/gnome/default.nix
rename to modules/gnome/default.nix
index 9611e10e..7f886ea8 100644
--- a/desktop/gnome/default.nix
+++ b/modules/gnome/default.nix
@@ -3,7 +3,7 @@
 {
   imports =
     [ # Include X settings.
-      ../common.nix
+      ../desktop.nix
     ];
 
   # Enable Gnome and GDM.
diff --git a/desktop/gnome/triplebuffering.nix b/modules/gnome/triplebuffering.nix
similarity index 100%
rename from desktop/gnome/triplebuffering.nix
rename to modules/gnome/triplebuffering.nix
diff --git a/desktop/kde.nix b/modules/kde.nix
similarity index 97%
rename from desktop/kde.nix
rename to modules/kde.nix
index 128c7a84..ccc3e0d0 100644
--- a/desktop/kde.nix
+++ b/modules/kde.nix
@@ -3,7 +3,7 @@
 {
   imports =
     [ # Include X settings.
-      ./common.nix
+      ./desktop.nix
     ];
 
   # Enable the KDE Plasma Desktop Environment.