From a2070deda9b6cbe1b366bfa6b2dd5fb88e774d0b Mon Sep 17 00:00:00 2001
From: Daniel Flanagan <daniel@lyte.dev>
Date: Fri, 6 Oct 2023 01:11:27 -0500
Subject: [PATCH] Prep for macos

---
 modules/home-manager/default.nix       |  1 +
 modules/home-manager/desktop.nix       |  1 -
 modules/home-manager/linux-desktop.nix | 10 ++++++++++
 modules/home-manager/sway.nix          |  2 +-
 modules/nixos/common.nix               |  8 +++-----
 5 files changed, 15 insertions(+), 7 deletions(-)
 create mode 100644 modules/home-manager/linux-desktop.nix

diff --git a/modules/home-manager/default.nix b/modules/home-manager/default.nix
index 9463aab..972e0b4 100644
--- a/modules/home-manager/default.nix
+++ b/modules/home-manager/default.nix
@@ -20,6 +20,7 @@
   waybar = import ./waybar.nix;
   swaylock = import ./swaylock.nix;
   desktop = import ./desktop.nix;
+  linux-desktop = import ./linux-desktop.nix;
   sway = import ./sway.nix;
 
   dragon = import ./dragon.nix;
diff --git a/modules/home-manager/desktop.nix b/modules/home-manager/desktop.nix
index 05eb717..be70a7a 100644
--- a/modules/home-manager/desktop.nix
+++ b/modules/home-manager/desktop.nix
@@ -5,7 +5,6 @@
 }: {
   imports = with outputs.homeManagerModules; [
     kitty
-    firefox
   ];
 
   gtk = {
diff --git a/modules/home-manager/linux-desktop.nix b/modules/home-manager/linux-desktop.nix
new file mode 100644
index 0000000..d35a381
--- /dev/null
+++ b/modules/home-manager/linux-desktop.nix
@@ -0,0 +1,10 @@
+{
+  outputs,
+  # font,
+  ...
+}: {
+  imports = with outputs.homeManagerModules; [
+    desktop
+    firefox
+  ];
+}
diff --git a/modules/home-manager/sway.nix b/modules/home-manager/sway.nix
index 15370c1..d49ab1f 100644
--- a/modules/home-manager/sway.nix
+++ b/modules/home-manager/sway.nix
@@ -12,7 +12,7 @@
     waybar
     mako
     swaylock
-    desktop
+    linux-desktop
   ];
 
   home.pointerCursor = {
diff --git a/modules/nixos/common.nix b/modules/nixos/common.nix
index a78d355..76e340b 100644
--- a/modules/nixos/common.nix
+++ b/modules/nixos/common.nix
@@ -5,11 +5,9 @@
   colors,
   # outputs,
   system,
+  pkgs,
   ...
-}: let
-  pkgs = inputs.nixpkgs-stable.legacyPackages.${system};
-  unstable-pkgs = inputs.nixpkgs-unstable.legacyPackages.${system};
-in {
+}: {
   imports = [
     inputs.home-manager.nixosModules.home-manager
   ];
@@ -26,7 +24,7 @@ in {
       MANPAGER = "less";
     };
 
-    systemPackages = with unstable-pkgs;
+    systemPackages = with pkgs;
       [
         age
         bat