cleanup, minor changes

This commit is contained in:
lassulus 2015-05-15 16:42:01 +02:00 committed by tv
parent 709777dd49
commit 1eb9c8fdd1
4 changed files with 18 additions and 31 deletions

View File

@ -1,4 +1,4 @@
{ config, lib, pkgs, ... }:
{ lib, ... }:
with lib;

View File

@ -7,7 +7,7 @@
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFCZSq5oLrokkh3F+MOdK5/nzVIEDvqyvfzLMNWmzsYD root@uriel"
];
nix.binaryCaches = [
"ssh://nix@mors"
"ssh://nix@uriel"
"scp://nix-ssh@mors"
"scp://nix-ssh@uriel"
];
}

View File

@ -35,6 +35,7 @@
networking.extraHosts = ''
'';
nix.maxJobs = 4;
hardware.enableAllFirmware = true;
@ -153,8 +154,8 @@
'';
};
#TODO move into modules
users.extraUsers = {
#main user
mainUser = {
uid = 1337;
name = "lass";
@ -166,20 +167,6 @@
isSystemUser = false;
extraGroups = [ "wheel" "audio" ];
};
root = {
#main user
#miefda-mc-dev user
miefda = {
uid = 1338;
name = "miefda";
#isNormalUser = true;
group = "users";
createHome = true;
home = "/home/miefda";
useDefaultShell = true;
isSystemUser = false;
description = "miefda-minecraft-dev";
};
};
environment.systemPackages = with pkgs; [

View File

@ -1,6 +1,6 @@
{ config, pkgs, ... }:
{ config, pkgs, ... }:
{
{
imports = [
../lass/desktop-base.nix
../lass/retiolum-uriel.nix