From 2a96f54721f5b5a46b90f3dfef98c9ff6a0aadfa Mon Sep 17 00:00:00 2001
From: Dave Gallant <davegallant@gmail.com>
Date: Fri, 14 Jul 2023 08:24:12 -0400
Subject: [PATCH] Add unstable thunderbird with home-manager

---
 flake.lock                         | 16 ++++++++--------
 flake.nix                          |  2 +-
 home/default.nix                   | 11 +++++++++++
 modules/packages/common.nix        |  1 -
 modules/packages/linux-desktop.nix |  2 --
 modules/packages/linux.nix         |  1 -
 outputs.nix                        |  6 ++++++
 7 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/flake.lock b/flake.lock
index 6e71cb1..0865555 100644
--- a/flake.lock
+++ b/flake.lock
@@ -61,11 +61,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1689060619,
+        "lastModified": 1689320556,
         "narHash": "sha256-vODUkZLWFVCvo1KPK3dC2CbXjxa9antEn5ozwlcTr48=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "44bc025007e5fcc10dbc3d9f96dcbf06fc0e8c1c",
+        "rev": "d4ea64f2063820120c05f6ba93ee02e6d4671d6b",
         "type": "github"
       },
       "original": {
@@ -89,18 +89,18 @@
         "type": "github"
       }
     },
-    "nixpkgs-latest": {
+    "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1689292917,
-        "narHash": "sha256-yr7Bk4U43HP9oYAGY5xFhfSPJG7/E8qhn8OEhDuov4A=",
+        "lastModified": 1689261696,
+        "narHash": "sha256-LzfUtFs9MQRvIoQ3MfgSuipBVMXslMPH/vZ+nM40LkA=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "fa32e3cbaef088952b61e48a6fbfaa37c604cce1",
+        "rev": "df1eee2aa65052a18121ed4971081576b25d6b5c",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "master",
+        "ref": "nixpkgs-unstable",
         "repo": "nixpkgs",
         "type": "github"
       }
@@ -128,7 +128,7 @@
         "nix-ld": "nix-ld",
         "nixos-hardware": "nixos-hardware",
         "nixpkgs": "nixpkgs_2",
-        "nixpkgs-latest": "nixpkgs-latest"
+        "nixpkgs-unstable": "nixpkgs-unstable"
       }
     }
   },
diff --git a/flake.nix b/flake.nix
index c7fcb14..d5c4ac7 100644
--- a/flake.nix
+++ b/flake.nix
@@ -3,7 +3,7 @@
 
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.05";
-    nixpkgs-latest.url = "github:NixOS/nixpkgs/master";
+    nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
 
     home-manager.url = "github:nix-community/home-manager/release-23.05";
     home-manager.inputs.nixpkgs.follows = "nixpkgs";
diff --git a/home/default.nix b/home/default.nix
index 170388a..1259cd1 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -1,6 +1,7 @@
 {
   lib,
   pkgs,
+  unstable,
   ...
 }: let
   hound-nvim = pkgs.vimUtils.buildVimPlugin {
@@ -444,6 +445,16 @@ in {
         ];
     };
 
+    thunderbird = {
+      enable = stdenv.isLinux;
+      package = unstable.thunderbird;
+      profiles = {
+        default = {
+          isDefault = true;
+        };
+      };
+    };
+
     firefox = {
       enable = stdenv.isLinux;
 
diff --git a/modules/packages/common.nix b/modules/packages/common.nix
index a3077af..1468c35 100644
--- a/modules/packages/common.nix
+++ b/modules/packages/common.nix
@@ -6,7 +6,6 @@
 }: let
   inherit (pkgs) stdenv;
 in {
-  # System-wide packages to install.
   environment.systemPackages = with pkgs; let
     common = [
       # classics
diff --git a/modules/packages/linux-desktop.nix b/modules/packages/linux-desktop.nix
index fd3f977..df02246 100644
--- a/modules/packages/linux-desktop.nix
+++ b/modules/packages/linux-desktop.nix
@@ -6,7 +6,6 @@
 }: let
   inherit (pkgs) stdenv;
 in {
-  # System-wide packages to install.
   environment.systemPackages = with pkgs; let
     linuxDesktop = [
       albert
@@ -36,7 +35,6 @@ in {
       google-cloud-sdk
       kazam
       legendary-gl
-      mailspring
       prismlauncher
       obs-studio
       pavucontrol
diff --git a/modules/packages/linux.nix b/modules/packages/linux.nix
index 3607724..dbcc3be 100644
--- a/modules/packages/linux.nix
+++ b/modules/packages/linux.nix
@@ -6,7 +6,6 @@
 }: let
   inherit (pkgs) stdenv;
 in {
-  # System-wide packages to install.
   environment.systemPackages = with pkgs; let
     linux = [
       cpu-x
diff --git a/outputs.nix b/outputs.nix
index 6c898d6..f4bf530 100644
--- a/outputs.nix
+++ b/outputs.nix
@@ -3,12 +3,14 @@
   darwin,
   home-manager,
   nixpkgs,
+  nixpkgs-unstable,
   nixos-hardware,
   nix-ld,
   ...
 } @ inputs: {
   nixosConfigurations = let
     modulesDir = ./modules;
+    unstable = import nixpkgs-unstable {};
     defaultModules = [
       home-manager.nixosModules.home-manager
       ./modules/common/fonts.nix
@@ -53,6 +55,9 @@
             useGlobalPkgs = true;
             useUserPackages = true;
             users.dave.imports = [./home/default.nix];
+            extraSpecialArgs = {
+              inherit unstable;
+            };
           };
         };
       })
@@ -69,6 +74,7 @@
   in {
     hephaestus = nixpkgs.lib.nixosSystem {
       system = "x86_64-linux";
+      specialArgs = {inherit unstable;};
       modules =
         [
           ./modules/machines/hephaestus/configuration.nix