From 97654b4579f521e51a5d2b23c4a52ddd68ab9771 Mon Sep 17 00:00:00 2001 From: Don Harper Date: Thu, 2 Jan 2025 08:50:31 -0600 Subject: [PATCH] task | Pin zoom to older/working version for now --- flake.nix | 6 ++++-- home/default.nix | 9 +++++++-- home/work/zoom.nix | 11 ++++++++--- 3 files changed, 19 insertions(+), 7 deletions(-) diff --git a/flake.nix b/flake.nix index a0c7a1d..4b5aeac 100644 --- a/flake.nix +++ b/flake.nix @@ -1,7 +1,7 @@ { inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; - # nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11"; + nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-24.11"; catppuccin.url = "github:catppuccin/nix"; colmena.url = "github:zhaofengli/colmena"; colmena.inputs.nixpkgs.follows = "nixpkgs"; @@ -12,10 +12,12 @@ # nixos-cosmic.url = "github:lilyinstarlight/nixos-cosmic"; # nixos-cosmic.inputs.nixpkgs.follows = "nixpkgs"; nixos-hardware.url = "github:NixOS/nixos-hardware/master"; + nixpkgs-zoom.url = "github:NixOS/nixpkgs/06031e8a5d9d5293c725a50acf01242193635022"; + # nixpkgs-zoom.url = "github:NixOS/nixpkgs/79077930a404da8b7cd7ecf2fe05e8a80347e340"; }; outputs = inputs@{ self, nixpkgs, nix, - # nixos-cosmic, + nixpkgs-stable, nixos-hardware, home-manager, catppuccin, colmena, ... }: let inherit (self) outputs; diff --git a/home/default.nix b/home/default.nix index 331d4a5..ba7414c 100644 --- a/home/default.nix +++ b/home/default.nix @@ -1,6 +1,11 @@ -{ inputs, outputs, ... }: { +{ inputs, outputs, pkgs, pkgs-stable, ... }: { imports = [ inputs.home-manager.nixosModules.home-manager ]; - home-manager.extraSpecialArgs = { inherit inputs outputs; }; + home-manager.extraSpecialArgs = { + pkgs-stable = import pkgs-stable { + config.allowUnfree = true; + }; + inherit inputs outputs; + }; home-manager = { useGlobalPkgs = true; useUserPackages = true; diff --git a/home/work/zoom.nix b/home/work/zoom.nix index 68b06a8..c9b6f88 100644 --- a/home/work/zoom.nix +++ b/home/work/zoom.nix @@ -1,9 +1,14 @@ -{ lib, config, pkgs, inputs, outputs, home-manager, ... }: +{ lib, config, pkgs, pkgs-stable, inputs, outputs, home-manager, ... }: with lib; -let cfg = config.roles.zoom; +let + cfg = config.roles.zoom; + zoomPkgs = import inputs.nixpkgs-zoom { + system = "x86_64-linux"; + config.allowUnfree = true; + }; in { options.roles.zoom = { enable = lib.mkEnableOption "citrix tools"; }; config = mkIf cfg.enable { - home-manager.users.don.home.packages = with pkgs; [ zoom-us ]; + home-manager.users.don.home.packages = [ zoomPkgs.zoom-us ]; }; }