1
0
mirror of https://github.com/ellmau/nixos.git synced 2025-12-19 09:29:36 +01:00

ADD unstable overlay FLAKE upd

added unstable overlay to use unstable (latest) zoom client
This commit is contained in:
Stefan Ellmauthaler 2022-01-27 16:17:27 +01:00
parent 1094c1f928
commit f00500a8e6
Signed by: ellmau
GPG Key ID: C804A9C1B7AF8256
3 changed files with 21 additions and 14 deletions

View File

@ -1,4 +1,12 @@
{ pkgs, name, flakes, flakeOutputs, ...}:
{ pkgs, name, system, flakes, flakeOutputs, ...}:
let
overlay-unstable = final: prev: {
unstable = import flakes.nixpkgs-unstable {
system = "${system}";
config.allowUnfree=true;
};
};
in
{ config, pkgs, lib, ...}:
{
imports =
@ -48,9 +56,8 @@
options = "--delete-older-than 30d";
};
};
nixpkgs = {
overlays = [ flakes.emacs-overlay.overlay flakeOutputs.overlay ];
overlays = [ flakes.emacs-overlay.overlay overlay-unstable flakeOutputs.overlay ];
config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [
"skypeforlinux"
"teams"

18
flake.lock generated
View File

@ -2,11 +2,11 @@
"nodes": {
"emacs-overlay": {
"locked": {
"lastModified": 1643079680,
"narHash": "sha256-2dS8LLdMgM+M9t3CEy4ehMo3bPH1coxSVfCuGlj1mms=",
"lastModified": 1643279442,
"narHash": "sha256-XfCXo2ji5te7sobk3sjLPEjxHZAjNFLCn/xBg7g3eWA=",
"owner": "nix-community",
"repo": "emacs-overlay",
"rev": "cae9afd0e907be25c65a7ad109815e9df839dd79",
"rev": "a0013418370c2493a3d3573cf51e10db8f44691f",
"type": "github"
},
"original": {
@ -54,11 +54,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1642961095,
"narHash": "sha256-RLatktZmvwFBOyqdoIk4qdS4OGKB7aKIvvs4ZP2L8D8=",
"lastModified": 1643247693,
"narHash": "sha256-rmShxIuNjYBz4l83J0J++sug+MURUY1koPCzX4F8hfo=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "604c44137d97b5111be1ca5c0d97f6e24fbc5c2c",
"rev": "6c4b9f1a2fd761e2d384ef86cff0d208ca27fdca",
"type": "github"
},
"original": {
@ -70,11 +70,11 @@
},
"nixpkgs-unstable": {
"locked": {
"lastModified": 1642903813,
"narHash": "sha256-0lNfGW8sNfyTrixoQhVG00Drl/ECaf5GbfKAQ1ZDoyE=",
"lastModified": 1643080866,
"narHash": "sha256-iO3Z6jw0HEiie8UnXVpq1SxphprDYBXrVzubEa5D4eE=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "689b76bcf36055afdeb2e9852f5ecdd2bf483f87",
"rev": "c07b471b52be8fbc49a7dc194e9b37a6e19ee04d",
"type": "github"
},
"original": {

View File

@ -1,4 +1,4 @@
{ config, pkgs, lib, ...}:
{ config, pkgs, lib, flakes, ...}:
let
withAliases = hostname: aliases: cfg:
lib.recursiveUpdate
@ -42,7 +42,7 @@ in
pkgs.jitsi-meet-electron
pkgs.skypeforlinux
pkgs.teams
pkgs.zoom-us
pkgs.unstable.zoom-us
pkgs.element-desktop
pkgs.signal-desktop
];