summaryrefslogtreecommitdiffstats
path: root/lass/1systems
diff options
context:
space:
mode:
authornin <nineinchnade@gmail.com>2017-11-07 20:49:48 +0100
committernin <nineinchnade@gmail.com>2017-11-07 20:49:48 +0100
commitd2551a2268e54fede53d982e0173424735f94680 (patch)
treed65ad5523a650de810f6733e02e5471eed83f57e /lass/1systems
parentfa78b6615444e6db21045f93c2b3ae763e23aff9 (diff)
parent111c94fe61e5c47f3af04e38b6d804ee43ca8e98 (diff)
Merge remote-tracking branch 'prism/master'
Diffstat (limited to 'lass/1systems')
-rw-r--r--lass/1systems/helios/config.nix10
-rw-r--r--lass/1systems/mors/config.nix1
2 files changed, 11 insertions, 0 deletions
diff --git a/lass/1systems/helios/config.nix b/lass/1systems/helios/config.nix
index 70aa3832d..c64789d8d 100644
--- a/lass/1systems/helios/config.nix
+++ b/lass/1systems/helios/config.nix
@@ -105,6 +105,8 @@ with import <stockholm/lib>;
{ output = "DP-2"; primary = true; }
];
+ networking.hostName = lib.mkForce "BLN02NB0162";
+
security.pki.certificateFiles = [
(pkgs.fetchurl { url = "http://pki.dcso.de/ca/PEM/DCSOCAROOTC1G1.pem"; sha256 = "14vz9c0fk6li0a26vx0s5ha6y3yivnshx9pjlh9vmnpkbph5a7rh"; })
(pkgs.fetchurl { url = "http://pki.dcso.de/ca/PEM/DCSOCAROOTC2G1.pem"; sha256 = "0r1dd48a850cv7whk4g2maik550rd0vsrsl73r6x0ivzz7ap1xz5"; })
@@ -117,4 +119,12 @@ with import <stockholm/lib>;
];
lass.screenlock.command = "${pkgs.i3lock}/bin/i3lock -i /home/lass/lock.png -t -f";
+
+ programs.adb.enable = true;
+ users.users.mainUser.extraGroups = [ "adbusers" ];
+
+ services.printing = {
+ enable = true;
+ drivers = [ pkgs.postscript-lexmark ];
+ };
}
diff --git a/lass/1systems/mors/config.nix b/lass/1systems/mors/config.nix
index 610bfef8e..6a61ce1fa 100644
--- a/lass/1systems/mors/config.nix
+++ b/lass/1systems/mors/config.nix
@@ -29,6 +29,7 @@ with import <stockholm/lib>;
<stockholm/lass/2configs/syncthing.nix>
<stockholm/lass/2configs/otp-ssh.nix>
<stockholm/lass/2configs/c-base.nix>
+ <stockholm/tv/2configs/br.nix>
{
#risk of rain port
krebs.iptables.tables.filter.INPUT.rules = [