From 30d9c20b1bc1bc718bcb93caa2d10971f4c504a0 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Tue, 15 Feb 2022 22:30:02 +0100
Subject: ma latte.r: run on 1blu

---
 makefu/1systems/latte/config.nix | 27 ++++++---------------------
 1 file changed, 6 insertions(+), 21 deletions(-)

(limited to 'makefu/1systems/latte/config.nix')

diff --git a/makefu/1systems/latte/config.nix b/makefu/1systems/latte/config.nix
index bec778abc..27df80fbf 100644
--- a/makefu/1systems/latte/config.nix
+++ b/makefu/1systems/latte/config.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 let
 
   # external-ip = config.krebs.build.host.nets.internet.ip4.addr;
@@ -10,11 +10,13 @@ let
 in {
 
   imports = [
+    ./1blu
     <stockholm/makefu>
+    #<stockholm/makefu/2configs/home-manager>
     # configure your hw:
-    <stockholm/makefu/2configs/hw/CAC.nix>
+    #<stockholm/makefu/2configs/hw/CAC.nix>
     <stockholm/makefu/2configs/tinc/retiolum.nix>
-    <stockholm/makefu/2configs/save-diskspace.nix>
+    #<stockholm/makefu/2configs/save-diskspace.nix>
 
     # Security
     <stockholm/makefu/2configs/sshd-totp.nix>
@@ -25,29 +27,12 @@ in {
     <stockholm/makefu/2configs/zsh-user.nix>
     # Services
     <stockholm/makefu/2configs/remote-build/slave.nix>
-    <stockholm/makefu/2configs/torrent.nix>
+    # <stockholm/makefu/2configs/torrent.nix>
 
   ];
   krebs = {
     enable = true;
     build.host = config.krebs.hosts.latte;
   };
-  boot.initrd.availableKernelModules = [ "ata_piix" "ehci_pci" "virtio_pci" "virtio_blk" "virtio_net" "virtio_scsi" ];
 
-  boot.loader.grub.device = "/dev/vda";
-  boot.loader.grub.copyKernels = true;
-  fileSystems."/" = {
-    device = "/dev/vda1";
-    fsType = "ext4";
-  };
-  networking = {
-    firewall = {
-      allowPing = true;
-      logRefusedConnections = false;
-      allowedTCPPorts = [ ];
-      allowedUDPPorts = [ 655 ];
-    };
-    # network interface receives dhcp address
-    nameservers = [ "8.8.8.8" ];
-  };
 }
-- 
cgit v1.2.3


From ee9c23c4bb5737b77df0fed9385e7b30604da0de Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Fri, 18 Feb 2022 09:22:59 +0100
Subject: ma latte.r: continue migration of gum services

---
 makefu/1systems/latte/config.nix | 51 ++++++++++++++++++++++++++--------------
 1 file changed, 33 insertions(+), 18 deletions(-)

(limited to 'makefu/1systems/latte/config.nix')

diff --git a/makefu/1systems/latte/config.nix b/makefu/1systems/latte/config.nix
index 27df80fbf..fdd3df192 100644
--- a/makefu/1systems/latte/config.nix
+++ b/makefu/1systems/latte/config.nix
@@ -10,24 +10,39 @@ let
 in {
 
   imports = [
-    ./1blu
-    <stockholm/makefu>
-    #<stockholm/makefu/2configs/home-manager>
-    # configure your hw:
-    #<stockholm/makefu/2configs/hw/CAC.nix>
-    <stockholm/makefu/2configs/tinc/retiolum.nix>
-    #<stockholm/makefu/2configs/save-diskspace.nix>
-
-    # Security
-    <stockholm/makefu/2configs/sshd-totp.nix>
-    # <stockholm/makefu/2configs/stats/client.nix>
-
-    # Tools
-    <stockholm/makefu/2configs/tools/core.nix>
-    <stockholm/makefu/2configs/zsh-user.nix>
-    # Services
-    <stockholm/makefu/2configs/remote-build/slave.nix>
-    # <stockholm/makefu/2configs/torrent.nix>
+      ./1blu
+      <stockholm/makefu>
+
+      # common
+      <stockholm/makefu/2configs/nur.nix>
+      <stockholm/makefu/2configs/home-manager>
+      <stockholm/makefu/2configs/home-manager/cli.nix>
+
+      # Security
+      <stockholm/makefu/2configs/sshd-totp.nix>
+
+      # Tools
+      <stockholm/makefu/2configs/tools/core.nix>
+      <stockholm/makefu/2configs/zsh-user.nix>
+
+      # NixOS Build
+      <stockholm/makefu/2configs/remote-build/slave.nix>
+
+      # Storage
+      <stockholm/makefu/2configs/share/hetzner-client.nix>
+
+      # Services:
+      <stockholm/makefu/2configs/nix-community/mediawiki-matrix-bot.nix>
+
+      # Supervision
+      <stockholm/makefu/2configs/nix-community/supervision.nix>
+
+      # Krebs
+      <stockholm/makefu/2configs/tinc/retiolum.nix>
+
+      #<stockholm/makefu/2configs/home-manager>
+      # configure your hw:
+      # <stockholm/makefu/2configs/torrent.nix>
 
   ];
   krebs = {
-- 
cgit v1.2.3


From 036289a0a119159901e20c272b97c00412e41676 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Mon, 28 Feb 2022 21:31:52 +0100
Subject: ma omo.r: enable more services

---
 makefu/1systems/latte/config.nix | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

(limited to 'makefu/1systems/latte/config.nix')

diff --git a/makefu/1systems/latte/config.nix b/makefu/1systems/latte/config.nix
index fdd3df192..5332fadf5 100644
--- a/makefu/1systems/latte/config.nix
+++ b/makefu/1systems/latte/config.nix
@@ -29,10 +29,19 @@ in {
       <stockholm/makefu/2configs/remote-build/slave.nix>
 
       # Storage
+      <stockholm/makefu/2configs/share>
       <stockholm/makefu/2configs/share/hetzner-client.nix>
 
       # Services:
       <stockholm/makefu/2configs/nix-community/mediawiki-matrix-bot.nix>
+      # <stockholm/makefu/2configs/torrent.nix>
+      # <stockholm/makefu/2configs/torrent/deluge.nix>
+      <stockholm/makefu/2configs/torrent/rtorrent.nix>
+      <stockholm/makefu/2configs/deployment/rss.euer.krebsco.de.nix>
+
+      # local usage:
+      <stockholm/makefu/2configs/mosh.nix>
+      <stockholm/makefu/2configs/bitlbee.nix>
 
       # Supervision
       <stockholm/makefu/2configs/nix-community/supervision.nix>
@@ -40,9 +49,9 @@ in {
       # Krebs
       <stockholm/makefu/2configs/tinc/retiolum.nix>
 
-      #<stockholm/makefu/2configs/home-manager>
-      # configure your hw:
-      # <stockholm/makefu/2configs/torrent.nix>
+      # backup
+      <stockholm/makefu/2configs/backup/state.nix>
+
 
   ];
   krebs = {
@@ -50,4 +59,7 @@ in {
     build.host = config.krebs.hosts.latte;
   };
 
+  makefu.dl-dir = "/media/cloud/download";
+  networking.firewall.allowedTCPPorts = [ 80 ];
+
 }
-- 
cgit v1.2.3


From 859a1c2101e5c0b3b519d359a75f6f3086737843 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Tue, 1 Mar 2022 23:19:44 +0100
Subject: ma latte.r: continue migration from gum

---
 makefu/1systems/latte/config.nix | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

(limited to 'makefu/1systems/latte/config.nix')

diff --git a/makefu/1systems/latte/config.nix b/makefu/1systems/latte/config.nix
index 5332fadf5..c493541fb 100644
--- a/makefu/1systems/latte/config.nix
+++ b/makefu/1systems/latte/config.nix
@@ -34,10 +34,18 @@ in {
 
       # Services:
       <stockholm/makefu/2configs/nix-community/mediawiki-matrix-bot.nix>
-      # <stockholm/makefu/2configs/torrent.nix>
-      # <stockholm/makefu/2configs/torrent/deluge.nix>
       <stockholm/makefu/2configs/torrent/rtorrent.nix>
+      ## Web
       <stockholm/makefu/2configs/deployment/rss.euer.krebsco.de.nix>
+      <stockholm/makefu/2configs/deployment/owncloud.nix>
+      ### Moving owncloud data dir to /media/cloud/nextcloud-data
+      {
+        users.users.nextcloud.extraGroups = [ "download" ];
+        fileSystems."/var/lib/nextcloud/data" = {
+          device = "/media/cloud/nextcloud-data";
+          options = [ "bind" ];
+        };
+      }
 
       # local usage:
       <stockholm/makefu/2configs/mosh.nix>
@@ -60,6 +68,6 @@ in {
   };
 
   makefu.dl-dir = "/media/cloud/download";
-  networking.firewall.allowedTCPPorts = [ 80 ];
+  networking.firewall.allowedTCPPorts = [ 80 443 ];
 
 }
-- 
cgit v1.2.3


From 26e2bc72ab89c9e2d0ca02fed632c982beb73322 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Wed, 2 Mar 2022 13:23:44 +0100
Subject: ma latte.r: un-fail nextcloud-setup

---
 makefu/1systems/latte/config.nix | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'makefu/1systems/latte/config.nix')

diff --git a/makefu/1systems/latte/config.nix b/makefu/1systems/latte/config.nix
index c493541fb..2828aea08 100644
--- a/makefu/1systems/latte/config.nix
+++ b/makefu/1systems/latte/config.nix
@@ -41,6 +41,8 @@ in {
       ### Moving owncloud data dir to /media/cloud/nextcloud-data
       {
         users.users.nextcloud.extraGroups = [ "download" ];
+        # nextcloud-setup fails as it cannot set permissions for nextcloud
+        systemd.services.nextcloud-setup.serviceConfig.SuccessExitStatus = "0 1";
         fileSystems."/var/lib/nextcloud/data" = {
           device = "/media/cloud/nextcloud-data";
           options = [ "bind" ];
-- 
cgit v1.2.3