diff options
author | tv <tv@shackspace.de> | 2015-08-13 17:09:56 +0200 |
---|---|---|
committer | tv <tv@shackspace.de> | 2015-08-13 17:09:56 +0200 |
commit | a33f90358d0f57025daddb0ae41d65707fb34cf3 (patch) | |
tree | 7f91c889c45fd8995af98d91b0670fb0e90b1d53 /makefu/2configs/base-gui.nix | |
parent | 9f92ba455c4b13f4d960bae65cd577c9aad30dc4 (diff) | |
parent | 4366ffd6c5d401e3719a588f5ac98365aef8bd89 (diff) |
Merge remote-tracking branch 'pnp/master'
Diffstat (limited to 'makefu/2configs/base-gui.nix')
-rw-r--r-- | makefu/2configs/base-gui.nix | 58 |
1 files changed, 46 insertions, 12 deletions
diff --git a/makefu/2configs/base-gui.nix b/makefu/2configs/base-gui.nix index 5f977251..4e5558a1 100644 --- a/makefu/2configs/base-gui.nix +++ b/makefu/2configs/base-gui.nix @@ -1,23 +1,57 @@ { config, lib, pkgs, ... }: - +## +# of course this name is a lie - it prepares a GUI environment close to my +# current configuration. +# +# autologin with mainUser into awesome +## +# with lib; +let + mainUser = config.krebs.build.user.name; +in { imports = [ ]; - services.xserver.enable = true; - services.xserver.layout = "us"; + services.xserver = { + enable = true; + layout = "us"; + xkbVariant = "altgr-intl"; + xkbOptions = "ctrl:nocaps"; + + windowManager = { + awesome.enable = true; + awesome.luaModules = [ pkgs.luaPackages.vicious ]; + default = "awesome"; + }; + + displayManager.auto.enable = true; + displayManager.auto.user = mainUser; + desktopManager.xterm.enable = false; + }; + +## FONTS +# TODO: somewhere else? -# 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; + i18n.consoleFont = "Lat2-Terminus16"; - security.setuidPrograms = [ "slock" ]; + fonts = { + enableCoreFonts = true; + enableFontDir = true; + enableGhostscriptFonts = false; + fonts = [ pkgs.terminus_font ]; + }; -# use pulseaudio - environment.systemPackages = [ pkgs.slock ]; + environment.systemPackages = with pkgs;[ + xlockmore + rxvt_unicode-with-plugins + vlc + firefox + chromium + ]; + # TODO: use mainUser + users.extraUsers.makefu.extraGroups = [ "audio" ]; hardware.pulseaudio = { enable = true; - systemWide = true; + # systemWide = true; }; - } |