Centralize unfree overrides
This commit is contained in:
parent
334a87dfb8
commit
3d72e00881
|
@ -1,8 +1,7 @@
|
||||||
{ pkgs, ... }:
|
{ pkgs, ... }:
|
||||||
{
|
{
|
||||||
home.packages = builtins.attrValues {
|
home.packages = builtins.attrValues {
|
||||||
inherit (pkgs.unfree) discord;
|
inherit (pkgs) discord signal-desktop tdesktop dino element-desktop;
|
||||||
inherit (pkgs) signal-desktop tdesktop dino element-desktop;
|
|
||||||
weechat = pkgs.writeShellScriptBin "weechat" "ssh -t hera 'tmux -L weechat attach'";
|
weechat = pkgs.writeShellScriptBin "weechat" "ssh -t hera 'tmux -L weechat attach'";
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -46,13 +46,12 @@ in
|
||||||
};
|
};
|
||||||
|
|
||||||
home.packages = builtins.attrValues {
|
home.packages = builtins.attrValues {
|
||||||
factorio = pkgs.unstableUnfree.factorio.override {
|
factorio = pkgs.factorio.override {
|
||||||
username = "maralorn";
|
username = "maralorn";
|
||||||
token = import ../../nixos/machines/apollo/secret/factory.nix;
|
token = import ../../nixos/machines/apollo/secret/factory.nix;
|
||||||
experimental = true;
|
experimental = true;
|
||||||
};
|
};
|
||||||
inherit (pkgs.unfree) steam;
|
inherit (pkgs) steam minetest;
|
||||||
inherit (pkgs) minetest;
|
|
||||||
inherit gw2run gw2setup wine;
|
inherit gw2run gw2setup wine;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -39,13 +39,14 @@ in {
|
||||||
activate-mode > /dev/null
|
activate-mode > /dev/null
|
||||||
'';
|
'';
|
||||||
|
|
||||||
inherit (pkgs.unfree) zoom-us skypeforlinux google-chrome;
|
|
||||||
inherit (pkgs.gnome3) nautilus;
|
inherit (pkgs.gnome3) nautilus;
|
||||||
inherit (pkgs.xorg) xbacklight;
|
inherit (pkgs.xorg) xbacklight;
|
||||||
inherit (pkgs)
|
inherit (pkgs)
|
||||||
# web
|
# web
|
||||||
chromium
|
chromium
|
||||||
|
|
||||||
|
zoom-us skypeforlinux google-chrome
|
||||||
|
|
||||||
mumble upower speedtest-cli acpi
|
mumble upower speedtest-cli acpi
|
||||||
|
|
||||||
anki
|
anki
|
||||||
|
|
|
@ -1,8 +1,7 @@
|
||||||
self: super:
|
self: super:
|
||||||
if super.config.allowUnfree or false then
|
let
|
||||||
{ }
|
|
||||||
else {
|
|
||||||
unfree = import self.sources.nixpkgs { config.allowUnfree = true; };
|
unfree = import self.sources.nixpkgs { config.allowUnfree = true; };
|
||||||
unstableUnfree = import self.sources.unstable { config.allowUnfree = true; };
|
unstableUnfree = import self.sources.unstable { config.allowUnfree = true; };
|
||||||
releaseUnfree = import self.sources.nixpkgs-release { config.allowUnfree = true; };
|
releaseUnfree =
|
||||||
}
|
import self.sources.nixpkgs-release { config.allowUnfree = true; };
|
||||||
|
in { inherit (unfree) discord factorio steam zoom-us skypeforlinux google-chrome; }
|
||||||
|
|
Loading…
Reference in a new issue