From 6a6439daa929e534fec580a39cbd69087f5f43f2 Mon Sep 17 00:00:00 2001
From: Dylan Taylor <dylan@dylanmtaylor.com>
Date: Thu, 8 Apr 2021 21:08:17 -0400
Subject: Move more logic into common profile

---
 profiles/i3-gaps.py | 8 +-------
 profiles/i3-wm.py   | 7 +------
 profiles/i3.py      | 9 +++++++++
 3 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/profiles/i3-gaps.py b/profiles/i3-gaps.py
index e900117a..d6308ad5 100644
--- a/profiles/i3-gaps.py
+++ b/profiles/i3-gaps.py
@@ -31,13 +31,7 @@ def _post_install(*args, **kwargs):
 	
 	return True
 
-if __name__ == 'i3-wm':
-	# Install dependency profiles
-    installation.install_profile('xorg')
-    # gaps is installed by deafult so we are overriding it here
-    installation.add_additional_packages("lightdm-gtk-greeter lightdm")
+if __name__ == 'i3-gaps':
     # install the i3 group now
     i3 = archinstall.Application(installation, 'i3-gaps')
     i3.install()
-    # Auto start lightdm for all users
-    installation.enable_service('lightdm')
diff --git a/profiles/i3-wm.py b/profiles/i3-wm.py
index a2449e39..c4c05ec9 100644
--- a/profiles/i3-wm.py
+++ b/profiles/i3-wm.py
@@ -17,6 +17,7 @@ def _prep_function(*args, **kwargs):
 			return imported._prep_function()
 		else:
 			print('Deprecated (??): xorg profile has no _prep_function() anymore')
+
 def _post_install(*args, **kwargs):
 	"""
 	Another magic function called after the system 
@@ -31,12 +32,6 @@ def _post_install(*args, **kwargs):
 	return True
 
 if __name__ == 'i3-wm':
-    # Install dependency profiles
-    installation.install_profile('xorg')
-    # we are installing lightdm to auto start i3
-    installation.add_additional_packages("lightdm-gtk-greeter lightdm")
     # install the i3 group now
     i3 = archinstall.Application(installation, 'i3-wm')
     i3.install()
-    # Auto start lightdm for all users
-    installation.enable_service('lightdm')
diff --git a/profiles/i3.py b/profiles/i3.py
index b9d7495e..c08f4d89 100644
--- a/profiles/i3.py
+++ b/profiles/i3.py
@@ -49,6 +49,15 @@ if __name__ == 'i3':
 	# Install common packages for all i3 configurations
 	installation.add_additional_packages(__packages__)
 
+	# Install dependency profiles
+	installation.install_profile('xorg')
+
+	# gaps is installed by deafult so we are overriding it here
+	installation.add_additional_packages("lightdm-gtk-greeter lightdm")
+
+	# Auto start lightdm for all users
+	installation.enable_service('lightdm')
+
 	# TODO: Remove magic variable 'installation' and place it
 	#       in archinstall.storage or archinstall.session/archinstall.installation
 	installation.install_profile(archinstall.storage['_desktop_profile'])
-- 
cgit v1.2.3-70-g09d2