From 6bd20a76001ab3769b0adbe1a7d8a29ce8e5edae Mon Sep 17 00:00:00 2001 From: Antoine Viallon Date: Fri, 31 Mar 2023 21:43:30 +0200 Subject: [PATCH] [Packages+Overlays] Remove impure unstable + nur overlays, disable vdhcoapp --- desktop/multimedia.nix | 2 +- overlays.nix | 3 ++- packages.nix | 1 - packages/unstable.nix | 28 ---------------------------- 4 files changed, 3 insertions(+), 31 deletions(-) delete mode 100644 packages/unstable.nix diff --git a/desktop/multimedia.nix b/desktop/multimedia.nix index cdd7649..831cecc 100644 --- a/desktop/multimedia.nix +++ b/desktop/multimedia.nix @@ -18,7 +18,7 @@ in { jamesdsp # Audio post-processing - nur.repos.wolfangaukang.vdhcoapp + #nur.repos.wolfangaukang.vdhcoapp ]; diff --git a/overlays.nix b/overlays.nix index 17e6ea4..3fa471b 100644 --- a/overlays.nix +++ b/overlays.nix @@ -1,7 +1,8 @@ -{config, pkgs, options, lib, ...}: +{config, pkgs, options, lib, nixpkgs-unstable, ...}: with lib; let cfg = config.aviallon.overlays; + unstable = nixpkgs-unstable; in { options.aviallon.overlays = { diff --git a/packages.nix b/packages.nix index 28b8996..e5fde7f 100644 --- a/packages.nix +++ b/packages.nix @@ -10,7 +10,6 @@ in imports = [ ./programs ./overlays.nix - ./packages/unstable.nix ./packages/flatpak.nix (mkRenamedOptionModule [ "aviallon" "programs" "compileFlags" ] [ "aviallon" "optimizations" "extraCompileFlags" ]) ]; diff --git a/packages/unstable.nix b/packages/unstable.nix deleted file mode 100644 index 41dd94e..0000000 --- a/packages/unstable.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ config, pkgs, lib, ... }: -with lib; -let - cfg = config.aviallon.overlays; - hardwareCfg = config.aviallon.hardware; - unstable = import (fetchGit { - url = "https://github.com/NixOS/nixpkgs.git"; - ref = "nixos-unstable"; - }) { - config = config.nixpkgs.config // { allowUnfree = true; } ; - overlays = config.nixpkgs.overlays; - }; - nur = import (fetchGit { - url = "https://github.com/nix-community/NUR.git"; - ref = "master"; - }) { - inherit pkgs; - }; -in { - config = { - nixpkgs.overlays = mkBefore ([] - ++ [(final: prev: { - inherit nur; - inherit unstable; - })] - ); - }; -}