Merge branch 'master' of prism:stockholm

2 files changed, 14 insertions, 2 deletions

diff --git a/nin/1systems/axon/config.nix b/nin/1systems/axon/config.nix
index 483a4f84b..5e81afdbd 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}
     '';
diff --git a/nin/source.nix b/nin/source.nix
index ae13c5583..a4bf0a98c 100644
--- a/nin/source.nix
+++ b/nin/source.nix
@@ -7,6 +7,7 @@ host@{ name, secure ? false }: let
   pkgs = import <nixpkgs> {
     overlays = map import [
       <stockholm/krebs/5pkgs>
+      <stockholm/submodules/nix-writers/pkgs>
     ];
   };
 in