Add unstable thunderbird with home-manager

This commit is contained in:
Dave Gallant
2023-07-14 08:24:12 -04:00
parent f0fc984686
commit 2a96f54721
7 changed files with 26 additions and 13 deletions

16
flake.lock generated
View File

@@ -61,11 +61,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1689060619, "lastModified": 1689320556,
"narHash": "sha256-vODUkZLWFVCvo1KPK3dC2CbXjxa9antEn5ozwlcTr48=", "narHash": "sha256-vODUkZLWFVCvo1KPK3dC2CbXjxa9antEn5ozwlcTr48=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "44bc025007e5fcc10dbc3d9f96dcbf06fc0e8c1c", "rev": "d4ea64f2063820120c05f6ba93ee02e6d4671d6b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -89,18 +89,18 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-latest": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1689292917, "lastModified": 1689261696,
"narHash": "sha256-yr7Bk4U43HP9oYAGY5xFhfSPJG7/E8qhn8OEhDuov4A=", "narHash": "sha256-LzfUtFs9MQRvIoQ3MfgSuipBVMXslMPH/vZ+nM40LkA=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "fa32e3cbaef088952b61e48a6fbfaa37c604cce1", "rev": "df1eee2aa65052a18121ed4971081576b25d6b5c",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "master", "ref": "nixpkgs-unstable",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
@@ -128,7 +128,7 @@
"nix-ld": "nix-ld", "nix-ld": "nix-ld",
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs_2", "nixpkgs": "nixpkgs_2",
"nixpkgs-latest": "nixpkgs-latest" "nixpkgs-unstable": "nixpkgs-unstable"
} }
} }
}, },

View File

@@ -3,7 +3,7 @@
inputs = { inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.05"; 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.url = "github:nix-community/home-manager/release-23.05";
home-manager.inputs.nixpkgs.follows = "nixpkgs"; home-manager.inputs.nixpkgs.follows = "nixpkgs";

View File

@@ -1,6 +1,7 @@
{ {
lib, lib,
pkgs, pkgs,
unstable,
... ...
}: let }: let
hound-nvim = pkgs.vimUtils.buildVimPlugin { hound-nvim = pkgs.vimUtils.buildVimPlugin {
@@ -444,6 +445,16 @@ in {
]; ];
}; };
thunderbird = {
enable = stdenv.isLinux;
package = unstable.thunderbird;
profiles = {
default = {
isDefault = true;
};
};
};
firefox = { firefox = {
enable = stdenv.isLinux; enable = stdenv.isLinux;

View File

@@ -6,7 +6,6 @@
}: let }: let
inherit (pkgs) stdenv; inherit (pkgs) stdenv;
in { in {
# System-wide packages to install.
environment.systemPackages = with pkgs; let environment.systemPackages = with pkgs; let
common = [ common = [
# classics # classics

View File

@@ -6,7 +6,6 @@
}: let }: let
inherit (pkgs) stdenv; inherit (pkgs) stdenv;
in { in {
# System-wide packages to install.
environment.systemPackages = with pkgs; let environment.systemPackages = with pkgs; let
linuxDesktop = [ linuxDesktop = [
albert albert
@@ -36,7 +35,6 @@ in {
google-cloud-sdk google-cloud-sdk
kazam kazam
legendary-gl legendary-gl
mailspring
prismlauncher prismlauncher
obs-studio obs-studio
pavucontrol pavucontrol

View File

@@ -6,7 +6,6 @@
}: let }: let
inherit (pkgs) stdenv; inherit (pkgs) stdenv;
in { in {
# System-wide packages to install.
environment.systemPackages = with pkgs; let environment.systemPackages = with pkgs; let
linux = [ linux = [
cpu-x cpu-x

View File

@@ -3,12 +3,14 @@
darwin, darwin,
home-manager, home-manager,
nixpkgs, nixpkgs,
nixpkgs-unstable,
nixos-hardware, nixos-hardware,
nix-ld, nix-ld,
... ...
} @ inputs: { } @ inputs: {
nixosConfigurations = let nixosConfigurations = let
modulesDir = ./modules; modulesDir = ./modules;
unstable = import nixpkgs-unstable {};
defaultModules = [ defaultModules = [
home-manager.nixosModules.home-manager home-manager.nixosModules.home-manager
./modules/common/fonts.nix ./modules/common/fonts.nix
@@ -53,6 +55,9 @@
useGlobalPkgs = true; useGlobalPkgs = true;
useUserPackages = true; useUserPackages = true;
users.dave.imports = [./home/default.nix]; users.dave.imports = [./home/default.nix];
extraSpecialArgs = {
inherit unstable;
};
}; };
}; };
}) })
@@ -69,6 +74,7 @@
in { in {
hephaestus = nixpkgs.lib.nixosSystem { hephaestus = nixpkgs.lib.nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
specialArgs = {inherit unstable;};
modules = modules =
[ [
./modules/machines/hephaestus/configuration.nix ./modules/machines/hephaestus/configuration.nix