Periodic merge of staging to master #14

Merged
steveej merged 71 commits from staging into master 2019-01-18 10:53:52 +00:00
2 changed files with 10 additions and 2 deletions
Showing only changes of commit ef93fc3c24 - Show all commits

View file

@ -282,6 +282,12 @@ in {
${pkgs.autorandr}/bin/autorandr -c ${pkgs.autorandr}/bin/autorandr -c
${pkgs.feh}/bin/feh --bg-scale ${pkgs.nixos-artwork.wallpapers.simple-blue}/share/artwork/gnome/nix-wallpaper-simple-blue.png ${pkgs.feh}/bin/feh --bg-scale ${pkgs.nixos-artwork.wallpapers.simple-blue}/share/artwork/gnome/nix-wallpaper-simple-blue.png
''; '';
pointerCursor = {
name = "Vanilla-DMZ-AA";
package = pkgs.vanilla-dmz;
size = 32;
};
}; };
home.packages = with pkgs; [ home.packages = with pkgs; [

View file

@ -1,5 +1,5 @@
{ { pkgs
... , ...
}: }:
{ {
@ -15,5 +15,7 @@
"firefox" "firefox"
]; ];
}; };
home.file.".mozilla/native-messaging-hosts/passff.json".source = "${pkgs.passff-host}/share/passff-host/passff.json";
} }