pkgs#unstable: remove specialArgs
The `specialArgs` defined in `hosts` has kept some modules from working in external flakes. Instead, we simply enumerate packages in `hosts` which should be pulled from `unstablePkgs`.
This commit is contained in:
parent
1373380a91
commit
5d8413a85a
@ -12,18 +12,6 @@ let
|
||||
lib.nixosSystem {
|
||||
inherit system;
|
||||
|
||||
specialArgs = {
|
||||
inherit unstablePkgs;
|
||||
|
||||
flakes = {
|
||||
nixpkgs = nixpkgs;
|
||||
master = inputs.unstable;
|
||||
nixflk = self;
|
||||
};
|
||||
|
||||
usr = { inherit utils; };
|
||||
};
|
||||
|
||||
modules = let
|
||||
inherit (home.nixosModules) home-manager;
|
||||
|
||||
@ -38,6 +26,22 @@ let
|
||||
];
|
||||
|
||||
nixpkgs = { inherit pkgs; };
|
||||
|
||||
nix.registry = {
|
||||
nixpkgs.flake = nixpkgs;
|
||||
nixflk.flake = self;
|
||||
master.flake = inputs.unstable;
|
||||
};
|
||||
};
|
||||
|
||||
unstables = {
|
||||
systemd.package = unstablePkgs.systemd;
|
||||
nixpkgs.overlays = [
|
||||
(final: prev:
|
||||
with unstablePkgs; {
|
||||
inherit starship element-desktop discord signal-desktop mpv;
|
||||
})
|
||||
];
|
||||
};
|
||||
|
||||
local = import "${toString ./.}/${hostName}.nix";
|
||||
@ -46,7 +50,7 @@ let
|
||||
flakeModules =
|
||||
attrValues (removeAttrs self.nixosModules [ "profiles" ]);
|
||||
|
||||
in flakeModules ++ [ core global local home-manager ];
|
||||
in flakeModules ++ [ core global local home-manager unstables ];
|
||||
|
||||
};
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
{ config, lib, pkgs, unstablePkgs, flakes, ... }:
|
||||
{ config, lib, pkgs, ... }:
|
||||
let inherit (lib) fileContents;
|
||||
|
||||
in {
|
||||
@ -6,12 +6,6 @@ in {
|
||||
|
||||
nix.systemFeatures = [ "nixos-test" "benchmark" "big-parallel" "kvm" ];
|
||||
|
||||
nix.registry = with flakes; {
|
||||
nixpkgs.flake = nixpkgs;
|
||||
nixflk.flake = nixflk;
|
||||
master.flake = master;
|
||||
};
|
||||
|
||||
imports = [ ../local/locale.nix ];
|
||||
|
||||
environment = {
|
||||
@ -126,8 +120,6 @@ in {
|
||||
|
||||
};
|
||||
|
||||
systemd.package = unstablePkgs.systemd;
|
||||
|
||||
services.earlyoom.enable = true;
|
||||
|
||||
users.mutableUsers = false;
|
||||
|
@ -1,6 +1,6 @@
|
||||
{ unstablePkgs, ... }: {
|
||||
{ pkgs, ... }: {
|
||||
imports = [ ../graphical ./udev.nix ];
|
||||
environment.systemPackages = with unstablePkgs; [
|
||||
environment.systemPackages = with pkgs; [
|
||||
retroarchBare
|
||||
steam-run
|
||||
pcsx2
|
||||
@ -15,10 +15,7 @@
|
||||
services.xserver.libinput.disableWhileTyping = false;
|
||||
|
||||
# Launch steam from display managers
|
||||
services.xserver.windowManager.steam = {
|
||||
enable = true;
|
||||
package = unstablePkgs.steam;
|
||||
};
|
||||
services.xserver.windowManager.steam = { enable = true; };
|
||||
|
||||
# 32-bit support needed for steam
|
||||
hardware.opengl.driSupport32Bit = true;
|
||||
|
@ -1,11 +1,10 @@
|
||||
{ unstablePkgs, ... }:
|
||||
{ pkgs, ... }:
|
||||
let inherit (builtins) readFile;
|
||||
in {
|
||||
sound.enable = true;
|
||||
|
||||
environment = {
|
||||
etc."xdg/qutebrowser/config.py".text =
|
||||
let mpv = "${unstablePkgs.mpv}/bin/mpv";
|
||||
etc."xdg/qutebrowser/config.py".text = let mpv = "${pkgs.mpv}/bin/mpv";
|
||||
in ''
|
||||
${readFile ./config.py}
|
||||
|
||||
@ -15,6 +14,6 @@ in {
|
||||
|
||||
sessionVariables.BROWSER = "qute";
|
||||
|
||||
systemPackages = with unstablePkgs; [ qute qutebrowser mpv youtubeDL ];
|
||||
systemPackages = with pkgs; [ qute qutebrowser mpv youtubeDL ];
|
||||
};
|
||||
}
|
||||
|
@ -1,5 +1,5 @@
|
||||
{ unstablePkgs, ... }: {
|
||||
environment.systemPackages = with unstablePkgs; [
|
||||
{ pkgs, ... }: {
|
||||
environment.systemPackages = with pkgs; [
|
||||
discord
|
||||
element-desktop
|
||||
signal-desktop
|
||||
|
Loading…
Reference in New Issue
Block a user