From 28249452e79ed9b51ec5ea4d7d7d32fbacfde38a Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Mon, 12 Dec 2022 19:40:29 +0100
Subject: ma gui/look-up: add pkgs

---
 makefu/2configs/gui/look-up.nix | 1 +
 1 file changed, 1 insertion(+)

(limited to 'makefu/2configs')

diff --git a/makefu/2configs/gui/look-up.nix b/makefu/2configs/gui/look-up.nix
index d27f5cff7..244cf21b5 100644
--- a/makefu/2configs/gui/look-up.nix
+++ b/makefu/2configs/gui/look-up.nix
@@ -1,3 +1,4 @@
+{pkgs, ... }:
 {
   systemd.services.look-up = {
     startAt = "*:30";
-- 
cgit v1.2.3


From 754d36818c85925b36e0de03e81d22473eb5b7ad Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Mon, 12 Dec 2022 19:41:47 +0100
Subject: ma download.binaergewitter: fix logrotate

---
 makefu/2configs/bgt/download.binaergewitter.de.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'makefu/2configs')

diff --git a/makefu/2configs/bgt/download.binaergewitter.de.nix b/makefu/2configs/bgt/download.binaergewitter.de.nix
index d49ad158b..bd5dc5bf7 100644
--- a/makefu/2configs/bgt/download.binaergewitter.de.nix
+++ b/makefu/2configs/bgt/download.binaergewitter.de.nix
@@ -43,7 +43,7 @@ in {
 
   services.logrotate = {
     enable = true;
-    config = ''
+    settings.header = ''
     ${bgtaccess} ${bgterror} {
       rotate 5
       weekly
-- 
cgit v1.2.3


From c78b8c9d7c9b160a748aa9dd165d0e6330c741a0 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Mon, 12 Dec 2022 19:42:41 +0100
Subject: ma security/hotfix: rip

---
 makefu/2configs/default.nix         | 2 +-
 makefu/2configs/security/hotfix.nix | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)
 delete mode 100644 makefu/2configs/security/hotfix.nix

(limited to 'makefu/2configs')

diff --git a/makefu/2configs/default.nix b/makefu/2configs/default.nix
index 66c77e1eb..9a08a4497 100644
--- a/makefu/2configs/default.nix
+++ b/makefu/2configs/default.nix
@@ -11,7 +11,7 @@ with import <stockholm/lib>;
     ./editor/vim.nix
     ./binary-cache/nixos.nix
     ./minimal.nix
-    ./security/hotfix.nix
+    # ./security/hotfix.nix
   ];
 
   # users are super important
diff --git a/makefu/2configs/security/hotfix.nix b/makefu/2configs/security/hotfix.nix
deleted file mode 100644
index fc52f21e6..000000000
--- a/makefu/2configs/security/hotfix.nix
+++ /dev/null
@@ -1,4 +0,0 @@
-{ pkgs, lib,... }: {
-  # https://github.com/berdav/CVE-2021-4034
-  security.wrappers.pkexec.source = lib.mkForce (pkgs.writeText "pkexec" "");
-}
-- 
cgit v1.2.3


From 6c391d7361240671b9165b7092105a1bf86517a0 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Mon, 12 Dec 2022 20:00:20 +0100
Subject: ma download.binaergewitter: logrotate new format

---
 makefu/2configs/bgt/download.binaergewitter.de.nix | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

(limited to 'makefu/2configs')

diff --git a/makefu/2configs/bgt/download.binaergewitter.de.nix b/makefu/2configs/bgt/download.binaergewitter.de.nix
index bd5dc5bf7..31da31a71 100644
--- a/makefu/2configs/bgt/download.binaergewitter.de.nix
+++ b/makefu/2configs/bgt/download.binaergewitter.de.nix
@@ -43,16 +43,13 @@ in {
 
   services.logrotate = {
     enable = true;
-    settings.header = ''
-    ${bgtaccess} ${bgterror} {
-      rotate 5
-      weekly
-      create 600 nginx nginx
-      postrotate
-        ${pkgs.systemd}/bin/systemctl reload nginx
-      endscript
-    }
-    '';
+    settings.bgt = {
+      files = [ bgtaccess bgterror ];
+      rotate = 5;
+      frequency = "weekly";
+      create = "600 nginx nginx";
+      postrotate = "${pkgs.systemd}/bin/systemctl reload nginx";
+    };
   };
 
   # 20.09 unharden nginx to write logs
-- 
cgit v1.2.3


From 369803fe3126aaf4a6921f6d5995477c071e2d3e Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Mon, 12 Dec 2022 20:02:06 +0100
Subject: ma gui/look-up: fix refactoring

---
 makefu/2configs/gui/look-up.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'makefu/2configs')

diff --git a/makefu/2configs/gui/look-up.nix b/makefu/2configs/gui/look-up.nix
index 244cf21b5..eea84bc48 100644
--- a/makefu/2configs/gui/look-up.nix
+++ b/makefu/2configs/gui/look-up.nix
@@ -1,5 +1,8 @@
-{pkgs, ... }:
-{
+{pkgs, config, ... }:
+let
+  user = config.krebs.build.user.name;
+in
+  {
   systemd.services.look-up = {
     startAt = "*:30";
     serviceConfig = {
-- 
cgit v1.2.3


From 908bb16cc8356a1b77fc79a9f49c0bd0a3d8b3e0 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Mon, 12 Dec 2022 20:59:24 +0100
Subject: ma gui/look-up: fix configuration

---
 makefu/2configs/gui/look-up.nix | 1 +
 1 file changed, 1 insertion(+)

(limited to 'makefu/2configs')

diff --git a/makefu/2configs/gui/look-up.nix b/makefu/2configs/gui/look-up.nix
index eea84bc48..e04098cc2 100644
--- a/makefu/2configs/gui/look-up.nix
+++ b/makefu/2configs/gui/look-up.nix
@@ -1,6 +1,7 @@
 {pkgs, config, ... }:
 let
   user = config.krebs.build.user.name;
+  window-manager = "awesome";
 in
   {
   systemd.services.look-up = {
-- 
cgit v1.2.3