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 17 additions and 2 deletions
Showing only changes of commit e28460c394 - Show all commits

View file

@ -3,5 +3,5 @@
}:
{
home-manager.users.steveej = import ../../../home-manager/configuration/graphical-fullblown.nix;
home-manager.users.steveej = import ../../../home-manager/configuration/text-minimal.txt;
}

View file

@ -1,8 +1,12 @@
{ pkgs
, lib
, config
, ... }:
{
let
keys = import ../../../variables/keys.nix;
in {
# TASK: new device
networking.hostName = "CFB4ED74"; # Define your hostname.
@ -18,4 +22,15 @@
services.spice-vdagentd.enable = true;
services.qemuGuest.enable = true;
networking.useDHCP = true;
boot.initrd.network = {
enable = true;
udhcpc.extraArgs = [ "-x hostname:${config.networking.hostName}" ];
ssh = {
enable = true;
authorizedKeys = keys.users.steveej.openssh;
};
};
}