diff options
| author | makefu <github@syntax-fehler.de> | 2015-12-04 10:16:09 +0100 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2015-12-04 10:16:09 +0100 |
| commit | 65cc52e01e18c823016a3043b8cf41822934cc3c (patch) | |
| tree | 58aa8971a4e571234a762eee20c7ec7f57a2b4d4 /mv/1systems | |
| parent | 597f9e8597c95ac9e4cba1689322c433bb0c9a75 (diff) | |
| parent | b5ffb88ba3a77d4f399d7a2815e2c61d53545f5d (diff) | |
Merge branch 'master' of pnp:stockholm
Conflicts:
makefu/1systems/gum.nix
Diffstat (limited to 'mv/1systems')
| -rw-r--r-- | mv/1systems/stro.nix | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/mv/1systems/stro.nix b/mv/1systems/stro.nix index 9edcea00..38d4b4bc 100644 --- a/mv/1systems/stro.nix +++ b/mv/1systems/stro.nix @@ -12,6 +12,7 @@ with lib; imports = [ ../2configs/hw/x220.nix + ../2configs/git.nix ../2configs/mail-client.nix ../2configs/xserver { @@ -154,7 +155,7 @@ with lib; connectTo = [ "cd" "gum" - "pigstarter" + "wry" ]; }; } @@ -217,6 +218,7 @@ with lib; "sendmail" # for cron ]; + services.bitlbee.enable = true; services.printing.enable = true; services.journald.extraConfig = '' |