From ade2927e8b2b2da817fb06c20d679bb1f2c293da Mon Sep 17 00:00:00 2001
From: Toast <toast003@tutamail.com>
Date: Tue, 4 Jul 2023 08:06:17 +0200
Subject: [PATCH] Desktop: restructure folder structure

---
 roles/desktop/default.nix                  |  6 ++----
 roles/desktop/programs/default.nix         | 10 ++++++++++
 roles/desktop/{ => programs}/discord.nix   |  0
 roles/desktop/{ => programs}/firefox.nix   |  0
 roles/desktop/{ => programs}/keepassxc.nix |  0
 roles/desktop/{ => programs}/micro.nix     |  0
 roles/desktop/services/default.nix         |  7 +++++++
 7 files changed, 19 insertions(+), 4 deletions(-)
 mode change 100755 => 100644 roles/desktop/default.nix
 create mode 100755 roles/desktop/programs/default.nix
 rename roles/desktop/{ => programs}/discord.nix (100%)
 rename roles/desktop/{ => programs}/firefox.nix (100%)
 rename roles/desktop/{ => programs}/keepassxc.nix (100%)
 rename roles/desktop/{ => programs}/micro.nix (100%)
 create mode 100644 roles/desktop/services/default.nix

diff --git a/roles/desktop/default.nix b/roles/desktop/default.nix
old mode 100755
new mode 100644
index 6aa4825..cb3d38f
--- a/roles/desktop/default.nix
+++ b/roles/desktop/default.nix
@@ -2,9 +2,7 @@
 
 {
 	imports = [
-		./discord.nix
-		./firefox.nix
-		./micro.nix
-		./keepassxc.nix
+		./services
+		./programs
 	];
 }
diff --git a/roles/desktop/programs/default.nix b/roles/desktop/programs/default.nix
new file mode 100755
index 0000000..6aa4825
--- /dev/null
+++ b/roles/desktop/programs/default.nix
@@ -0,0 +1,10 @@
+{ ... }:
+
+{
+	imports = [
+		./discord.nix
+		./firefox.nix
+		./micro.nix
+		./keepassxc.nix
+	];
+}
diff --git a/roles/desktop/discord.nix b/roles/desktop/programs/discord.nix
similarity index 100%
rename from roles/desktop/discord.nix
rename to roles/desktop/programs/discord.nix
diff --git a/roles/desktop/firefox.nix b/roles/desktop/programs/firefox.nix
similarity index 100%
rename from roles/desktop/firefox.nix
rename to roles/desktop/programs/firefox.nix
diff --git a/roles/desktop/keepassxc.nix b/roles/desktop/programs/keepassxc.nix
similarity index 100%
rename from roles/desktop/keepassxc.nix
rename to roles/desktop/programs/keepassxc.nix
diff --git a/roles/desktop/micro.nix b/roles/desktop/programs/micro.nix
similarity index 100%
rename from roles/desktop/micro.nix
rename to roles/desktop/programs/micro.nix
diff --git a/roles/desktop/services/default.nix b/roles/desktop/services/default.nix
new file mode 100644
index 0000000..c6786ec
--- /dev/null
+++ b/roles/desktop/services/default.nix
@@ -0,0 +1,7 @@
+{ ... }:
+
+{
+	imports = [
+
+	];
+}