pub-solar/os
5
0
Fork 2
Code Issues 4 Pull requests Packages Projects 1 Releases Wiki Activity

pkgs: simplify override

Browse source
This commit is contained in:
Timothy DeHerrera 2021-01-11 19:59:49 -07:00
parent d35195187f
commit f2aedb889b
No known key found for this signature in database
GPG key ID: 8985725DB5B0C122
2 changed files with 15 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
hosts/default.nix
View file

@ -67,12 +67,8 @@ let
nixpkgs.overlays = nixpkgs.overlays =
let let
override = import ../pkgs/override.nix unstablePkgs; override = import ../pkgs/override.nix unstablePkgs;
overlay = pkg: final: prev: {
"${pkg.pname}" = pkg;
};
in in
map overlay override; [ override ];
}; };
local = import "${toString ./.}/${hostName}.nix"; local = import "${toString ./.}/${hostName}.nix";

27
pkgs/override.nix
View file

@ -1,16 +1,17 @@
# Packages in this list are imported by hosts/default.nix, and are pulled from # Packages inherited are imported in hosts/default.nix, and are pulled from
# nixpkgs master instead of the default nixos release. This doesn't actually # nixpkgs master instead of the default nixos release. This doesn't actually
# install them, just creates an overlay to pull them from master if they are # install them, just creates an overlay to pull them from master if they are
# installed by the user elsewhere in the configuration. # installed by the user elsewhere in the configuration.
pkgs: pkgs: final: prev:
with pkgs; {
[ inherit (pkgs)
starship dhall
element-desktop discord
discord element-desktop
signal-desktop manix
dhall nixpkgs-fmt
nixpkgs-fmt qutebrowser
manix signal-desktop
qutebrowser starship;
]
}