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 {
|
lib.nixosSystem {
|
||||||
inherit system;
|
inherit system;
|
||||||
|
|
||||||
specialArgs = {
|
|
||||||
inherit unstablePkgs;
|
|
||||||
|
|
||||||
flakes = {
|
|
||||||
nixpkgs = nixpkgs;
|
|
||||||
master = inputs.unstable;
|
|
||||||
nixflk = self;
|
|
||||||
};
|
|
||||||
|
|
||||||
usr = { inherit utils; };
|
|
||||||
};
|
|
||||||
|
|
||||||
modules = let
|
modules = let
|
||||||
inherit (home.nixosModules) home-manager;
|
inherit (home.nixosModules) home-manager;
|
||||||
|
|
||||||
@ -38,6 +26,22 @@ let
|
|||||||
];
|
];
|
||||||
|
|
||||||
nixpkgs = { inherit pkgs; };
|
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";
|
local = import "${toString ./.}/${hostName}.nix";
|
||||||
@ -46,7 +50,7 @@ let
|
|||||||
flakeModules =
|
flakeModules =
|
||||||
attrValues (removeAttrs self.nixosModules [ "profiles" ]);
|
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;
|
let inherit (lib) fileContents;
|
||||||
|
|
||||||
in {
|
in {
|
||||||
@ -6,12 +6,6 @@ in {
|
|||||||
|
|
||||||
nix.systemFeatures = [ "nixos-test" "benchmark" "big-parallel" "kvm" ];
|
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 ];
|
imports = [ ../local/locale.nix ];
|
||||||
|
|
||||||
environment = {
|
environment = {
|
||||||
@ -126,8 +120,6 @@ in {
|
|||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
systemd.package = unstablePkgs.systemd;
|
|
||||||
|
|
||||||
services.earlyoom.enable = true;
|
services.earlyoom.enable = true;
|
||||||
|
|
||||||
users.mutableUsers = false;
|
users.mutableUsers = false;
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
{ unstablePkgs, ... }: {
|
{ pkgs, ... }: {
|
||||||
imports = [ ../graphical ./udev.nix ];
|
imports = [ ../graphical ./udev.nix ];
|
||||||
environment.systemPackages = with unstablePkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
retroarchBare
|
retroarchBare
|
||||||
steam-run
|
steam-run
|
||||||
pcsx2
|
pcsx2
|
||||||
@ -15,10 +15,7 @@
|
|||||||
services.xserver.libinput.disableWhileTyping = false;
|
services.xserver.libinput.disableWhileTyping = false;
|
||||||
|
|
||||||
# Launch steam from display managers
|
# Launch steam from display managers
|
||||||
services.xserver.windowManager.steam = {
|
services.xserver.windowManager.steam = { enable = true; };
|
||||||
enable = true;
|
|
||||||
package = unstablePkgs.steam;
|
|
||||||
};
|
|
||||||
|
|
||||||
# 32-bit support needed for steam
|
# 32-bit support needed for steam
|
||||||
hardware.opengl.driSupport32Bit = true;
|
hardware.opengl.driSupport32Bit = true;
|
||||||
|
@ -1,20 +1,19 @@
|
|||||||
{ unstablePkgs, ... }:
|
{ pkgs, ... }:
|
||||||
let inherit (builtins) readFile;
|
let inherit (builtins) readFile;
|
||||||
in {
|
in {
|
||||||
sound.enable = true;
|
sound.enable = true;
|
||||||
|
|
||||||
environment = {
|
environment = {
|
||||||
etc."xdg/qutebrowser/config.py".text =
|
etc."xdg/qutebrowser/config.py".text = let mpv = "${pkgs.mpv}/bin/mpv";
|
||||||
let mpv = "${unstablePkgs.mpv}/bin/mpv";
|
in ''
|
||||||
in ''
|
${readFile ./config.py}
|
||||||
${readFile ./config.py}
|
|
||||||
|
|
||||||
config.bind(',m', 'hint links spawn -d ${mpv} {hint-url}')
|
config.bind(',m', 'hint links spawn -d ${mpv} {hint-url}')
|
||||||
config.bind(',v', 'spawn -d ${mpv} {url}')
|
config.bind(',v', 'spawn -d ${mpv} {url}')
|
||||||
'';
|
'';
|
||||||
|
|
||||||
sessionVariables.BROWSER = "qute";
|
sessionVariables.BROWSER = "qute";
|
||||||
|
|
||||||
systemPackages = with unstablePkgs; [ qute qutebrowser mpv youtubeDL ];
|
systemPackages = with pkgs; [ qute qutebrowser mpv youtubeDL ];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
{ unstablePkgs, ... }: {
|
{ pkgs, ... }: {
|
||||||
environment.systemPackages = with unstablePkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
discord
|
discord
|
||||||
element-desktop
|
element-desktop
|
||||||
signal-desktop
|
signal-desktop
|
||||||
|
Loading…
Reference in New Issue
Block a user