summaryrefslogtreecommitdiffstats
path: root/lass/1systems/helios.nix
diff options
context:
space:
mode:
authortv <tv@krebsco.de>2016-07-09 13:11:05 +0200
committertv <tv@krebsco.de>2016-07-09 13:11:05 +0200
commit91ccc70745c232834f180e3b1cfff571cd04b267 (patch)
tree02c3d5b08771493297e8cad9665ccd13e4f785de /lass/1systems/helios.nix
parentdd9dbb3a896d1a0f610d60509a6d02f1737bc74b (diff)
parentec183d5531455d60b4c2423d657963b496e47b4b (diff)
Merge remote-tracking branch 'prism/master'
Diffstat (limited to 'lass/1systems/helios.nix')
-rw-r--r--lass/1systems/helios.nix44
1 files changed, 37 insertions, 7 deletions
diff --git a/lass/1systems/helios.nix b/lass/1systems/helios.nix
index 51d2afe84..5f161d731 100644
--- a/lass/1systems/helios.nix
+++ b/lass/1systems/helios.nix
@@ -1,10 +1,11 @@
{ config, pkgs, ... }:
with builtins;
+with config.krebs.lib;
+
{
imports = [
../.
- ../2configs/baseX.nix
../2configs/exim-retiolum.nix
../2configs/browsers.nix
../2configs/programs.nix
@@ -12,6 +13,36 @@ with builtins;
../2configs/pass.nix
../2configs/fetchWallpaper.nix
../2configs/backups.nix
+
+ #{
+ # # conflicting stuff with gnome setup
+ # # TODO: fix this
+ # imports = [
+ # ../2configs/baseX.nix
+ # ];
+ # networking.wireless.enable = true;
+ #}
+ {
+ # gnome3 for suja
+ imports = [
+ ../2configs/default.nix
+ ];
+ services.xserver.enable = true;
+ services.xserver.desktopManager.gnome3.enable = true;
+ users.users.suja = {
+ uid = genid "suja";
+ home = "/home/suja";
+ group = "users";
+ createHome = true;
+ useDefaultShell = true;
+ extraGroups = [
+ ];
+ };
+ environment.systemPackages = with pkgs; [
+ firefox
+ chromium
+ ];
+ }
#{
# users.extraUsers = {
# root = {
@@ -21,11 +52,11 @@ with builtins;
# };
# };
#}
- {
- services.elasticsearch = {
- enable = true;
- };
- }
+ #{
+ # services.elasticsearch = {
+ # enable = true;
+ # };
+ #}
{
lass.power-action.battery = "BAT1";
}
@@ -33,7 +64,6 @@ with builtins;
krebs.build.host = config.krebs.hosts.helios;
- networking.wireless.enable = true;
hardware.enableAllFirmware = true;
nixpkgs.config.allowUnfree = true;