From 75968e28eb389b9de1438ee48c056f21f6914d8e Mon Sep 17 00:00:00 2001
From: Emmet <librephoenix3@pm.me>
Date: Wed, 21 Jun 2023 10:02:59 -0500
Subject: [PATCH] Created window manager variable (even tho I only have one wm
 atm)

---
 flake.nix                       | 8 +++++++-
 profiles/work/configuration.nix | 4 ++--
 profiles/work/home.nix          | 4 ++--
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/flake.nix b/flake.nix
index 88544284..a827d7b5 100644
--- a/flake.nix
+++ b/flake.nix
@@ -15,11 +15,15 @@
     email = "librephoenix3@pm.me"; # email (used for certain configurations)
     dotfilesDir = "~/.dotfiles"; # absolute path of the repo
     theme = "ayu-dark"; # selcted theme from my themes directory
+    wm = "xmonad"; # Selected window manager or desktop environment
 
     # ---- CALCULATIONS ----- #
     profileWithSlash = "/" + profile; # I honestly don't know why this is necessary
+    wmWithSlash = "/" + wm; # Don't understand this either
     homeNixPath = ./. + "/profiles" + profileWithSlash + "/home.nix";
     configurationNixPath = ./. + "/profiles" + profileWithSlash + "/configuration.nix";
+    systemWMNixPath = ./. + "/system/wm" + wmWithSlash + ".nix";
+    userWMNixPath = ./. + "/user/wm" + wmWithSlash + wmWithSlash + ".nix";
 
     themePolarityPath = "/themes/"+theme+"/polarity.txt";
     themePolarity = lib.removeSuffix "\n" (builtins.readFile (./. + themePolarityPath));
@@ -49,6 +53,7 @@
             myHomeDir = "/home/"+name;
             myEmail = email;
             myDotfilesDir = dotfilesDir;
+            inherit userWMNixPath;
             myTheme = theme;
             myThemePolarity = themePolarity;
             myBackgroundUrl = backgroundUrl;
@@ -67,10 +72,11 @@
         modules = [ configurationNixPath ];
         specialArgs = {
           myName = name;
-          myTheme = theme;
           myHostname = hostname;
           myTimezone = timezone;
           myLocale = locale;
+          inherit systemWMNixPath;
+          myTheme = theme;
           myThemePolarity = themePolarity;
           myBackgroundUrl = backgroundUrl;
           myBackgroundSha256 = backgroundSha256;
diff --git a/profiles/work/configuration.nix b/profiles/work/configuration.nix
index e2e4ffe7..061e7b9e 100644
--- a/profiles/work/configuration.nix
+++ b/profiles/work/configuration.nix
@@ -2,7 +2,7 @@
 # your system.  Help is available in the configuration.nix(5) man page
 # and in the NixOS manual (accessible by running ‘nixos-help’).
 
-{ config, lib, pkgs, blocklist-hosts, myName, myHostname, myTimezone, myLocale, myTheme, myBackgroundUrl, myBackgroundSha256, ... }:
+{ config, lib, pkgs, blocklist-hosts, myName, myHostname, myTimezone, myLocale, systemWMNixPath, myTheme, myBackgroundUrl, myBackgroundSha256, ... }:
 {
   imports =
     [ ../../system/hardware-configuration.nix
@@ -10,7 +10,7 @@
       ../../system/hardware/opengl.nix
       ../../system/hardware/printing.nix
       ../../system/hardware/bluetooth.nix
-      ../../system/wm/xmonad.nix
+      systemWMNixPath # My window manager selected from flake
       ../../system/app/flatpak.nix
       ../../system/security/doas.nix
       ../../system/security/gpg.nix
diff --git a/profiles/work/home.nix b/profiles/work/home.nix
index f89cbf5d..1211742b 100644
--- a/profiles/work/home.nix
+++ b/profiles/work/home.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, python3Packages, nix-doom-emacs, stylix, myName, myEmail, myHomeDir, myDotfilesDir, myTheme, ... }:
+{ config, lib, pkgs, python3Packages, nix-doom-emacs, stylix, myName, myEmail, myHomeDir, myDotfilesDir, myTheme, userWMNixPath, ... }:
 
 {
   # Home Manager needs a bit of information about you and the paths it should
@@ -11,7 +11,7 @@
   imports = [
               nix-doom-emacs.hmModule
               stylix.homeManagerModules.stylix
-              ../../user/wm/xmonad/xmonad.nix # My xmonad config
+              userWMNixPath # My window manager selected from flake
               ../../user/shell/sh.nix # My zsh and bash config
               ../../user/shell/cli-collection.nix # Useful CLI apps
               ../../user/bin/phoenix.nix # My nix command wrapper