Merge branch alpine/master of into nixbook/master

nixos/default.nix

@@ -41,6 +41,12 @@ in {
       }
     ];
   };
+  networking.hosts = {
+    "100.65.29.110" = ["zenix"];
+    "100.106.241.122" = ["alpine" "tristans.cloud"];
+    "100.71.130.111" = ["fcs-tristan-nixbook"];
+    "100.69.60.83" = ["google-pixel-8"];
+  };
 
   time.timeZone = lib.mkDefault "Europe/London";
 

nixos/services/nextcloud.nix

@@ -68,8 +68,17 @@ in {
       datadirectory = "/mnt/storage/nextcloud";
     };
     extraApps = {
-      inherit (config.services.nextcloud.package.packages.apps)
-        contacts calendar mail gpoddersync memories notes maps;
+      inherit
+        (config.services.nextcloud.package.packages.apps)
+        contacts
+        calendar
+        mail
+        gpoddersync
+        memories
+        notes
+        maps
+        previewgenerator
+        ;
       oidc_login = pkgs.fetchNextcloudApp {
         sha256 = "sha256-cN5azlThKPKRVip14yfUNR85of5z+N6NVI7sg6pSGQI=";
         url = "https://github.com/pulsejet/nextcloud-oidc-login/releases/download/v3.0.2/oidc_login.tar.gz";

nixos/services/whatsapp.nix

@@ -65,6 +65,7 @@ in {
         };
         encryption = {
           allow = true;
+          appservice = false;
         };
         personal_filtering_spaces = true;
       };

nixos/workstation.nix

@@ -1,12 +1,8 @@
 {
   inputs,
-  config,
   pkgs,
-  lib,
   ...
-}: let
-  user = config.user;
-in {
+}: {
   imports = [
     inputs.stylix.nixosModules.stylix
   ];
@@ -58,6 +54,11 @@ in {
   hardware.bluetooth.enable = true;
   services.blueman.enable = true;
 
+  networking.stevenblack = {
+    enable = true;
+    block = ["porn" "gambling"];
+  };
+
   stylix = {
     image = ../images/nix-soft.png;
     base16Scheme = "${pkgs.base16-schemes}/share/themes/onedark.yaml";