refactor(pkgs): Add wallpapers to top-level package set

This commit is contained in:
Vincent Ambo 2018-03-04 22:08:07 +01:00
parent 0937f19408
commit bcd317f23d
2 changed files with 9 additions and 5 deletions

View file

@ -2,8 +2,7 @@
{ config, lib, pkgs, ... }: { config, lib, pkgs, ... }:
let wallpapers = import ./pkgs/wallpapers.nix; let emacs = import ./emacs.nix { inherit pkgs; };
emacs = import ./emacs.nix { inherit pkgs; };
in { in {
# Configure basic X-server stuff: # Configure basic X-server stuff:
services.xserver = { services.xserver = {
@ -52,7 +51,7 @@ in {
description = "Randomly set wallpaper via feh"; description = "Randomly set wallpaper via feh";
serviceConfig = { serviceConfig = {
Type = "oneshot"; Type = "oneshot";
WorkingDirectory = "${wallpapers}/share/wallpapers"; WorkingDirectory = "${pkgs.wallpapers}/share/wallpapers";
# Manually shuffle because feh's --randomize option can't be restricted to # Manually shuffle because feh's --randomize option can't be restricted to
# just certain file types. # just certain file types.

View file

@ -8,8 +8,13 @@ let unstable = import <nixos-unstable> { config.allowUnfree = true; };
rust-overlay = import nixpkgs-mozilla/rust-overlay.nix; rust-overlay = import nixpkgs-mozilla/rust-overlay.nix;
in { in {
# Configure the Nix package manager # Configure the Nix package manager
nixpkgs.config.allowUnfree = true; nixpkgs = {
nixpkgs.overlays = [ rust-overlay ]; overlays = [ rust-overlay ];
config.allowUnfree = true;
config.packageOverrides = oldPkgs: oldPkgs // {
wallpapers = import ./pkgs/wallpapers.nix;
};
};
# ... and declare packages to be installed. # ... and declare packages to be installed.
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [