From 6f2e4f52ef8786014f3fea7283a469e09bf117dc Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Thu, 8 Sep 2016 21:01:55 +0200
Subject: l 1 prism: run repo-sync every 5 minutes

---
 lass/1systems/prism.nix | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'lass/1systems')

diff --git a/lass/1systems/prism.nix b/lass/1systems/prism.nix
index c7c765302..9cf5ca009 100644
--- a/lass/1systems/prism.nix
+++ b/lass/1systems/prism.nix
@@ -260,6 +260,11 @@ in {
        { predicate = "-p tcp --dport 8088"; target = "ACCEPT"; }
       ];
     }
+    {
+      krebs.repo-sync.timerConfig = {
+        OnCalendar = "*:0/5";
+      };
+    }
   ];
 
   krebs.build.host = config.krebs.hosts.prism;
-- 
cgit v1.2.3


From 8cfca37f5e87dd91e1676b4ad23578a9bf5bdf2b Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Thu, 8 Sep 2016 21:02:39 +0200
Subject: l 1 uriel: configure laptop for locke

---
 lass/1systems/uriel.nix | 42 ++++++++++++++++++++++++++++++------------
 1 file changed, 30 insertions(+), 12 deletions(-)

(limited to 'lass/1systems')

diff --git a/lass/1systems/uriel.nix b/lass/1systems/uriel.nix
index 16c39280d..8b7d827ca 100644
--- a/lass/1systems/uriel.nix
+++ b/lass/1systems/uriel.nix
@@ -1,25 +1,43 @@
 { config, pkgs, ... }:
 
 with builtins;
+with config.krebs.lib;
 {
   imports = [
     ../.
     ../2configs/retiolum.nix
-    ../2configs/baseX.nix
     ../2configs/exim-retiolum.nix
-    ../2configs/browsers.nix
-    ../2configs/games.nix
-    ../2configs/pass.nix
-    ../2configs/bird.nix
-    ../2configs/git.nix
-    ../2configs/chromium-patched.nix
-    ../2configs/bitlbee.nix
-    ../2configs/weechat.nix
-    ../2configs/skype.nix
     {
-      lass.umts = {
+      # locke config
+      time.timeZone = "Europe/Berlin";
+      services.xserver.enable = true;
+      users.users.locke = {
+        uid = genid "locke";
+        home = "/home/locke";
+        group = "users";
+        createHome = true;
+        extraGroups = [
+          "audio"
+          "networkmanager"
+        ];
+        useDefaultShell = true;
+      };
+      networking.networkmanager.enable = true;
+      networking.wireless.enable = mkForce false;
+      hardware.pulseaudio = {
+        enable = true;
+        systemWide = true;
+      };
+      environment.systemPackages = with pkgs; [
+        firefox
+        hexchat
+        networkmanagerapplet
+      ];
+      services.xserver.desktopManager.xfce = {
         enable = true;
-        modem = "/dev/serial/by-id/usb-HUAWEI_Technologies_HUAWEI_Mobile-if00-port0";
+        thunarPlugins = [
+          pkgs.xfce/xfce_battery_plugin
+        ];
       };
     }
   ];
-- 
cgit v1.2.3


From f9148e16d478bdf6339d194cd9c8770ff244e759 Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Tue, 13 Sep 2016 00:04:48 +0200
Subject: l 2: add iodined.nix & import in prism

---
 lass/1systems/prism.nix | 1 +
 1 file changed, 1 insertion(+)

(limited to 'lass/1systems')

diff --git a/lass/1systems/prism.nix b/lass/1systems/prism.nix
index 9cf5ca009..b508103c5 100644
--- a/lass/1systems/prism.nix
+++ b/lass/1systems/prism.nix
@@ -23,6 +23,7 @@ in {
     ../2configs/buildbot-standalone.nix
     ../2configs/repo-sync.nix
     ../2configs/binary-cache/server.nix
+    ../2configs/iodined.nix
     {
       imports = [
         ../2configs/git.nix
-- 
cgit v1.2.3


From d80da94fb1cf9eee4a988d0829559de8256e9331 Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Tue, 13 Sep 2016 00:12:45 +0200
Subject: l 1 uriel: xfcePlugins are not thnarPlugins

---
 lass/1systems/uriel.nix | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'lass/1systems')

diff --git a/lass/1systems/uriel.nix b/lass/1systems/uriel.nix
index 8b7d827ca..c6d4dbd89 100644
--- a/lass/1systems/uriel.nix
+++ b/lass/1systems/uriel.nix
@@ -35,9 +35,6 @@ with config.krebs.lib;
       ];
       services.xserver.desktopManager.xfce = {
         enable = true;
-        thunarPlugins = [
-          pkgs.xfce/xfce_battery_plugin
-        ];
       };
     }
   ];
-- 
cgit v1.2.3


From f5e177b5279bbdbbb78e68bc961dc475ad8b6a1e Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Sat, 1 Oct 2016 02:13:47 +0200
Subject: l 1 mors: add iodine to pkgs

---
 lass/1systems/mors.nix | 1 +
 1 file changed, 1 insertion(+)

(limited to 'lass/1systems')

diff --git a/lass/1systems/mors.nix b/lass/1systems/mors.nix
index 1aa4d9b23..c3c7f6b59 100644
--- a/lass/1systems/mors.nix
+++ b/lass/1systems/mors.nix
@@ -194,6 +194,7 @@ with config.krebs.lib;
     remmina
 
     logf
+    iodine
   ];
 
   #TODO: fix this shit
-- 
cgit v1.2.3


From 4d7df5a4ee8cfa3fd1524b9442fefa3b0e3aebe7 Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Sun, 2 Oct 2016 12:38:04 +0200
Subject: l 1 mors: add macchanger to pkgs

---
 lass/1systems/mors.nix | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'lass/1systems')

diff --git a/lass/1systems/mors.nix b/lass/1systems/mors.nix
index c3c7f6b59..21e992a3e 100644
--- a/lass/1systems/mors.nix
+++ b/lass/1systems/mors.nix
@@ -195,6 +195,8 @@ with config.krebs.lib;
 
     logf
     iodine
+
+    macchanger
   ];
 
   #TODO: fix this shit
-- 
cgit v1.2.3


From 65494d381ea22b086f4bb30a12a58e0f7b37bf12 Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Tue, 11 Oct 2016 17:35:53 +0200
Subject: l 1: explicitly add /tmp as tmpfs

---
 lass/1systems/helios.nix | 5 +++++
 lass/1systems/mors.nix   | 5 +++++
 lass/1systems/prism.nix  | 6 ++++++
 lass/1systems/shodan.nix | 5 +++++
 lass/1systems/uriel.nix  | 5 +++++
 5 files changed, 26 insertions(+)

(limited to 'lass/1systems')

diff --git a/lass/1systems/helios.nix b/lass/1systems/helios.nix
index 26ad316ce..8ce1d5748 100644
--- a/lass/1systems/helios.nix
+++ b/lass/1systems/helios.nix
@@ -102,6 +102,11 @@ with config.krebs.lib;
       device = "/dev/pool/bku";
       fsType = "ext4";
     };
+    "/tmp" = {
+      device = "tmpfs";
+      fsType = "tmpfs";
+      options = ["nosuid" "nodev" "noatime"];
+    };
   };
 
   #services.udev.extraRules = ''
diff --git a/lass/1systems/mors.nix b/lass/1systems/mors.nix
index 1aa4d9b23..c5d7d2da5 100644
--- a/lass/1systems/mors.nix
+++ b/lass/1systems/mors.nix
@@ -140,6 +140,11 @@ with config.krebs.lib;
       device = "/dev/big/conf";
       fsType = "ext4";
     };
+    "/tmp" = {
+      device = "tmpfs";
+      fsType = "tmpfs";
+      options = ["nosuid" "nodev" "noatime"];
+    };
   };
 
   services.udev.extraRules = ''
diff --git a/lass/1systems/prism.nix b/lass/1systems/prism.nix
index b508103c5..51d106b5e 100644
--- a/lass/1systems/prism.nix
+++ b/lass/1systems/prism.nix
@@ -120,6 +120,12 @@ in {
         device = "/dev/pool/bku";
       };
 
+      fileSystems."/tmp" = {
+        device = "tmpfs";
+        fsType = "tmpfs";
+        options = ["nosuid" "nodev" "noatime"];
+      };
+
     }
     {
       sound.enable = false;
diff --git a/lass/1systems/shodan.nix b/lass/1systems/shodan.nix
index af98c6968..5140591af 100644
--- a/lass/1systems/shodan.nix
+++ b/lass/1systems/shodan.nix
@@ -50,6 +50,11 @@ with builtins;
       device = "/dev/pool/home-lass";
       fsType = "ext4";
     };
+    "/tmp" = {
+      device = "tmpfs";
+      fsType = "tmpfs";
+      options = ["nosuid" "nodev" "noatime"];
+    };
   };
 
   services.udev.extraRules = ''
diff --git a/lass/1systems/uriel.nix b/lass/1systems/uriel.nix
index c6d4dbd89..7f09836dd 100644
--- a/lass/1systems/uriel.nix
+++ b/lass/1systems/uriel.nix
@@ -77,6 +77,11 @@ with config.krebs.lib;
     "/boot" = {
       device = "/dev/sda1";
     };
+    "/tmp" = {
+      device = "tmpfs";
+      fsType = "tmpfs";
+      options = ["nosuid" "nodev" "noatime"];
+    };
   };
 
   services.udev.extraRules = ''
-- 
cgit v1.2.3


From 9189028e8f2c8171c57d8b46dabd2998f1752e62 Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Tue, 11 Oct 2016 17:40:14 +0200
Subject: l 1 mors: disable docker (k 5 needs fixing)

---
 lass/1systems/mors.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'lass/1systems')

diff --git a/lass/1systems/mors.nix b/lass/1systems/mors.nix
index c5d7d2da5..9c9ee3912 100644
--- a/lass/1systems/mors.nix
+++ b/lass/1systems/mors.nix
@@ -54,8 +54,8 @@ with config.krebs.lib;
         enable = true;
         package = pkgs.postgresql;
       };
-      virtualisation.docker.enable = true;
-      users.users.mainUser.extraGroups = [ "docker" ];
+      #virtualisation.docker.enable = true;
+      #users.users.mainUser.extraGroups = [ "docker" ];
     }
     {
       lass.umts = {
-- 
cgit v1.2.3


From 946f33f72b7bd09085ef8b8d0cac4bda5547d567 Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Tue, 11 Oct 2016 17:40:41 +0200
Subject: l 1 mors: add thunderbird to pkgs

---
 lass/1systems/mors.nix | 1 +
 1 file changed, 1 insertion(+)

(limited to 'lass/1systems')

diff --git a/lass/1systems/mors.nix b/lass/1systems/mors.nix
index 9c9ee3912..87f83efa3 100644
--- a/lass/1systems/mors.nix
+++ b/lass/1systems/mors.nix
@@ -197,6 +197,7 @@ with config.krebs.lib;
     urban
     mk_sql_pair
     remmina
+    thunderbird
 
     logf
   ];
-- 
cgit v1.2.3


From 7e16427bb5afec6cfefb89e442bc3b529a583e39 Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Wed, 12 Oct 2016 12:15:57 +0200
Subject: l 1 mors: disable c-base vpn

---
 lass/1systems/mors.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lass/1systems')

diff --git a/lass/1systems/mors.nix b/lass/1systems/mors.nix
index 145e94921..1028ca652 100644
--- a/lass/1systems/mors.nix
+++ b/lass/1systems/mors.nix
@@ -23,7 +23,7 @@ with config.krebs.lib;
     ../2configs/teamviewer.nix
     ../2configs/libvirt.nix
     ../2configs/fetchWallpaper.nix
-    ../2configs/c-base.nix
+    #../2configs/c-base.nix
     ../2configs/mail.nix
     ../2configs/krebs-pass.nix
     ../2configs/repo-sync.nix
-- 
cgit v1.2.3


From 8ef5d94a78104f603d8c5882fd2de331d4d7e2f2 Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Wed, 12 Oct 2016 12:16:21 +0200
Subject: l 1 uriel: fix duplicate definition of wireless

---
 lass/1systems/uriel.nix | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'lass/1systems')

diff --git a/lass/1systems/uriel.nix b/lass/1systems/uriel.nix
index 7f09836dd..aa5286ae0 100644
--- a/lass/1systems/uriel.nix
+++ b/lass/1systems/uriel.nix
@@ -23,7 +23,6 @@ with config.krebs.lib;
         useDefaultShell = true;
       };
       networking.networkmanager.enable = true;
-      networking.wireless.enable = mkForce false;
       hardware.pulseaudio = {
         enable = true;
         systemWide = true;
@@ -41,8 +40,6 @@ with config.krebs.lib;
 
   krebs.build.host = config.krebs.hosts.uriel;
 
-  networking.wireless.enable = true;
-
   hardware.enableAllFirmware = true;
   nixpkgs.config.allowUnfree = true;
 
-- 
cgit v1.2.3