From 251eaf8a0cf1855e678f5f95709d3e03950f540d Mon Sep 17 00:00:00 2001
From: Reboot-Codes <git@reboot-codes.com>
Date: Fri, 24 Jan 2025 09:43:23 -0700
Subject: [PATCH] Better overlays

---
 common/overlays/default.nix  | 9 ++++++---
 common/overlays/discord.nix  | 4 ++--
 common/overlays/spotify.nix  | 4 ++--
 common/overlays/waydroid.nix | 4 ++--
 home-manager.nix             | 6 +++---
 5 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/common/overlays/default.nix b/common/overlays/default.nix
index 79d2a33..e4038eb 100644
--- a/common/overlays/default.nix
+++ b/common/overlays/default.nix
@@ -1,4 +1,7 @@
-[
-  ./discord.nix
-  ./spotify.nix
+let
+  discord = import ./discord.nix;
+  spotify = import ./spotify.nix;
+in [
+  discord
+  spotify
 ]
\ No newline at end of file
diff --git a/common/overlays/discord.nix b/common/overlays/discord.nix
index 1429b59..f4e7e6d 100644
--- a/common/overlays/discord.nix
+++ b/common/overlays/discord.nix
@@ -1,6 +1,6 @@
-(final: prev: {
+final: prev: {
   discord = prev.discord.override {
     # withOpenASAR = true; # This is kinda, really buggy...
     withVencord = true;
   };
-})
+}
diff --git a/common/overlays/spotify.nix b/common/overlays/spotify.nix
index 27f64d3..2824e70 100644
--- a/common/overlays/spotify.nix
+++ b/common/overlays/spotify.nix
@@ -1,4 +1,4 @@
-(final: prev: {
+final: prev: {
   spotify = prev.spotify // {
     installPhase = builtins.replaceStrings [
       "runHook postInstall"
@@ -9,4 +9,4 @@
     ]
     prev.spotify.installPhase;
   };
-})
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/common/overlays/waydroid.nix b/common/overlays/waydroid.nix
index c5c011e..47960ca 100644
--- a/common/overlays/waydroid.nix
+++ b/common/overlays/waydroid.nix
@@ -1,4 +1,4 @@
-(final: prev: {
+final: prev: {
   waydroid = prev.waydroid.overrideAttrs {
     version = "1.4.2-update-regex-for-deprecation-warning";
 
@@ -9,4 +9,4 @@
       hash = "sha256-ywlykYPLMx3cI6/7JOL0UDIcymzf0qug5A/c9JaCr+k";
     };
   };
-})
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/home-manager.nix b/home-manager.nix
index 2d41059..db4435a 100644
--- a/home-manager.nix
+++ b/home-manager.nix
@@ -4,10 +4,10 @@
     system = "x86_64-linux";
     systemType = "external";
   };
+
+  hostConfig = defaultDesktop;
 in {
-  "${hostConfig.username}" = let
-    hostConfig = defaultDesktop;
-  in home-manager.lib.homeManagerConfiguration rec {
+  "${hostConfig.username}" = home-manager.lib.homeManagerConfiguration rec {
     pkgs = nixpkgs.legacyPackages."${hostConfig.system}";
     modules = [
       ../common/home
-- 
2.51.2