Merge remote-tracking branch 'onondaga-http/master'

This commit is contained in:
lassulus 2018-06-14 21:59:03 +02:00
commit c19baeee13

View File

@ -59,7 +59,11 @@ with lib;
# nin config # nin config
time.timeZone = "Europe/Berlin"; time.timeZone = "Europe/Berlin";
services.xserver.enable = true; services.xserver = {
enable = true;
displayManager.lightdm.enable = true;
};
networking.networkmanager.enable = true; networking.networkmanager.enable = true;
#networking.wireless.enable = true; #networking.wireless.enable = true;
@ -76,12 +80,19 @@ with lib;
#nixpkgs.config.steam.java = true; #nixpkgs.config.steam.java = true;
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
atom
chromium
firefox firefox
git git
htop
keepassx
lmms lmms
networkmanagerapplet networkmanagerapplet
openvpn
python python
ruby
steam steam
taskwarrior
thunderbird thunderbird
vim vim
virtmanager virtmanager
@ -109,7 +120,7 @@ with lib;
Control + p Control + p
''; '';
in { in {
enable = true; enable = true;
extraSessionCommands = '' extraSessionCommands = ''
${pkgs.xbindkeys}/bin/xbindkeys -f ${xbindConfig} ${pkgs.xbindkeys}/bin/xbindkeys -f ${xbindConfig}
''; '';