From f5668462eb85d364b6633d5862e7425f19263537 Mon Sep 17 00:00:00 2001 From: Giulio De Pasquale Date: Tue, 14 Feb 2023 21:30:37 +0100 Subject: [PATCH] Renamed unstable to unstablePkgs to avoid confusion with nixos-unstable flake --- flake.nix | 14 ++++++++------ hosts/architect/invidious.nix | 2 +- hosts/architect/jellyfin.nix | 2 +- hosts/architect/minecraft.nix | 2 +- hosts/architect/nextcloud.nix | 4 ++-- hosts/architect/nitter.nix | 2 +- hosts/architect/plex.nix | 2 +- lib/host.nix | 4 ++-- roles/gnome.nix | 2 +- roles/home/helix.nix | 2 +- 10 files changed, 19 insertions(+), 17 deletions(-) diff --git a/flake.nix b/flake.nix index 9ddce17..1fcd0bc 100644 --- a/flake.nix +++ b/flake.nix @@ -18,20 +18,22 @@ wrapPkgsSystem = { system }: import nixpkgs rec { inherit system; - unstable = wrapUnstablePkgsSystem { inherit system; }; + + unstablePkgs = wrapUnstablePkgsSystem { inherit system; }; config.allowUnfree = true; overlays = [ - (final: prev: { inherit unstable; }) + (final: prev: { inherit unstablePkgs; }) ]; }; wrapUnstablePkgsSystem = { system }: import nixos-unstable { inherit system; + config.allowUnfree = true; }; - wrapUtils = { pkgs, unstable, system }: + wrapUtils = { pkgs, unstablePkgs, system }: let inherit (pkgs.lib) makeScope; inherit (pkgs) newScope; @@ -48,15 +50,15 @@ pkgsLinuxX64 = wrapPkgsSystem { system = sysLinuxX64; }; unstableLinuxX64 = wrapUnstablePkgsSystem { system = sysLinuxX64; }; - utilsLinuxX64 = wrapUtils { system = sysLinuxX64; pkgs = pkgsLinuxX64; unstable = unstableLinuxX64; }; + utilsLinuxX64 = wrapUtils { system = sysLinuxX64; pkgs = pkgsLinuxX64; unstablePkgs = unstableLinuxX64; }; pkgsLinuxAarch = wrapPkgsSystem { system = sysLinuxAarch; }; unstableLinuxAarch = wrapUnstablePkgsSystem { system = sysLinuxAarch; }; - utilsLinuxAarch = wrapUtils { system = sysLinuxAarch; pkgs = pkgsLinuxAarch; unstable = unstableLinuxAarch; }; + utilsLinuxAarch = wrapUtils { system = sysLinuxAarch; pkgs = pkgsLinuxAarch; unstablePkgs = unstableLinuxAarch; }; pkgsDarwin = wrapPkgsSystem { system = sysDarwin; }; unstableDarwin = wrapUnstablePkgsSystem { system = sysDarwin; }; - utilsDarwin = wrapUtils { system = sysDarwin; pkgs = pkgsDarwin; unstable = unstableDarwin; }; + utilsDarwin = wrapUtils { system = sysDarwin; pkgs = pkgsDarwin; unstablePkgs = unstableDarwin; }; in { nixosConfigurations = { diff --git a/hosts/architect/invidious.nix b/hosts/architect/invidious.nix index efc2ef1..9dcfbf8 100644 --- a/hosts/architect/invidious.nix +++ b/hosts/architect/invidious.nix @@ -9,7 +9,7 @@ in invidious = { enable = true; port = 9092; - package = pkgs.unstable.invidious; + package = pkgs.unstablePkgs.invidious; }; nginx.virtualHosts.${domain} = { diff --git a/hosts/architect/jellyfin.nix b/hosts/architect/jellyfin.nix index c35d0ea..f7599a4 100644 --- a/hosts/architect/jellyfin.nix +++ b/hosts/architect/jellyfin.nix @@ -13,7 +13,7 @@ in jellyfin = { enable = true; group = "media"; - package = pkgs.unstable.jellyfin; + package = pkgs.unstablePkgs.jellyfin; }; nginx.virtualHosts.${domain} = { diff --git a/hosts/architect/minecraft.nix b/hosts/architect/minecraft.nix index 136cf33..af78431 100644 --- a/hosts/architect/minecraft.nix +++ b/hosts/architect/minecraft.nix @@ -9,7 +9,7 @@ in enable = true; eula = true; declarative = true; - package = pkgs.unstable.minecraft-server; + package = pkgs.unstablePkgs.minecraft-server; serverProperties = { motd = "Welcome on the RuNas server!"; }; }; diff --git a/hosts/architect/nextcloud.nix b/hosts/architect/nextcloud.nix index 24b45ea..519f6f8 100644 --- a/hosts/architect/nextcloud.nix +++ b/hosts/architect/nextcloud.nix @@ -9,7 +9,7 @@ in services = { mysql = { enable = true; - package = pkgs.unstable.mysql80; + package = pkgs.unstablePkgs.mysql80; }; redis = { @@ -24,7 +24,7 @@ in enable = true; hostName = domain; https = true; - package = pkgs.unstable.nextcloud25; + package = pkgs.unstablePkgs.nextcloud25; datadir = "/services/nextcloud"; caching = { redis = true; diff --git a/hosts/architect/nitter.nix b/hosts/architect/nitter.nix index 3921a15..0c8c143 100644 --- a/hosts/architect/nitter.nix +++ b/hosts/architect/nitter.nix @@ -12,7 +12,7 @@ in server = { port = 9093; hostname = domain; - staticDir = "${pkgs.unstable.nitter}/share/nitter/public"; + staticDir = "${pkgs.unstablePkgs.nitter}/share/nitter/public"; }; preferences = { replaceYouTube = "tube.giugl.io"; diff --git a/hosts/architect/plex.nix b/hosts/architect/plex.nix index 891f85f..285abcd 100644 --- a/hosts/architect/plex.nix +++ b/hosts/architect/plex.nix @@ -7,7 +7,7 @@ in { services.plex = { enable = true; - package = pkgs.unstable.plex; + package = pkgs.unstablePkgs.plex; dataDir = "/plex"; }; diff --git a/lib/host.nix b/lib/host.nix index 4701293..8982403 100644 --- a/lib/host.nix +++ b/lib/host.nix @@ -1,7 +1,7 @@ { pkgs , nixpkgs , nixos-unstable -, unstable +, unstablePkgs , home-manager , system , mkHomeRole @@ -50,7 +50,7 @@ home-manager = { users.root.imports = pkgs.lib.singleton (mkHomeRole "common"); - extraSpecialArgs.unstable = unstable; + extraSpecialArgs.unstablePkgs = unstablePkgs; useGlobalPkgs = true; }; diff --git a/roles/gnome.nix b/roles/gnome.nix index 422bbb8..b8491ba 100644 --- a/roles/gnome.nix +++ b/roles/gnome.nix @@ -22,7 +22,7 @@ environment.systemPackages = with pkgs; [ gnomeExtensions.appindicator gnomeExtensions.sound-output-device-chooser - pkgs.unstable.gnomeExtensions.pop-shell + pkgs.unstablePkgs.gnomeExtensions.pop-shell ]; security.pam.services.gdm.enableGnomeKeyring = true; } diff --git a/roles/home/helix.nix b/roles/home/helix.nix index 7925a84..63497c7 100644 --- a/roles/home/helix.nix +++ b/roles/home/helix.nix @@ -33,7 +33,7 @@ formatter = { command = "nixpkgs-fmt" } ''; - packages = with pkgs.unstable; [ + packages = with pkgs.unstablePkgsPkgs; [ helix clang-tools rust-analyzer