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 | 86e3bf940ca9f62e330e1f252c2b6e759ef762ac (patch) | |
tree | f493af75ea0479dc7d8d01abfcd3dc84aaca1fce /1systems | |
parent | e2f77435d7816c426d1920d2d3cb7724eaa9db31 (diff) | |
parent | 77f3bbeb158707527bdfd6726bcbab09202c37b5 (diff) |
Merge branch 'master' of pnp:stockholm
Conflicts:
makefu/1systems/gum.nix
Diffstat (limited to '1systems')
-rw-r--r-- | 1systems/gum.nix | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/1systems/gum.nix b/1systems/gum.nix index 9de07266e..75607aa46 100644 --- a/1systems/gum.nix +++ b/1systems/gum.nix @@ -13,15 +13,21 @@ in { ../2configs/fs/single-partition-ext4.nix # ../2configs/iodined.nix ../2configs/git/cgit-retiolum.nix - + ../2configs/mattermost-docker.nix ]; + + + ###### stable krebs.build.target = "root@gum.krebsco.de"; krebs.build.host = config.krebs.hosts.gum; + + # Chat environment.systemPackages = with pkgs;[ weechat bepasty-client-cli + get ]; services.bitlbee.enable = true; @@ -31,7 +37,6 @@ in { boot.kernelModules = [ "kvm-intel" ]; # Network - services.udev.extraRules = '' SUBSYSTEM=="net", ATTR{address}=="c8:0a:a9:c8:ee:dd", NAME="et0" ''; |