From 5ccc7c34c01fc3897cc3b8069648b7fbed707fef Mon Sep 17 00:00:00 2001
From: jacekpoz <jacekpoz@proton.me>
Date: Sun, 1 Sep 2024 22:59:25 +0200
Subject: [PATCH] modularize olm thing

---
 hosts/chmura/configuration.nix   | 9 ++-------
 hosts/common/core/default.nix    | 1 +
 hosts/common/core/permit-olm.nix | 5 +++++
 hosts/del/configuration.nix      | 7 +------
 hosts/hape/configuration.nix     | 7 +------
 hosts/niks/configuration.nix     | 7 +------
 hosts/work/configuration.nix     | 7 +------
 7 files changed, 12 insertions(+), 31 deletions(-)
 create mode 100644 hosts/common/core/permit-olm.nix

diff --git a/hosts/chmura/configuration.nix b/hosts/chmura/configuration.nix
index dc38b74..d46bcd8 100644
--- a/hosts/chmura/configuration.nix
+++ b/hosts/chmura/configuration.nix
@@ -4,13 +4,8 @@
 }: let
     inherit (config.poz.other.system) username;
 in {
-    nixpkgs.config = {
-        permittedInsecurePackages = [
-            "olm-3.2.16"
-        ];
-        # fuck broadcom
-        allowUnfree = true;
-    };
+    # fuck broadcom
+    nixpkgs.config.allowUnfree = true;
 
     users.users.${username} = {
         extraGroups = [ "docker" ];
diff --git a/hosts/common/core/default.nix b/hosts/common/core/default.nix
index 65445e6..afeb73a 100644
--- a/hosts/common/core/default.nix
+++ b/hosts/common/core/default.nix
@@ -8,6 +8,7 @@ _: {
         ./docs.nix
         ./nix.nix
         ./oomd.nix
+        ./permit-olm.nix
         ./pin-registry.nix
         ./preserve-system.nix
         ./switch-ng.nix
diff --git a/hosts/common/core/permit-olm.nix b/hosts/common/core/permit-olm.nix
new file mode 100644
index 0000000..f32d6b4
--- /dev/null
+++ b/hosts/common/core/permit-olm.nix
@@ -0,0 +1,5 @@
+_: {
+    nixpkgs.config.permittedInsecurePackages = [
+        "olm-3.2.16"
+    ];
+}
diff --git a/hosts/del/configuration.nix b/hosts/del/configuration.nix
index 1261d36..02f8d43 100644
--- a/hosts/del/configuration.nix
+++ b/hosts/del/configuration.nix
@@ -11,12 +11,7 @@
 
     inherit (config.poz.other.system) username;
 in {
-    nixpkgs.config = {
-        permittedInsecurePackages = [
-            "olm-3.2.16"
-        ];
-        allowUnfree = true;
-    };
+    nixpkgs.config.allowUnfree = true;
 
     nix.settings = {
         max-jobs = 2;
diff --git a/hosts/hape/configuration.nix b/hosts/hape/configuration.nix
index c2bb5c0..8c1eba3 100644
--- a/hosts/hape/configuration.nix
+++ b/hosts/hape/configuration.nix
@@ -6,12 +6,7 @@
 }: let
     inherit (lib.attrsets) attrValues;
 in {
-    nixpkgs.config = {
-        permittedInsecurePackages = [
-            "olm-3.2.16"
-        ];
-        allowUnfree = true;
-    };
+    nixpkgs.config.allowUnfree = true;
 
     systemd.oomd = {
         enable = true;
diff --git a/hosts/niks/configuration.nix b/hosts/niks/configuration.nix
index 04ee8c9..e41ac20 100644
--- a/hosts/niks/configuration.nix
+++ b/hosts/niks/configuration.nix
@@ -7,12 +7,7 @@
 }: let
     inherit (lib.meta) getExe;
 in {
-    nixpkgs.config = {
-        permittedInsecurePackages = [
-            "olm-3.2.16"
-        ];
-        allowUnfree = true;
-    };
+    nixpkgs.config.allowUnfree = true;
 
     boot = {
         extraModulePackages = [
diff --git a/hosts/work/configuration.nix b/hosts/work/configuration.nix
index d133930..4cbe0cb 100644
--- a/hosts/work/configuration.nix
+++ b/hosts/work/configuration.nix
@@ -10,12 +10,7 @@
 
     inherit (config.poz.other.system) username;
 in {
-    nixpkgs.config = {
-        permittedInsecurePackages = [
-            "olm-3.2.16"
-        ];
-        allowUnfree = true;
-    };
+    nixpkgs.config.allowUnfree = true;
 
     nix.settings = {
         max-jobs = 2;