test vicious for awesome on tsp

2 files changed, 24 insertions, 10 deletions

diff --git a/makefu/1systems/tsp.nix b/makefu/1systems/tsp.nix
index 3de2d300c..d67a5c076 100644
--- a/makefu/1systems/tsp.nix
+++ b/makefu/1systems/tsp.nix
@@ -10,17 +10,20 @@
       ../2configs/base.nix
       ../2configs/base-gui.nix
     ];
-  services.xserver = {
-    videoDriver = "intel";
-  };
+  # not working in vm
+  #services.xserver = {
+  #  videoDriver = "intel";
+  #};
   krebs.build.host = config.krebs.hosts.tsp;
   krebs.build.user = config.krebs.users.makefu;
   krebs.build.target = "root@tsp";
 
   krebs.build.deps = {
     nixpkgs = {
-      url = https://github.com/NixOS/nixpkgs;
-      rev = "4c01e6d91993b6de128795f4fbdd25f6227fb870";
+      #url = https://github.com/NixOS/nixpkgs;
+      url = https://github.com/makefu/nixpkgs;
+      #rev = "4c01e6d91993b6de128795f4fbdd25f6227fb870";
+      rev = "08275910ba86ed9bd7a2608e6a1e5285faf24cb2";
     };
     # TODO generalize in base.nix
     secrets = {
diff --git a/makefu/2configs/base-gui.nix b/makefu/2configs/base-gui.nix
index 5f977251f..056005f75 100644
--- a/makefu/2configs/base-gui.nix
+++ b/makefu/2configs/base-gui.nix
@@ -3,13 +3,24 @@
 with lib;
 {
   imports = [ ];
-  services.xserver.enable = true;
-  services.xserver.layout = "us";
+  services.xserver = {
+    enable = true;
+    layout = "us";
 
 # use awesome, direct boot into
-  services.xserver.displayManager.auto.enable =true;
-  services.xserver.displayManager.auto.user =config.krebs.users.makefu;
-  services.xserver.windowManager.awesome.enable = true;
+    displayManager.auto.enable = true;
+# TODO: use config.krebs.users.makefu ... or not
+    displayManager.auto.user = "makefu";
+
+    windowManager = {
+      awesome.enable = true;
+      awesome.luaModules = [ pkgs.luaPackages.vicious ];
+      default = "awesome";
+    };
+
+    desktopManager.xterm.enable = false;
+    desktopManager.default = "none";
+  };
 
   security.setuidPrograms = [ "slock" ];