From fa38155eec9563dc9dc620a77900d87b97443cfe Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Sat, 15 Jul 2017 18:57:16 +0200
Subject: ma: move systems to subdir, init source

---
 makefu/1systems/sdev/config.nix | 56 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 56 insertions(+)
 create mode 100644 makefu/1systems/sdev/config.nix

(limited to 'makefu/1systems/sdev')

diff --git a/makefu/1systems/sdev/config.nix b/makefu/1systems/sdev/config.nix
new file mode 100644
index 000000000..233f7cefa
--- /dev/null
+++ b/makefu/1systems/sdev/config.nix
@@ -0,0 +1,56 @@
+{ lib, config, pkgs, ... }:
+{
+  krebs.build.host = config.krebs.hosts.sdev;
+  makefu.awesome.modkey = "Mod1";
+  imports =
+    [ # Include the results of the hardware scan.
+      ../.
+      (toString <nixpkgs/nixos/modules/virtualisation/virtualbox-image.nix>)
+      (toString <nixpkgs/nixos/modules/virtualisation/virtualbox-guest.nix>)
+      ../2configs/main-laptop.nix #< base-gui
+      # <secrets/extra-hosts.nix>
+
+      # environment
+      ../2configs/tinc/retiolum.nix
+
+    ];
+  # workaround for https://github.com/NixOS/nixpkgs/issues/16641
+  services.xserver.videoDrivers = lib.mkOverride 45 [ "virtualbox" "modesetting" ];
+
+  nixpkgs.config.allowUnfree = true;
+
+  # allow sdev to deploy self
+  users.extraUsers = {
+    root = {
+        openssh.authorizedKeys.keys = [ config.krebs.users.makefu-vbob.pubkey  ];
+    };
+  };
+
+  environment.systemPackages = with pkgs;[
+    ppp xclip
+    get
+    passwdqc-utils
+    docker
+    gnupg
+    populate
+    (pkgs.writeScriptBin "tor-browser" ''
+      #! /bin/sh
+      TOR_SKIP_LAUNCH=1 ${torbrowser}/bin/tor-browser
+    '')
+  ];
+
+  virtualisation.docker.enable = true;
+
+  networking.firewall.allowedTCPPorts = [
+    25
+    80
+    8010
+  ];
+
+  fileSystems."/media/share" = {
+    fsType = "vboxsf";
+    device = "share";
+    options = [ "rw" "uid=9001" "gid=9001" ];
+  };
+
+}
-- 
cgit v1.2.3


From 7704f80890c75f65c2906ecc17cdd89761d308ad Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Sat, 15 Jul 2017 19:01:02 +0200
Subject: ma: replace path to 2configs, init source.nix

---
 makefu/1systems/sdev/config.nix | 6 +++---
 makefu/1systems/sdev/source.nix | 3 +++
 2 files changed, 6 insertions(+), 3 deletions(-)
 create mode 100644 makefu/1systems/sdev/source.nix

(limited to 'makefu/1systems/sdev')

diff --git a/makefu/1systems/sdev/config.nix b/makefu/1systems/sdev/config.nix
index 233f7cefa..f3853a788 100644
--- a/makefu/1systems/sdev/config.nix
+++ b/makefu/1systems/sdev/config.nix
@@ -4,14 +4,14 @@
   makefu.awesome.modkey = "Mod1";
   imports =
     [ # Include the results of the hardware scan.
-      ../.
+      <stockholm/makefu>
       (toString <nixpkgs/nixos/modules/virtualisation/virtualbox-image.nix>)
       (toString <nixpkgs/nixos/modules/virtualisation/virtualbox-guest.nix>)
-      ../2configs/main-laptop.nix #< base-gui
+      <stockholm/makefu/2configs/main-laptop.nix #< base-gui>
       # <secrets/extra-hosts.nix>
 
       # environment
-      ../2configs/tinc/retiolum.nix
+      <stockholm/makefu/2configs/tinc/retiolum.nix>
 
     ];
   # workaround for https://github.com/NixOS/nixpkgs/issues/16641
diff --git a/makefu/1systems/sdev/source.nix b/makefu/1systems/sdev/source.nix
new file mode 100644
index 000000000..833d9bf73
--- /dev/null
+++ b/makefu/1systems/sdev/source.nix
@@ -0,0 +1,3 @@
+import <stockholm/makefu/source.nix> {
+  name="sdev";
+}
-- 
cgit v1.2.3