summaryrefslogtreecommitdiffstats
path: root/nin/1systems
diff options
context:
space:
mode:
authorjeschli <jeschli@gmail.com>2018-06-19 09:22:42 +0200
committerjeschli <jeschli@gmail.com>2018-06-19 09:22:42 +0200
commit0147c69753e90570ab5e17192ec0adedeed25cf9 (patch)
tree864190dbc7b2a113efb445d7814c56ae39add57b /nin/1systems
parent616d84918e017e4d66d75156f0114d56f66533e1 (diff)
parentb74ea0ee6a44a4c3e2f8f42bd119c75758168ad6 (diff)
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'nin/1systems')
-rw-r--r--nin/1systems/axon/config.nix15
1 files changed, 13 insertions, 2 deletions
diff --git a/nin/1systems/axon/config.nix b/nin/1systems/axon/config.nix
index 483a4f8..5e81afd 100644
--- a/nin/1systems/axon/config.nix
+++ b/nin/1systems/axon/config.nix
@@ -59,7 +59,11 @@ with lib;
# nin config
time.timeZone = "Europe/Berlin";
- services.xserver.enable = true;
+ services.xserver = {
+ enable = true;
+
+ displayManager.lightdm.enable = true;
+ };
networking.networkmanager.enable = true;
#networking.wireless.enable = true;
@@ -76,12 +80,19 @@ with lib;
#nixpkgs.config.steam.java = true;
environment.systemPackages = with pkgs; [
+ atom
+ chromium
firefox
git
+ htop
+ keepassx
lmms
networkmanagerapplet
+ openvpn
python
+ ruby
steam
+ taskwarrior
thunderbird
vim
virtmanager
@@ -109,7 +120,7 @@ with lib;
Control + p
'';
in {
- enable = true;
+ enable = true;
extraSessionCommands = ''
${pkgs.xbindkeys}/bin/xbindkeys -f ${xbindConfig}
'';