Desktop updates

4 files changed, 17 insertions, 27 deletions

diff --git a/host/Rory-desktop/configuration.nix b/host/Rory-desktop/configuration.nix
index fddff11..28a3b7f 100644
--- a/host/Rory-desktop/configuration.nix
+++ b/host/Rory-desktop/configuration.nix
@@ -1,10 +1,11 @@
-{ config, pkgs, lib, nhekoSrc, mtxclientSrc, ... }:
+args@{ config, pkgs, lib, nhekoSrc, mtxclientSrc, ... }:
 
 {
   imports =
     [
       # base imports
       ../../modules/base-client.nix
+      # (import ../../modules/base-secrets.nix {  path = "/home/rory/.config/sops/config.yaml"; })
       ../../modules/packages/vim.nix
 #      ../../modules/environments/home.nix
       ../../modules/software-templates/profilers.nix
diff --git a/host/Rory-desktop/optional/gui/wayland.nix b/host/Rory-desktop/optional/gui/wayland.nix
index e0394d3..c923007 100644
--- a/host/Rory-desktop/optional/gui/wayland.nix
+++ b/host/Rory-desktop/optional/gui/wayland.nix
@@ -15,14 +15,16 @@
       # Fix for some Java AWT applications (e.g. Android Studio),
       # use this if they aren't displayed properly:
       export _JAVA_AWT_WM_NONREPARENTING=1
-      (
-        sleep 5
-        ${pkgs.swaybg}/bin/swaybg -i ${../../../../modules/users/Rory/wallpaper.webp}
+      cp ${../../../../modules/users/Rory/wallpaper.webp} ~/.cache/wallpaper.webp
+      
+    '';
+    #(
+        #sleep 5
+        #${pkgs.swaybg}/bin/swaybg -i ${../../../../modules/users/Rory/wallpaper.webp}
         #$ {pkgs.swayidle}/bin/swayidle -w timeout 300 'swaylock -f -i ${../../../../modules/users/Rory/wallpaper.webp}' 'swaymsg "output * dpms off"'
         #$ {pkgs.swaylock}/bin/swaylock -f -i ${../../../../modules/users/Rory/wallpaper.webp}
-        ${pkgs.waybar}/bin/waybar
-      ) &
-    '';
+        #${pkgs.waybar}/bin/waybar
+      #) &
 
     extraPackages = with pkgs; [
       swaybg
diff --git a/host/Rory-nginx/configuration.nix b/host/Rory-nginx/configuration.nix
index 995e5f2..df9936b 100755
--- a/host/Rory-nginx/configuration.nix
+++ b/host/Rory-nginx/configuration.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, lib, conduit, conduit-vanilla, ... }:
+{ config, pkgs, lib, grapevine, conduit, ... }:
 
 {
   imports =
@@ -38,16 +38,18 @@
   };
 
   containers."pluralcontactbotpoc" = import ./services/containers/pluralcontactbotpoc/container.nix {
-    inherit pkgs lib conduit;
+    inherit pkgs lib;
+    conduit = grapevine;
   };
 
   containers."matrixunittests" = import ./services/containers/matrixunittests/container.nix {
-    inherit pkgs lib conduit;
+    inherit pkgs lib;
+    conduit = grapevine;
   };
 
   containers."matrixunittests-conduit" = import ./services/containers/matrixunittests-conduit/container.nix {
     inherit pkgs lib;
-    conduit = conduit-vanilla;
+    conduit = conduit;
   };
 
   system.stateVersion = "22.11"; # DO NOT EDIT!
diff --git a/host/Rory-nginx/services/matrix/conduit.nix b/host/Rory-nginx/services/matrix/conduit.nix
index e425cc4..eb830ab 100755
--- a/host/Rory-nginx/services/matrix/conduit.nix
+++ b/host/Rory-nginx/services/matrix/conduit.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, lib, conduit, ... }:
+{ config, pkgs, lib, ... }:
 
 {
   services.grapevine = {
@@ -60,20 +60,5 @@
       #log = "debug";
     };
   };
-#  systemd.services.matrix-conduit-reg-token = {
-#      description = "Random registration token for Conduit.";
-#      before = ["grapevine.service"]; # So the registration can be used by Conduit.
-#      after = ["matrix-synapse-reg-token.service"];
-#
-#      script = ''
-#        mkdir -p /run/systemd/system/conduit.service.d
-#        echo Environment=\"CONDUIT_REGISTRATION_TOKEN=$(cat /var/lib/matrix-synapse/registration_shared_secret.txt)\" > /run/systemd/system/grapevine.service.d/override.conf
-#        systemctl daemon-reload'';
-#      serviceConfig = {
-#        User = "root";
-#        Group = "root";
-#      };
-#    };
-
 }