Merge branch alpine/master of into nixbook/master

flake.nix

@@ -41,6 +41,7 @@
           ./home/programs/graphical.nix
           ./home/programs/gamer.nix
           ./home/programs/personal/.
+          ./home/programs/xr.nix
         ];
 
       FCS-Tristan-Nixbook =

hardware/alpine.nix

@@ -101,7 +101,6 @@ in {
       "/mnt/disk1/SnapRAID.content"
       "/mnt/disk2/SnapRAID.content"
       "/mnt/disk3/SnapRAID.content"
-      "/var/snapraid/SnapRAID.content"
     ];
     dataDisks = {
       d1 = "/mnt/disk1";
@@ -132,6 +131,7 @@ in {
     recommendedOptimisation = true;
     recommendedGzipSettings = true;
     virtualHosts = {
+      "cerysb.art".globalRedirect = "instagram.com/cerys.bcreates";
       "*.tristans.cloud" = {
         globalRedirect = "tristans.cloud";
       };

home/programs/personal/default.nix

@@ -19,7 +19,6 @@
     ardour
     blender
     # musescore
-    jellyfin-media-player
     monero-gui
     electrum
     xmrig
@@ -30,5 +29,6 @@
     hugo
     libsForQt5.neochat
     bookworm
+    jellyfin-mpv-shim
   ];
 }

home/programs/xr.nix

@@ -1,30 +1,32 @@
-{pkgs, config, ...}: {
+{
+  pkgs,
+  ...
+}: {
   home.packages = with pkgs; [
     monado
   ];
   home.file.".config/openxr/1/openxr_monado.json" = {
     source = "${pkgs.monado}/share/openxr/1/openxr_monado.json";
   };
-  home.file.".config/openvr/openvrpaths.vrpath" = {
-    text = ''
-    {
-      "config" :
-      [
-        "${config.home.homeDirectory}/.local/share/Steam/config"
-      ],
-      "external_drivers" : null,
-      "jsonid" : "vrpathreg",
-      "log" :
-      [
-        "${config.home.homeDirectory}/.local/share/Steam/logs"
-      ],
-      "runtime" :
-      [
-        "${pkgs.opencomposite}/lib/opencomposite"
-      ],
-      "version" : 1
-    }
-    '';
-  };
-
+  # home.file.".config/openvr/openvrpaths.vrpath" = {
+  #   text = ''
+  #   {
+  #     "config" :
+  #     [
+  #       "${config.home.homeDirectory}/.local/share/Steam/config"
+  #     ],
+  #     "external_drivers" : null,
+  #     "jsonid" : "vrpathreg",
+  #     "log" :
+  #     [
+  #       "${config.home.homeDirectory}/.local/share/Steam/logs"
+  #     ],
+  #     "runtime" :
+  #     [
+  #       "${pkgs.opencomposite}/lib/opencomposite"
+  #     ],
+  #     "version" : 1
+  #   }
+  #   '';
+  # };
 }

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";