From 68edc2d356adecd077330690dffccc73a9b3ffbf Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Fri, 11 Aug 2017 22:55:22 +0200
Subject: l skynet.r: fix host

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

(limited to 'lass/1systems')

diff --git a/lass/1systems/skynet/config.nix b/lass/1systems/skynet/config.nix
index a48df02b9..b707f4388 100644
--- a/lass/1systems/skynet/config.nix
+++ b/lass/1systems/skynet/config.nix
@@ -42,7 +42,7 @@ with import <stockholm/lib>;
     }
   ];
 
-  krebs.build.host = config.krebs.hosts.daedalus;
+  krebs.build.host = config.krebs.hosts.skynet;
 
   #fileSystems = {
   #  "/bku" = {
-- 
cgit v1.2.3


From b675f02e46abcafd642a91f0a35826165ecec3e1 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Sun, 13 Aug 2017 01:45:52 +0200
Subject: RIP cloudkrebs.r

---
 lass/1systems/cloudkrebs/config.nix | 34 ----------------------------------
 lass/1systems/cloudkrebs/source.nix |  3 ---
 2 files changed, 37 deletions(-)
 delete mode 100644 lass/1systems/cloudkrebs/config.nix
 delete mode 100644 lass/1systems/cloudkrebs/source.nix

(limited to 'lass/1systems')

diff --git a/lass/1systems/cloudkrebs/config.nix b/lass/1systems/cloudkrebs/config.nix
deleted file mode 100644
index aa9a1f1ab..000000000
--- a/lass/1systems/cloudkrebs/config.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-let
-  inherit (import <stockholm/lass/4lib> { inherit pkgs lib; }) getDefaultGateway;
-  ip = config.krebs.build.host.nets.internet.ip4.addr;
-in {
-  imports = [
-    <stockholm/lass>
-    <stockholm/lass/2configs/retiolum.nix>
-    <stockholm/lass/2configs/os-templates/CAC-CentOS-7-64bit.nix>
-    <stockholm/lass/2configs/exim-retiolum.nix>
-    <stockholm/lass/2configs/git.nix>
-    <stockholm/lass/2configs/realwallpaper.nix>
-    <stockholm/lass/2configs/privoxy-retiolum.nix>
-    {
-      networking.interfaces.enp2s1.ip4 = [
-        {
-          address = ip;
-          prefixLength = 24;
-        }
-      ];
-      networking.defaultGateway = getDefaultGateway ip;
-      networking.nameservers = [
-        "8.8.8.8"
-      ];
-
-    }
-    {
-      sound.enable = false;
-    }
-  ];
-
-  krebs.build.host = config.krebs.hosts.cloudkrebs;
-}
diff --git a/lass/1systems/cloudkrebs/source.nix b/lass/1systems/cloudkrebs/source.nix
deleted file mode 100644
index 99e71e755..000000000
--- a/lass/1systems/cloudkrebs/source.nix
+++ /dev/null
@@ -1,3 +0,0 @@
-import <stockholm/lass/source.nix> {
-  name = "cloudkrebs";
-}
-- 
cgit v1.2.3


From 22b94883629dd81d87c61695a3d54edd62458af2 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Mon, 14 Aug 2017 23:34:53 +0200
Subject: l mors.r: remove thunderbird

---
 lass/1systems/mors/config.nix | 1 -
 1 file changed, 1 deletion(-)

(limited to 'lass/1systems')

diff --git a/lass/1systems/mors/config.nix b/lass/1systems/mors/config.nix
index 2cb6a7519..5bc52d633 100644
--- a/lass/1systems/mors/config.nix
+++ b/lass/1systems/mors/config.nix
@@ -139,7 +139,6 @@ with import <stockholm/lib>;
     urban
     mk_sql_pair
     remmina
-    thunderbird
 
     iodine
 
-- 
cgit v1.2.3


From c4940d5926bcd2e938b914568161f63125926369 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Wed, 16 Aug 2017 11:36:34 +0200
Subject: l prism.r: add container for kaepsele

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

(limited to 'lass/1systems')

diff --git a/lass/1systems/prism/config.nix b/lass/1systems/prism/config.nix
index 5d05ae399..744bae551 100644
--- a/lass/1systems/prism/config.nix
+++ b/lass/1systems/prism/config.nix
@@ -298,6 +298,22 @@ in {
         localAddress = "10.233.2.2";
       };
     }
+    {
+      #kaepsele
+      containers.kaepsele = {
+        config = { ... }: {
+          services.openssh.enable = true;
+          users.users.root.openssh.authorizedKeys.keys = with config.krebs.users; [
+            lass.pubkey
+            tv.pubkey
+          ];
+        };
+        enableTun = true;
+        privateNetwork = true;
+        hostAddress = "10.233.2.3";
+        localAddress = "10.233.2.4";
+      };
+    }
   ];
 
   krebs.build.host = config.krebs.hosts.prism;
-- 
cgit v1.2.3


From 619af589d108040a78e753040a857bc58b51e78e Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Wed, 16 Aug 2017 11:37:58 +0200
Subject: l iso: set networkingHostname

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

(limited to 'lass/1systems')

diff --git a/lass/1systems/iso.nix b/lass/1systems/iso.nix
index 0b048a2b1..be064bed2 100644
--- a/lass/1systems/iso.nix
+++ b/lass/1systems/iso.nix
@@ -37,6 +37,7 @@ with import <stockholm/lib>;
         };
       };
       boot.kernelParams = [ "copytoram" ];
+      networking.hostName = "lass-iso";
     }
     {
       krebs.enable = true;
-- 
cgit v1.2.3


From 445d4f74c225dcc44846488e4d30c0b8e4e52bd9 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Wed, 16 Aug 2017 13:35:30 +0200
Subject: l skynet.r: don't suspend on lid close

---
 lass/1systems/skynet/config.nix | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'lass/1systems')

diff --git a/lass/1systems/skynet/config.nix b/lass/1systems/skynet/config.nix
index b707f4388..0b9499982 100644
--- a/lass/1systems/skynet/config.nix
+++ b/lass/1systems/skynet/config.nix
@@ -44,6 +44,10 @@ with import <stockholm/lib>;
 
   krebs.build.host = config.krebs.hosts.skynet;
 
+  services.logind.extraConfig = ''
+    HandleLidSwitch=ignore
+  '';
+
   #fileSystems = {
   #  "/bku" = {
   #    device = "/dev/mapper/pool-bku";
-- 
cgit v1.2.3


From a70fc9b95abf47aca54d39076529b3718adeb7cc Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Mon, 21 Aug 2017 12:36:04 +0200
Subject: l: mors <-> daedalus

---
 lass/1systems/daedalus/config.nix | 6 +++---
 lass/1systems/mors/config.nix     | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'lass/1systems')

diff --git a/lass/1systems/daedalus/config.nix b/lass/1systems/daedalus/config.nix
index 290d8a780..72a45a3d9 100644
--- a/lass/1systems/daedalus/config.nix
+++ b/lass/1systems/daedalus/config.nix
@@ -4,7 +4,7 @@
   imports = [
     <stockholm/lass>
     <stockholm/lass/2configs/hw/x220.nix>
-    <stockholm/lass/2configs/boot/stock-x220.nix>
+    <stockholm/lass/2configs/boot/coreboot.nix>
 
     <stockholm/lass/2configs/mouse.nix>
     <stockholm/lass/2configs/retiolum.nix>
@@ -29,7 +29,7 @@
   };
 
   services.udev.extraRules = ''
-    SUBSYSTEM=="net", ATTR{address}=="00:24:d7:f0:e8:c8", NAME="wl0"
-    SUBSYSTEM=="net", ATTR{address}=="f0:de:f1:8f:8a:78", NAME="et0"
+    SUBSYSTEM=="net", ATTR{address}=="08:11:96:0a:5d:6c", NAME="wl0"
+    SUBSYSTEM=="net", ATTR{address}=="f0:de:f1:71:cb:35", NAME="et0"
   '';
 }
diff --git a/lass/1systems/mors/config.nix b/lass/1systems/mors/config.nix
index 5bc52d633..bb6f84c7b 100644
--- a/lass/1systems/mors/config.nix
+++ b/lass/1systems/mors/config.nix
@@ -5,7 +5,7 @@ with import <stockholm/lib>;
   imports = [
     <stockholm/lass>
     <stockholm/lass/2configs/hw/x220.nix>
-    <stockholm/lass/2configs/boot/coreboot.nix>
+    <stockholm/lass/2configs/boot/stock-x220.nix>
 
     <stockholm/lass/2configs/mouse.nix>
     <stockholm/lass/2configs/retiolum.nix>
@@ -104,8 +104,8 @@ with import <stockholm/lib>;
   };
 
   services.udev.extraRules = ''
-    SUBSYSTEM=="net", ATTR{address}=="08:11:96:0a:5d:6c", NAME="wl0"
-    SUBSYSTEM=="net", ATTR{address}=="f0:de:f1:71:cb:35", NAME="et0"
+    SUBSYSTEM=="net", ATTR{address}=="00:24:d7:f0:e8:c8", NAME="wl0"
+    SUBSYSTEM=="net", ATTR{address}=="f0:de:f1:8f:8a:78", NAME="et0"
   '';
 
   #TODO activationScripts seem broken, fix them!
-- 
cgit v1.2.3


From 51cb5bb1f10aaf68499f6fbe53923959d35f039b Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Mon, 21 Aug 2017 12:37:57 +0200
Subject: l daedalus.r: add kde desktop

---
 lass/1systems/daedalus/config.nix | 68 ++++++++++++++++++++++++++++++++++-----
 1 file changed, 60 insertions(+), 8 deletions(-)

(limited to 'lass/1systems')

diff --git a/lass/1systems/daedalus/config.nix b/lass/1systems/daedalus/config.nix
index 72a45a3d9..36daea1d5 100644
--- a/lass/1systems/daedalus/config.nix
+++ b/lass/1systems/daedalus/config.nix
@@ -1,3 +1,4 @@
+with import <stockholm/lib>;
 { config, pkgs, ... }:
 
 {
@@ -6,18 +7,69 @@
     <stockholm/lass/2configs/hw/x220.nix>
     <stockholm/lass/2configs/boot/coreboot.nix>
 
-    <stockholm/lass/2configs/mouse.nix>
     <stockholm/lass/2configs/retiolum.nix>
-    <stockholm/lass/2configs/git.nix>
-    <stockholm/lass/2configs/exim-retiolum.nix>
-    <stockholm/lass/2configs/baseX.nix>
-    <stockholm/lass/2configs/browsers.nix>
-    <stockholm/lass/2configs/programs.nix>
-    <stockholm/lass/2configs/fetchWallpaper.nix>
     <stockholm/lass/2configs/backups.nix>
-    <stockholm/lass/2configs/games.nix>
+    {
+      # bubsy config
+      users.users.bubsy = {
+        uid = genid "bubsy";
+        home = "/home/bubsy";
+        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; [
+        pavucontrol
+        firefox
+        hexchat
+        networkmanagerapplet
+      ];
+      services.xserver.enable = true;
+      services.xserver.displayManager.lightdm.enable = true;
+      services.xserver.desktopManager.plasma5.enable = true;
+    }
+    {
+      krebs.per-user.bitcoin.packages = [
+        pkgs.electrum
+      ];
+      users.extraUsers = {
+        bitcoin = {
+          name = "bitcoin";
+          description = "user for bitcoin stuff";
+          home = "/home/bitcoin";
+          useDefaultShell = true;
+          createHome = true;
+        };
+      };
+      security.sudo.extraConfig = ''
+        bubsy ALL=(bitcoin) NOPASSWD: ALL
+      '';
+    }
   ];
 
+  time.timeZone = "Europe/Berlin";
+
+  hardware.trackpoint = {
+    enable = true;
+    sensitivity = 220;
+    speed = 0;
+    emulateWheel = true;
+  };
+
+  services.logind.extraConfig = ''
+    HandleLidSwitch=ignore
+  '';
+
   krebs.build.host = config.krebs.hosts.daedalus;
 
   fileSystems = {
-- 
cgit v1.2.3


From 76415ff3cd74b4469087d0c8ee2b5062147b40d2 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Fri, 25 Aug 2017 23:43:19 +0200
Subject: l mors.r: remove deprecated zalando stuff

---
 lass/1systems/mors/config.nix | 9 ---------
 1 file changed, 9 deletions(-)

(limited to 'lass/1systems')

diff --git a/lass/1systems/mors/config.nix b/lass/1systems/mors/config.nix
index bb6f84c7b..5995e5ec9 100644
--- a/lass/1systems/mors/config.nix
+++ b/lass/1systems/mors/config.nix
@@ -39,15 +39,6 @@ with import <stockholm/lib>;
         enable = true;
       };
     }
-    {
-      #zalando project
-      services.postgresql = {
-        enable = true;
-        package = pkgs.postgresql;
-      };
-      virtualisation.docker.enable = true;
-      #users.users.mainUser.extraGroups = [ "docker" ];
-    }
     {
       lass.umts = {
         enable = true;
-- 
cgit v1.2.3


From eb6fab7527c0bd8d5193ca2adcba420d73c03501 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Fri, 25 Aug 2017 23:43:43 +0200
Subject: l mors.r: enable mongodb

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

(limited to 'lass/1systems')

diff --git a/lass/1systems/mors/config.nix b/lass/1systems/mors/config.nix
index 5995e5ec9..58f55ce68 100644
--- a/lass/1systems/mors/config.nix
+++ b/lass/1systems/mors/config.nix
@@ -82,6 +82,9 @@ with import <stockholm/lib>;
         client.enable = true;
       };
     }
+    {
+      services.mongodb.enable = true;
+    }
   ];
 
   krebs.build.host = config.krebs.hosts.mors;
-- 
cgit v1.2.3


From c63b86d9aff44c065cdcf5a486ee91b7565cd567 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Fri, 25 Aug 2017 23:45:03 +0200
Subject: l shodan.r: add /home lv

---
 lass/1systems/shodan/config.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'lass/1systems')

diff --git a/lass/1systems/shodan/config.nix b/lass/1systems/shodan/config.nix
index b6d49d6e4..ef015aebc 100644
--- a/lass/1systems/shodan/config.nix
+++ b/lass/1systems/shodan/config.nix
@@ -41,7 +41,11 @@ with import <stockholm/lib>;
     "/boot" = {
       device = "/dev/sda1";
     };
-
+    "/home" = {
+      device = "/dev/mapper/pool-home";
+      fsType = "btrfs";
+      options = ["defaults" "noatime" "ssd" "compress=lzo"];
+    };
     "/tmp" = {
       device = "tmpfs";
       fsType = "tmpfs";
-- 
cgit v1.2.3


From c6ed05c10d9b5b11e623e3bb36b3f40b824691bb Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Fri, 1 Sep 2017 22:05:21 +0200
Subject: l: add Reaktor|krebs

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

(limited to 'lass/1systems')

diff --git a/lass/1systems/prism/config.nix b/lass/1systems/prism/config.nix
index 744bae551..c50100181 100644
--- a/lass/1systems/prism/config.nix
+++ b/lass/1systems/prism/config.nix
@@ -42,6 +42,7 @@ in {
     <stockholm/lass/2configs/coders-irc.nix>
     <stockholm/lass/2configs/ciko.nix>
     <stockholm/lass/2configs/container-networking.nix>
+    <stockholm/lass/2configs/reaktor-krebs.nix>
     {
       lass.pyload.enable = true;
     }
-- 
cgit v1.2.3


From 78ea2c5b1a8e483edecff58b5cfe06425a2ba7b9 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Fri, 1 Sep 2017 22:06:09 +0200
Subject: l: coders-irc -> reaktor-coders

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

(limited to 'lass/1systems')

diff --git a/lass/1systems/prism/config.nix b/lass/1systems/prism/config.nix
index c50100181..91f9956f1 100644
--- a/lass/1systems/prism/config.nix
+++ b/lass/1systems/prism/config.nix
@@ -39,7 +39,7 @@ in {
     <stockholm/lass/2configs/monitoring/monit-alarms.nix>
     <stockholm/lass/2configs/paste.nix>
     <stockholm/lass/2configs/syncthing.nix>
-    <stockholm/lass/2configs/coders-irc.nix>
+    <stockholm/lass/2configs/reaktor-coders.nix>
     <stockholm/lass/2configs/ciko.nix>
     <stockholm/lass/2configs/container-networking.nix>
     <stockholm/lass/2configs/reaktor-krebs.nix>
-- 
cgit v1.2.3


From 66f76c34b72f295a341cebe5e80a7574960592e6 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Fri, 1 Sep 2017 22:31:54 +0200
Subject: l: no longer sync nixpkgs

---
 lass/1systems/prism/config.nix | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'lass/1systems')

diff --git a/lass/1systems/prism/config.nix b/lass/1systems/prism/config.nix
index 91f9956f1..b3f547452 100644
--- a/lass/1systems/prism/config.nix
+++ b/lass/1systems/prism/config.nix
@@ -245,10 +245,6 @@ in {
         OnUnitInactiveSec = "2min";
         RandomizedDelaySec = "2min";
       };
-      krebs.repo-sync.repos.nixpkgs.timerConfig = {
-        OnBootSec = "90min";
-        OnUnitInactiveSec = "24h";
-      };
     }
     {
       lass.usershadow = {
-- 
cgit v1.2.3


From 28aadfeb357ed1c57c8af0d79045406c8f1ef0cd Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Sat, 2 Sep 2017 16:13:30 +0200
Subject: l daedalus.r: add de keyboard layout

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

(limited to 'lass/1systems')

diff --git a/lass/1systems/daedalus/config.nix b/lass/1systems/daedalus/config.nix
index 36daea1d5..a3db0f1b4 100644
--- a/lass/1systems/daedalus/config.nix
+++ b/lass/1systems/daedalus/config.nix
@@ -37,6 +37,7 @@ with import <stockholm/lib>;
       services.xserver.enable = true;
       services.xserver.displayManager.lightdm.enable = true;
       services.xserver.desktopManager.plasma5.enable = true;
+      services.xserver.layout = "de";
     }
     {
       krebs.per-user.bitcoin.packages = [
-- 
cgit v1.2.3


From 8c131beb3ab6011276e3f123b8fea50fe8c7d91c Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Sat, 2 Sep 2017 21:41:00 +0200
Subject: l mors.r: remove elasticsearch

---
 lass/1systems/mors/config.nix | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'lass/1systems')

diff --git a/lass/1systems/mors/config.nix b/lass/1systems/mors/config.nix
index 58f55ce68..a0e0f90a2 100644
--- a/lass/1systems/mors/config.nix
+++ b/lass/1systems/mors/config.nix
@@ -34,11 +34,6 @@ with import <stockholm/lib>;
         { predicate = "-p tcp --dport 11100"; target = "ACCEPT"; }
       ];
     }
-    {
-      services.elasticsearch = {
-        enable = true;
-      };
-    }
     {
       lass.umts = {
         enable = true;
-- 
cgit v1.2.3


From 495d8cddb0b59351f08ee6154b483f1826b3d70c Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Sat, 2 Sep 2017 22:16:46 +0200
Subject: l daedalus.r: add pkgs.libreoffice

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

(limited to 'lass/1systems')

diff --git a/lass/1systems/daedalus/config.nix b/lass/1systems/daedalus/config.nix
index a3db0f1b4..db1bb5d3a 100644
--- a/lass/1systems/daedalus/config.nix
+++ b/lass/1systems/daedalus/config.nix
@@ -33,6 +33,7 @@ with import <stockholm/lib>;
         firefox
         hexchat
         networkmanagerapplet
+        libreoffice
       ];
       services.xserver.enable = true;
       services.xserver.displayManager.lightdm.enable = true;
-- 
cgit v1.2.3


From 5184d19651f9319d63fd812601f3df635b1416b8 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Sat, 2 Sep 2017 22:17:31 +0200
Subject: l daedalus.r: add remote control

---
 lass/1systems/daedalus/config.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'lass/1systems')

diff --git a/lass/1systems/daedalus/config.nix b/lass/1systems/daedalus/config.nix
index db1bb5d3a..e1bce5da8 100644
--- a/lass/1systems/daedalus/config.nix
+++ b/lass/1systems/daedalus/config.nix
@@ -57,6 +57,15 @@ with import <stockholm/lib>;
         bubsy ALL=(bitcoin) NOPASSWD: ALL
       '';
     }
+    {
+      #remote control
+      environment.systemPackages = with pkgs; [
+        x11vnc
+      ];
+      krebs.iptables.tables.filter.INPUT.rules = [
+        { predicate = "-p tcp -i retiolum --dport 5900"; target = "ACCEPT"; }
+      ];
+    }
   ];
 
   time.timeZone = "Europe/Berlin";
-- 
cgit v1.2.3


From 6ab81a2797d5bc58dbe3acfb0a3c268baf159220 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Sun, 3 Sep 2017 10:36:14 +0200
Subject: l mors.r: add c-base config

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

(limited to 'lass/1systems')

diff --git a/lass/1systems/mors/config.nix b/lass/1systems/mors/config.nix
index a0e0f90a2..53854d3be 100644
--- a/lass/1systems/mors/config.nix
+++ b/lass/1systems/mors/config.nix
@@ -28,6 +28,7 @@ with import <stockholm/lib>;
     <stockholm/lass/2configs/logf.nix>
     <stockholm/lass/2configs/syncthing.nix>
     <stockholm/lass/2configs/otp-ssh.nix>
+    <stockholm/lass/2configs/c-base.nix>
     {
       #risk of rain port
       krebs.iptables.tables.filter.INPUT.rules = [
-- 
cgit v1.2.3


From 2855881c732c041d9b6cd9c830d6ac4b84157b17 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Mon, 4 Sep 2017 00:16:54 +0200
Subject: move news & deps: echelon.r -> puyak.r

---
 lass/1systems/echelon/config.nix | 3 ---
 lass/1systems/mors/config.nix    | 2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)

(limited to 'lass/1systems')

diff --git a/lass/1systems/echelon/config.nix b/lass/1systems/echelon/config.nix
index 77958267d..127819379 100644
--- a/lass/1systems/echelon/config.nix
+++ b/lass/1systems/echelon/config.nix
@@ -12,9 +12,6 @@ in {
     <stockholm/lass/2configs/realwallpaper.nix>
     <stockholm/lass/2configs/privoxy-retiolum.nix>
     <stockholm/lass/2configs/git.nix>
-    <stockholm/lass/2configs/go.nix>
-    <stockholm/lass/2configs/ircd.nix>
-    <stockholm/lass/2configs/newsbot-js.nix>
     {
       networking.interfaces.enp2s1.ip4 = [
         {
diff --git a/lass/1systems/mors/config.nix b/lass/1systems/mors/config.nix
index 53854d3be..4d2f8b0f8 100644
--- a/lass/1systems/mors/config.nix
+++ b/lass/1systems/mors/config.nix
@@ -24,7 +24,7 @@ with import <stockholm/lib>;
     <stockholm/lass/2configs/fetchWallpaper.nix>
     <stockholm/lass/2configs/mail.nix>
     <stockholm/lass/2configs/repo-sync.nix>
-    <stockholm/lass/2configs/ircd.nix>
+    <stockholm/krebs/2configs/ircd.nix>
     <stockholm/lass/2configs/logf.nix>
     <stockholm/lass/2configs/syncthing.nix>
     <stockholm/lass/2configs/otp-ssh.nix>
-- 
cgit v1.2.3


From adc185b629a5fa6b64c5a99e182730e53fc814bf Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Mon, 4 Sep 2017 00:17:48 +0200
Subject: l echelon.r: deactivate realwallpaper

---
 lass/1systems/echelon/config.nix | 1 -
 1 file changed, 1 deletion(-)

(limited to 'lass/1systems')

diff --git a/lass/1systems/echelon/config.nix b/lass/1systems/echelon/config.nix
index 127819379..6f96883bf 100644
--- a/lass/1systems/echelon/config.nix
+++ b/lass/1systems/echelon/config.nix
@@ -9,7 +9,6 @@ in {
     <stockholm/lass/2configs/retiolum.nix>
     <stockholm/lass/2configs/os-templates/CAC-CentOS-7-64bit.nix>
     <stockholm/lass/2configs/exim-retiolum.nix>
-    <stockholm/lass/2configs/realwallpaper.nix>
     <stockholm/lass/2configs/privoxy-retiolum.nix>
     <stockholm/lass/2configs/git.nix>
     {
-- 
cgit v1.2.3