Renamed unstable to unstablePkgs to avoid confusion with nixos-unstable flake
This commit is contained in:
parent
be0755bcfe
commit
f5668462eb
14
flake.nix
14
flake.nix
@ -18,20 +18,22 @@
|
|||||||
wrapPkgsSystem = { system }:
|
wrapPkgsSystem = { system }:
|
||||||
import nixpkgs rec {
|
import nixpkgs rec {
|
||||||
inherit system;
|
inherit system;
|
||||||
unstable = wrapUnstablePkgsSystem { inherit system; };
|
|
||||||
|
unstablePkgs = wrapUnstablePkgsSystem { inherit system; };
|
||||||
config.allowUnfree = true;
|
config.allowUnfree = true;
|
||||||
overlays = [
|
overlays = [
|
||||||
(final: prev: { inherit unstable; })
|
(final: prev: { inherit unstablePkgs; })
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
wrapUnstablePkgsSystem = { system }:
|
wrapUnstablePkgsSystem = { system }:
|
||||||
import nixos-unstable {
|
import nixos-unstable {
|
||||||
inherit system;
|
inherit system;
|
||||||
|
|
||||||
config.allowUnfree = true;
|
config.allowUnfree = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
wrapUtils = { pkgs, unstable, system }:
|
wrapUtils = { pkgs, unstablePkgs, system }:
|
||||||
let
|
let
|
||||||
inherit (pkgs.lib) makeScope;
|
inherit (pkgs.lib) makeScope;
|
||||||
inherit (pkgs) newScope;
|
inherit (pkgs) newScope;
|
||||||
@ -48,15 +50,15 @@
|
|||||||
|
|
||||||
pkgsLinuxX64 = wrapPkgsSystem { system = sysLinuxX64; };
|
pkgsLinuxX64 = wrapPkgsSystem { system = sysLinuxX64; };
|
||||||
unstableLinuxX64 = wrapUnstablePkgsSystem { 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; };
|
pkgsLinuxAarch = wrapPkgsSystem { system = sysLinuxAarch; };
|
||||||
unstableLinuxAarch = wrapUnstablePkgsSystem { 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; };
|
pkgsDarwin = wrapPkgsSystem { system = sysDarwin; };
|
||||||
unstableDarwin = wrapUnstablePkgsSystem { system = sysDarwin; };
|
unstableDarwin = wrapUnstablePkgsSystem { system = sysDarwin; };
|
||||||
utilsDarwin = wrapUtils { system = sysDarwin; pkgs = pkgsDarwin; unstable = unstableDarwin; };
|
utilsDarwin = wrapUtils { system = sysDarwin; pkgs = pkgsDarwin; unstablePkgs = unstableDarwin; };
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
nixosConfigurations = {
|
nixosConfigurations = {
|
||||||
|
@ -9,7 +9,7 @@ in
|
|||||||
invidious = {
|
invidious = {
|
||||||
enable = true;
|
enable = true;
|
||||||
port = 9092;
|
port = 9092;
|
||||||
package = pkgs.unstable.invidious;
|
package = pkgs.unstablePkgs.invidious;
|
||||||
};
|
};
|
||||||
|
|
||||||
nginx.virtualHosts.${domain} = {
|
nginx.virtualHosts.${domain} = {
|
||||||
|
@ -13,7 +13,7 @@ in
|
|||||||
jellyfin = {
|
jellyfin = {
|
||||||
enable = true;
|
enable = true;
|
||||||
group = "media";
|
group = "media";
|
||||||
package = pkgs.unstable.jellyfin;
|
package = pkgs.unstablePkgs.jellyfin;
|
||||||
};
|
};
|
||||||
|
|
||||||
nginx.virtualHosts.${domain} = {
|
nginx.virtualHosts.${domain} = {
|
||||||
|
@ -9,7 +9,7 @@ in
|
|||||||
enable = true;
|
enable = true;
|
||||||
eula = true;
|
eula = true;
|
||||||
declarative = true;
|
declarative = true;
|
||||||
package = pkgs.unstable.minecraft-server;
|
package = pkgs.unstablePkgs.minecraft-server;
|
||||||
serverProperties = { motd = "Welcome on the RuNas server!"; };
|
serverProperties = { motd = "Welcome on the RuNas server!"; };
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -9,7 +9,7 @@ in
|
|||||||
services = {
|
services = {
|
||||||
mysql = {
|
mysql = {
|
||||||
enable = true;
|
enable = true;
|
||||||
package = pkgs.unstable.mysql80;
|
package = pkgs.unstablePkgs.mysql80;
|
||||||
};
|
};
|
||||||
|
|
||||||
redis = {
|
redis = {
|
||||||
@ -24,7 +24,7 @@ in
|
|||||||
enable = true;
|
enable = true;
|
||||||
hostName = domain;
|
hostName = domain;
|
||||||
https = true;
|
https = true;
|
||||||
package = pkgs.unstable.nextcloud25;
|
package = pkgs.unstablePkgs.nextcloud25;
|
||||||
datadir = "/services/nextcloud";
|
datadir = "/services/nextcloud";
|
||||||
caching = {
|
caching = {
|
||||||
redis = true;
|
redis = true;
|
||||||
|
@ -12,7 +12,7 @@ in
|
|||||||
server = {
|
server = {
|
||||||
port = 9093;
|
port = 9093;
|
||||||
hostname = domain;
|
hostname = domain;
|
||||||
staticDir = "${pkgs.unstable.nitter}/share/nitter/public";
|
staticDir = "${pkgs.unstablePkgs.nitter}/share/nitter/public";
|
||||||
};
|
};
|
||||||
preferences = {
|
preferences = {
|
||||||
replaceYouTube = "tube.giugl.io";
|
replaceYouTube = "tube.giugl.io";
|
||||||
|
@ -7,7 +7,7 @@ in
|
|||||||
{
|
{
|
||||||
services.plex = {
|
services.plex = {
|
||||||
enable = true;
|
enable = true;
|
||||||
package = pkgs.unstable.plex;
|
package = pkgs.unstablePkgs.plex;
|
||||||
dataDir = "/plex";
|
dataDir = "/plex";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
{ pkgs
|
{ pkgs
|
||||||
, nixpkgs
|
, nixpkgs
|
||||||
, nixos-unstable
|
, nixos-unstable
|
||||||
, unstable
|
, unstablePkgs
|
||||||
, home-manager
|
, home-manager
|
||||||
, system
|
, system
|
||||||
, mkHomeRole
|
, mkHomeRole
|
||||||
@ -50,7 +50,7 @@
|
|||||||
|
|
||||||
home-manager = {
|
home-manager = {
|
||||||
users.root.imports = pkgs.lib.singleton (mkHomeRole "common");
|
users.root.imports = pkgs.lib.singleton (mkHomeRole "common");
|
||||||
extraSpecialArgs.unstable = unstable;
|
extraSpecialArgs.unstablePkgs = unstablePkgs;
|
||||||
useGlobalPkgs = true;
|
useGlobalPkgs = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -22,7 +22,7 @@
|
|||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
gnomeExtensions.appindicator
|
gnomeExtensions.appindicator
|
||||||
gnomeExtensions.sound-output-device-chooser
|
gnomeExtensions.sound-output-device-chooser
|
||||||
pkgs.unstable.gnomeExtensions.pop-shell
|
pkgs.unstablePkgs.gnomeExtensions.pop-shell
|
||||||
];
|
];
|
||||||
security.pam.services.gdm.enableGnomeKeyring = true;
|
security.pam.services.gdm.enableGnomeKeyring = true;
|
||||||
}
|
}
|
||||||
|
@ -33,7 +33,7 @@
|
|||||||
formatter = { command = "nixpkgs-fmt" }
|
formatter = { command = "nixpkgs-fmt" }
|
||||||
'';
|
'';
|
||||||
|
|
||||||
packages = with pkgs.unstable; [
|
packages = with pkgs.unstablePkgsPkgs; [
|
||||||
helix
|
helix
|
||||||
clang-tools
|
clang-tools
|
||||||
rust-analyzer
|
rust-analyzer
|
||||||
|
Loading…
Reference in New Issue
Block a user