diff options
| author | makefu <github@syntax-fehler.de> | 2016-08-24 12:13:58 +0200 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2016-08-24 12:13:58 +0200 |
| commit | 07bea34ab27bc52b8a002335c5590cd29542b32b (patch) | |
| tree | b0e90a3d2788a746b0fb9dc5841c8b789decd50a /lass/1systems/helios.nix | |
| parent | aa21de8764eef9f01cd9285590ebbe911a34f9fc (diff) | |
| parent | 57a413567b71270de4357ae6317dc390abe0b6ea (diff) | |
Merge remote-tracking branch 'prism/master'
Diffstat (limited to 'lass/1systems/helios.nix')
| -rw-r--r-- | lass/1systems/helios.nix | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/lass/1systems/helios.nix b/lass/1systems/helios.nix index 53026a6fb..26ad316ce 100644 --- a/lass/1systems/helios.nix +++ b/lass/1systems/helios.nix @@ -6,6 +6,7 @@ with config.krebs.lib; { imports = [ ../. + ../2configs/retiolum.nix ../2configs/exim-retiolum.nix ../2configs/browsers.nix ../2configs/programs.nix @@ -20,27 +21,30 @@ with config.krebs.lib; # imports = [ # ../2configs/baseX.nix # ]; - # networking.wireless.enable = true; #} { # gnome3 for suja - imports = [ - ../2configs/default.nix - ]; + time.timeZone = "Europe/Berlin"; services.xserver.enable = true; - services.xserver.desktopManager.gnome3.enable = true; - users.users.suja = { - uid = genid "suja"; - home = "/home/suja"; + services.xserver.desktopManager.xfce.enable = true; + networking.wireless.enable = true; + users.users.ferret = { + uid = genid "ferret"; + home = "/home/ferret"; group = "users"; createHome = true; useDefaultShell = true; extraGroups = [ ]; + hashedPassword = "$6$SaneLuyep90p8BPn$0IDbvLgNbRGZL96obWavanTmY6IkBG84vs2b/2oqlpbmTZH3retOYbQKF1uVqu6dD0ZGF4eBq9tqPbwUjRyY00"; }; environment.systemPackages = with pkgs; [ firefox chromium + oraclejre8 + maven + arandr + libreoffice ]; } #{ |