Mic92/stockholm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

test vicious for awesome on tsp

Browse Source
This commit is contained in:
makefu 2015-08-05 15:11:52 +02:00
parent b3c25831d1
commit dd8c918c87
2 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
makefu/1systems/tsp.nix
View File

@ -10,17 +10,20 @@
../2configs/base.nix ../2configs/base.nix
../2configs/base-gui.nix ../2configs/base-gui.nix
]; ];
services.xserver = { # not working in vm
videoDriver = "intel"; #services.xserver = {
}; # videoDriver = "intel";
#};
krebs.build.host = config.krebs.hosts.tsp; krebs.build.host = config.krebs.hosts.tsp;
krebs.build.user = config.krebs.users.makefu; krebs.build.user = config.krebs.users.makefu;
krebs.build.target = "root@tsp"; krebs.build.target = "root@tsp";
krebs.build.deps = { krebs.build.deps = {
nixpkgs = { nixpkgs = {
url = https://github.com/NixOS/nixpkgs; #url = https://github.com/NixOS/nixpkgs;
rev = "4c01e6d91993b6de128795f4fbdd25f6227fb870"; url = https://github.com/makefu/nixpkgs;
#rev = "4c01e6d91993b6de128795f4fbdd25f6227fb870";
rev = "08275910ba86ed9bd7a2608e6a1e5285faf24cb2";
}; };
# TODO generalize in base.nix # TODO generalize in base.nix
secrets = { secrets = {

21
makefu/2configs/base-gui.nix
View File

@ -3,13 +3,24 @@
with lib; with lib;
{ {
imports = [ ]; imports = [ ];
services.xserver.enable = true; services.xserver = {
services.xserver.layout = "us"; enable = true;
layout = "us";
# use awesome, direct boot into # use awesome, direct boot into
services.xserver.displayManager.auto.enable =true; displayManager.auto.enable = true;
services.xserver.displayManager.auto.user =config.krebs.users.makefu; # TODO: use config.krebs.users.makefu ... or not
services.xserver.windowManager.awesome.enable = true; 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" ]; security.setuidPrograms = [ "slock" ];