maralorn/nixos-config
1
0
Fork 0
Code Wiki Activity

Centralize unfree overrides

Browse source
This commit is contained in:
Malte Brandy 2020-09-16 19:55:08 +02:00
parent 334a87dfb8
commit 3d72e00881
No known key found for this signature in database
GPG key ID: 226A2D41EF5378C9
4 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
home-manager/roles/chat.nix
View file

@ -1,8 +1,7 @@
{ pkgs, ... }:
{
home.packages = builtins.attrValues {
inherit (pkgs.unfree) discord;
inherit (pkgs) signal-desktop tdesktop dino element-desktop;
inherit (pkgs) discord signal-desktop tdesktop dino element-desktop;
weechat = pkgs.writeShellScriptBin "weechat" "ssh -t hera 'tmux -L weechat attach'";
};
}

5
home-manager/roles/games.nix
View file

@ -46,13 +46,12 @@ in
};
home.packages = builtins.attrValues {
factorio = pkgs.unstableUnfree.factorio.override {
factorio = pkgs.factorio.override {
username = "maralorn";
token = import ../../nixos/machines/apollo/secret/factory.nix;
experimental = true;
};
inherit (pkgs.unfree) steam;
inherit (pkgs) minetest;
inherit (pkgs) steam minetest;
inherit gw2run gw2setup wine;
};
}

3
home-manager/roles/laptop.nix
View file

@ -39,13 +39,14 @@ in {
activate-mode > /dev/null
'';
inherit (pkgs.unfree) zoom-us skypeforlinux google-chrome;
inherit (pkgs.gnome3) nautilus;
inherit (pkgs.xorg) xbacklight;
inherit (pkgs)
# web
chromium
zoom-us skypeforlinux google-chrome
mumble upower speedtest-cli acpi
anki

9
overlays/20-unfree.nix
View file

@ -1,8 +1,7 @@
self: super:
if super.config.allowUnfree or false then
{ }
else {
let
unfree = import self.sources.nixpkgs { 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; }