From 405b3f995d1fda7bd0b4419ada2f616ebabff33e Mon Sep 17 00:00:00 2001
From: albert <albert@sysctl.io>
Date: Fri, 7 Mar 2025 08:07:12 -0800
Subject: [PATCH] Add unstable packages to home-manager
---
flake.lock | 42 +++++++++----------
.../common/software/gui/librewolf.nix | 3 +-
lib/default.nix | 3 +-
nixos/common/software/gui/librewolf.nix | 4 +-
nixos/hosts/framework16/default.nix | 10 ++---
5 files changed, 32 insertions(+), 30 deletions(-)
diff --git a/flake.lock b/flake.lock
index 48199fcf..caebc593 100644
--- a/flake.lock
+++ b/flake.lock
@@ -649,11 +649,11 @@
"nixpkgs": "nixpkgs"
},
"locked": {
- "lastModified": 1741273541,
- "narHash": "sha256-tsPWuE2A84Chs9gm6VYifFCe4zLC+A1xBCN2E64NoIA=",
+ "lastModified": 1741338475,
+ "narHash": "sha256-+vAXiFRQ6ykBX7iFI20rV+xMyOVNtULbFWy6BHKPP+0=",
"owner": "Jovian-Experiments",
"repo": "Jovian-NixOS",
- "rev": "571925b8525dec6eae78f658a5ec1bbcf9e1390e",
+ "rev": "1821e6ae980ff6175d28065ad6d0c87560d2b8ea",
"type": "github"
},
"original": {
@@ -788,11 +788,11 @@
},
"nixos-hardware": {
"locked": {
- "lastModified": 1741319714,
- "narHash": "sha256-FY76RS7AIVNNV0TNnd3QetkyCn7PjpP+n9YMKsTBEk4=",
+ "lastModified": 1741325094,
+ "narHash": "sha256-RUAdT8dZ6k/486vnu3tiNRrNW6+Q8uSD2Mq7gTX4jlo=",
"owner": "NixOS",
"repo": "nixos-hardware",
- "rev": "d23a3bc3c600a064c72c7fb02862edfab11a46cf",
+ "rev": "b48cc4dab0f9711af296fc367b6108cf7b8ccb16",
"type": "github"
},
"original": {
@@ -835,11 +835,11 @@
},
"nixpkgs-unstable": {
"locked": {
- "lastModified": 1741173522,
- "narHash": "sha256-k7VSqvv0r1r53nUI/IfPHCppkUAddeXn843YlAC5DR0=",
+ "lastModified": 1741246872,
+ "narHash": "sha256-Q6pMP4a9ed636qilcYX8XUguvKl/0/LGXhHcRI91p0U=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "d69ab0d71b22fa1ce3dbeff666e6deb4917db049",
+ "rev": "10069ef4cf863633f57238f179a0297de84bd8d3",
"type": "github"
},
"original": {
@@ -855,11 +855,11 @@
"nixpkgs": "nixpkgs_3"
},
"locked": {
- "lastModified": 1741313982,
- "narHash": "sha256-ZvCjKWBAf26patAvzJgXLbyK3qf8S+bjzLstZoRzMws=",
+ "lastModified": 1741353365,
+ "narHash": "sha256-xs7KNkYyCBiXeV0t90vKWj13To5ubnzEDAhYTi9hJ48=",
"owner": "nix-community",
"repo": "nixpkgs-wayland",
- "rev": "2c1c881dc496216f0ecaeac8f67aa7864a79d620",
+ "rev": "ef25348c4447a2fc6603c76aee6c0b4532488107",
"type": "github"
},
"original": {
@@ -885,11 +885,11 @@
},
"nixpkgs_3": {
"locked": {
- "lastModified": 1741173522,
- "narHash": "sha256-k7VSqvv0r1r53nUI/IfPHCppkUAddeXn843YlAC5DR0=",
+ "lastModified": 1741246872,
+ "narHash": "sha256-Q6pMP4a9ed636qilcYX8XUguvKl/0/LGXhHcRI91p0U=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "d69ab0d71b22fa1ce3dbeff666e6deb4917db049",
+ "rev": "10069ef4cf863633f57238f179a0297de84bd8d3",
"type": "github"
},
"original": {
@@ -917,11 +917,11 @@
},
"nixpkgs_5": {
"locked": {
- "lastModified": 1741173522,
- "narHash": "sha256-k7VSqvv0r1r53nUI/IfPHCppkUAddeXn843YlAC5DR0=",
+ "lastModified": 1741246872,
+ "narHash": "sha256-Q6pMP4a9ed636qilcYX8XUguvKl/0/LGXhHcRI91p0U=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "d69ab0d71b22fa1ce3dbeff666e6deb4917db049",
+ "rev": "10069ef4cf863633f57238f179a0297de84bd8d3",
"type": "github"
},
"original": {
@@ -981,11 +981,11 @@
"treefmt-nix": "treefmt-nix_2"
},
"locked": {
- "lastModified": 1741319234,
- "narHash": "sha256-aNCzbndKCEE+TbP4SF0LgXCq3wKBBOiUugBU1+CZJGg=",
+ "lastModified": 1741347191,
+ "narHash": "sha256-e4jo23qzKrFbltpFGumpi/GZuaNQ6AOCBPvunamSw0E=",
"owner": "nix-community",
"repo": "NUR",
- "rev": "f8fcac6c1689989352e87d7feb4dc416a5783ce6",
+ "rev": "e8c0a0a45a2bddb05483ecd68a60095ddee6c4a5",
"type": "github"
},
"original": {
diff --git a/home-manager/common/software/gui/librewolf.nix b/home-manager/common/software/gui/librewolf.nix
index 41b5c3f0..2c8ea7a8 100644
--- a/home-manager/common/software/gui/librewolf.nix
+++ b/home-manager/common/software/gui/librewolf.nix
@@ -1,7 +1,8 @@
-{ pkgs, ... }: {
+{ pkgs-unstable, pkgs, ... }: {
programs.librewolf = {
enable = true;
+ package = pkgs-unstable.librewolf;
profiles.default = {
isDefault = true;
name = "default";
diff --git a/lib/default.nix b/lib/default.nix
index 46a68498..04032698 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -26,7 +26,8 @@
type ? "default",
deployment_type ? "hosts",
}: inputs.home-manager.lib.homeManagerConfiguration {
- pkgs = inputs.nixpkgs.legacyPackages.${system};
+ pkgs = inputs.nixpkgs.legacyPackages.${system};
+ pkgs-unstable = inputs.nixpkgs-unstable.legacyPackages.${system};
extraSpecialArgs = { inherit inputs outputs desktop hostname system username theme deployment_type; };
modules = [ ../home-manager/${type}.nix ];
};
diff --git a/nixos/common/software/gui/librewolf.nix b/nixos/common/software/gui/librewolf.nix
index fc348700..3901a490 100644
--- a/nixos/common/software/gui/librewolf.nix
+++ b/nixos/common/software/gui/librewolf.nix
@@ -1,7 +1,7 @@
-{ pkgs, ... }: {
+{ pkgs-unstable, ... }: {
programs.firefox = {
enable = true;
- package = pkgs.librewolf;
+ package = pkgs-unstable.librewolf;
policies = {
DisableTelemetry = true;
DisableFirefoxStudies = true;
diff --git a/nixos/hosts/framework16/default.nix b/nixos/hosts/framework16/default.nix
index 5ac2875e..c17f5f8d 100644
--- a/nixos/hosts/framework16/default.nix
+++ b/nixos/hosts/framework16/default.nix
@@ -80,12 +80,12 @@
environment.systemPackages = with pkgs; [
inputs.deploy-rs.packages.${system}.deploy-rs
framework-tool
- nvtopPackages.amd
+ element-desktop
# WINE
- # support 32-bit only
- pkgs.wine
- pkgs.winetricks
-
+ wineWowPackages.stable
+ winetricks
+ wineWowPackages.waylandFull
+ nvtopPackages.amd
# RGB stuff
openrgb-with-all-plugins
rivalcfg